OpenBIOS April 2007

openbios@openbios.org

9 participants
56 discussions

r335 - cpu/x86/pc/olpc
by svn＠openbios.org 27 Apr '07

27 Apr '07

Author: wmb Date: 2007-04-28 00:25:44 +0200 (Sat, 28 Apr 2007) New Revision: 335 Modified: cpu/x86/pc/olpc/ec.bth Log: cpu/x86/pc/olpc/ec.bth - Added an option, controlled by a macro in versions.fth, to use an alternative command to get the EC image. This is useful for testing new versions of the EC code before they have been officially released on the OLPC website. Modified: cpu/x86/pc/olpc/ec.bth =================================================================== --- cpu/x86/pc/olpc/ec.bth 2007-04-27 22:23:29 UTC (rev 334) +++ cpu/x86/pc/olpc/ec.bth 2007-04-27 22:25:44 UTC (rev 335) @@ -5,7 +5,12 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth -" wget http://dev.laptop.org/pub/ec/ec_v${EC_VERSION}.img -O ec.img" expand$ $sh +\ If there is a GET_EC macro, use it instead of fetching the released version. +" ${GET_EC}" expand$ nip [if] + " ${GET_EC}" expand$ $sh +[else] + " wget http://dev.laptop.org/pub/ec/ec_v${EC_VERSION}.img -O ec.img" expand$ $sh +[then] \ This forces the creation of an ec.log file, so we don't re-fetch ec.img writing ec.version

1 0

r334 - dev/olpc/kb3700
by svn＠openbios.org 27 Apr '07

27 Apr '07

Author: wmb Date: 2007-04-28 00:23:29 +0200 (Sat, 28 Apr 2007) New Revision: 334 Modified: dev/olpc/kb3700/ecio.fth Log: dev/olpc/kb3700/ecio.fth - Added commands to access the new EC functions. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-04-27 22:22:30 UTC (rev 333) +++ dev/olpc/kb3700/ecio.fth 2007-04-27 22:23:29 UTC (rev 334) @@ -40,11 +40,81 @@ true abort" EC didn't respond to port 66 command" ; +: ec-release ( -- ) h# ff h# 6c pc! ; +: ec-cmd@ ( -- b ) h# 6c pc@ ; +: ec-wait-wr ( -- ) begin ec-cmd@ 2 and 0= key? abort" wait wr" until ; +: ec-wait-rd ( -- ) begin ec-cmd@ 1 and key? abort" wait rd" until ; +: ec-cmd! ( b -- ) ec-wait-wr h# 6c pc! ec-wait-wr ; +: ec-dat@ ( -- b ) ec-wait-rd h# 68 pc@ ; +: ec-dat! ( b -- ) ec-wait-wr h# 68 pc! ; +: ec-rb ( -- b ) 0 ec-dat! ec-dat@ ; +: ec-rw ( -- w ) ec-rb ec-rb swap bwjoin ; +: ec-wb ( -- w ) ec-dat! ; +: ec-ww ( -- w ) wbsplit ec-wb ec-wb ; + +: flush-ec ( -- ) begin ec-cmd@ 1 and while h# 68 pc@ drop repeat ; +: ec-cmda ( b -- ) flush-ec ec-cmd! ec-dat@ drop ; + +: bat-voltage@ ( -- w ) h# 10 ec-cmda ec-rw ; +: bat-current@ ( -- w ) h# 11 ec-cmda ec-rw ; +: bat-acr@ ( -- w ) h# 12 ec-cmda ec-rw ; +: bat-temp@ ( -- w ) h# 13 ec-cmda ec-rw ; +: ambient-temp@ ( -- w ) h# 14 ec-cmda ec-rw ; +: bat-status@ ( -- b ) h# 15 ec-cmda ec-rb ; +: bat-soc@ ( -- b ) h# 16 ec-cmda ec-rb ; +: bat-gauge-id@ ( -- l.sn4-7 l.sn0-3 ) + h# 17 ec-cmda + ec-rw ec-rw swap wljoin ec-rw ec-rw swap wljoin swap +; +: bat-gauge@ ( -- b ) h# 18 ec-cmda h# 31 ec-dat! ec-dat@ ; \ 31 is the EEPROM address +: board-id@ ( -- b ) h# 19 ec-cmda ec-rb ; +: sci-source@ ( -- b ) h# 1a ec-cmda ec-rw ; +: sci-mask! ( b -- ) h# 1b ec-cmda ec-dat! ; +: sci-mask@ ( -- b ) h# 1c ec-cmda ec-dat! ; +: game-key@ ( -- w ) h# 1d ec-cmda ec-rw ; +: ec-date! ( day month year -- ) h# 1e ec-cmda ec-dat! ec-dat! ec-dat! ; +: ec-abnormal@ ( -- b ) h# 1f ec-cmda ec-rb ; \ XXX is this byte or word? + +: bat-init-lifepo4 ( -- ) h# 21 ec-cmda ; +: bat-init-nimh ( -- ) h# 22 ec-cmda ; +: wlan-off ( -- ) h# 23 ec-cmda 0 ec-dat! ; +: wlan-on ( -- ) h# 23 ec-cmda 1 ec-dat! ; +: wlan-wake ( -- ) h# 24 ec-cmda ; +: wlan-rst ( -- ) h# 25 ec-cmda ; +: dcon-disable ( -- ) h# 26 ec-cmda 0 ec-dat! ; +: dcon-enable ( -- ) h# 26 ec-cmda 1 ec-dat! ; +: reset-ec-warm ( -- ) h# 27 ec-cmda ; +: reset-ec ( -- ) h# 28 ec-cmda ; +: write-protect-fw ( -- ) h# 29 ec-cmda ; +\ : disable-ec-io ( -- ) h# 2a ec-cmda ; \ ??? + +\ EC mailbox access words + +: ec-mb-adr@ ( -- w ) h# 80 ec-cmda ec-rw ; +: ec-mb-adr! ( w -- ) h# 81 ec-cmda ec-ww ; +: ec-mb-setup ( cmd w -- ) ec-mb-adr! ec-cmda ; + +: ec-mb-b@ ( adr -- b ) h# 8a ec-mb-setup h# 84 ec-cmda ec-rb ; +: ec-mb-w@ ( adr -- w ) h# 88 ec-mb-setup h# 82 ec-cmda ec-rw ; +: ec-mb-b! ( b adr -- ) h# 85 ec-mb-setup ec-wb h# 8b ec-cmda ; +: ec-mb-w! ( w adr -- ) h# 83 ec-mb-setup ec-ww h# 89 ec-cmda ; + +\ SCI source codes: +\ SCI_WAKEUP_EVENT 0x01 // Game button, +\ SCI_BATTERY_STATUS_CHANGE 0x02 // AC plugged/unplugged, ... +\ Battery inserted/remove, Battery Low, Battery full, Battery destroy +\ SCI_SOC_CHANGE 0x04 // SOC Change +\ SCI_ABNORMAL_EVENT 0x08 +\ SCI_EB_MODE_CHANGE 0x10 + \ This command hard-resets the EC deeply enough for the SP write-protect to \ be off when the system is powered up again. -: ec-reset ( -- ) 5 h# 6c pc! ; +: ec-reset ( -- ) 5 ec-cmd ; +: .gauge-sn ( -- ) +; + : kb3920? ( -- flag ) h# 6c pc@ h# ff = if true exit then 9 ec-cmd 9 = ; \ While accessing the SPI FLASH, we have to turn off the keyboard controller,

1 0

r333 - dev/isa
by svn＠openbios.org 27 Apr '07

27 Apr '07

Author: wmb Date: 2007-04-28 00:22:30 +0200 (Sat, 28 Apr 2007) New Revision: 333 Modified: dev/isa/diaguart.fth Log: Having added rounded-/ to forth/lib/util.fth, it is no longer needed in dev/isa/diaguart.fth Modified: dev/isa/diaguart.fth =================================================================== --- dev/isa/diaguart.fth 2007-04-27 22:21:41 UTC (rev 332) +++ dev/isa/diaguart.fth 2007-04-27 22:22:30 UTC (rev 333) @@ -9,13 +9,6 @@ : uart@ ( reg# -- byte ) uart-base + pc@ ; \ Read from a UART register : uart! ( byte reg# -- ) uart-base + pc! ; \ Write to a UART register -\ Integer division which rounds to nearest instead of truncating -: rounded-/ ( dividend divisor -- rounded-result ) - swap 2* swap / ( result*2 ) - dup 1 and + \ add 1 to the result if it is odd - 2/ ( rounded-result ) -; - : baud ( baud-rate -- ) uart-clock-frequency d# 16 / swap rounded-/ ( baud-rate-divisor )

1 0

r332 - cpu/x86/pc/olpc
by svn＠openbios.org 27 Apr '07

27 Apr '07

Author: wmb Date: 2007-04-28 00:21:41 +0200 (Sat, 28 Apr 2007) New Revision: 332 Modified: cpu/x86/pc/olpc/chipinit.fth cpu/x86/pc/olpc/romreset.bth cpu/x86/pc/olpc/vsapci.fth Log: OLPC - Increased the size of the frame buffer from 8M to 16M for the LX version, because 2M is used for the graphics command buffer and the remaining 6M is not enough for the pixmaps. Modified: cpu/x86/pc/olpc/chipinit.fth =================================================================== --- cpu/x86/pc/olpc/chipinit.fth 2007-04-27 22:18:48 UTC (rev 331) +++ cpu/x86/pc/olpc/chipinit.fth 2007-04-27 22:21:41 UTC (rev 332) @@ -634,7 +634,7 @@ \ write_vg_32(DC_DV_CTL, mVal.high); \ The base address of the frame buffer in physical memory - 1030 pl@ 4 and if h# 77e.0000 else h# f7e.0000 then + h# 1808 msr@ drop 4 lshift h# fff invert and ( fb-pa ) h# 88 dc-base + l! \ DV_CTL register, undocumented \ hw_fb_map_init(PCI_FB_BASE); Modified: cpu/x86/pc/olpc/romreset.bth =================================================================== --- cpu/x86/pc/olpc/romreset.bth 2007-04-27 22:18:48 UTC (rev 331) +++ cpu/x86/pc/olpc/romreset.bth 2007-04-27 22:21:41 UTC (rev 332) @@ -124,12 +124,12 @@ \ sdram_set_spdregisters(),auto.c \ The LX devel board has only 512M ROM, but assigning 1M of address space is harmless - 25fff002.10f80000. 1808 set-msr \ 1M ROM at fff0.0000, system RAM limit at 0f80.0000 - 2000000f.7ff00100. 10000028 set-msr \ Top of memory at 0f7f.ffff - 212800fd.7fffd000. 10000029 set-msr \ Frame buffer at PA fd00.0000 maps to RAM at 0f80.0000 + 25fff002.10f00000. 1808 set-msr \ 1M ROM at fff0.0000, system RAM limit at 0f00.0000 + 2000000e.fff00100. 10000028 set-msr \ Top of memory at 0eff.ffff + 212000fd.ffffd000. 10000029 set-msr \ Frame buffer at PA fd00.0000 maps to RAM at 0f00.0000 10076013.00005040. 20000018 set-msr \ DIMM1 empty, DIMM0 256 MB, 1 module bank, 8K pages - 2000000f.7ff00100. 4000002c set-msr \ DMA to memory from 1M to RAM limit at 0f80.0000 - 0f7ff000.00100130. 50002019 set-msr \ PCI DMA to memory from 1M to RAM limit at 0f80.0000 + 2000000e.fff00100. 4000002c set-msr \ DMA to memory from 1M to RAM limit at 0f00.0000 + 0efff000.00100130. 50002019 set-msr \ PCI DMA to memory from 1M to RAM limit at 0f00.0000 \ 20000019 rmsr \ SDRAM timing and mode program 00000000.2814d352. 00001981 set-msr \ Memory delay values Modified: cpu/x86/pc/olpc/vsapci.fth =================================================================== --- cpu/x86/pc/olpc/vsapci.fth 2007-04-27 22:18:48 UTC (rev 331) +++ cpu/x86/pc/olpc/vsapci.fth 2007-04-27 22:21:41 UTC (rev 332) @@ -199,6 +199,7 @@ \ Amend the fake PCI headers for the LX settings h# 281022 nb-hdr h# 20 + l! \ Vendor/device ID - AMD + h# ff000000 gxfb-hdr h# 0 + l! \ BAR0 MASK - FB h# ffffc000 gxfb-hdr h# 10 + l! \ BAR4 MASK - VIP h# 20811022 gxfb-hdr h# 20 + l! \ Vendor/device ID - AMD h# fe00c000 gxfb-hdr h# 40 + l! \ BAR4 address - VIP

1 0

r331 - cpu/x86/pc/olpc
by svn＠openbios.org 27 Apr '07

27 Apr '07

Author: wmb Date: 2007-04-28 00:18:48 +0200 (Sat, 28 Apr 2007) New Revision: 331 Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/fw.bth Log: OLPC - the clock frequency for the LX version is higher, so us-factor, ms-factor, and the CPU node clock-frequency property must be version-specific. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-04-27 22:17:00 UTC (rev 330) +++ cpu/x86/pc/olpc/devices.fth 2007-04-27 22:18:48 UTC (rev 331) @@ -40,9 +40,18 @@ \ Use the CPU chip's Time Stamp Counter for timing; it does just what we want fload ${BP}/cpu/x86/tsc.fth -d# 366,666 to ms-factor -d# 367 to us-factor +stand-init: + gx? if d# 366,666,667 else d# 433,333,333 then ( cpu-clock-hz ) + + " /cpu" find-device ( cpu-clock-hz ) + dup " clock-frequency" integer-property ( cpu-clock-hz ) + device-end ( cpu-clock-hz ) + + d# 1000 rounded-/ dup to ms-factor ( cpu-clock-khz ) + d# 1000 rounded-/ to us-factor ( ) +; + [ifdef] use-root-isa 0 0 " " " /" begin-package fload ${BP}/cpu/x86/pc/isabus.fth \ ISA Bus Bridge under root node Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-04-27 22:17:00 UTC (rev 330) +++ cpu/x86/pc/olpc/fw.bth 2007-04-27 22:18:48 UTC (rev 331) @@ -213,10 +213,6 @@ fload ${BP}/cpu/x86/pc/olpc/chipinit.fth [then] -dev /cpu - d# 366,666,666 " clock-frequency" integer-property -dend - warning @ warning off : stand-init stand-init

1 0

r330 - forth/lib
by svn＠openbios.org 27 Apr '07

27 Apr '07

Author: wmb Date: 2007-04-28 00:17:00 +0200 (Sat, 28 Apr 2007) New Revision: 330 Modified: forth/lib/util.fth Log: Added rounded-/ to forth/lib/util.fth so it can be used more generally. Modified: forth/lib/util.fth =================================================================== --- forth/lib/util.fth 2007-04-27 21:50:36 UTC (rev 329) +++ forth/lib/util.fth 2007-04-27 22:17:00 UTC (rev 330) @@ -135,6 +135,13 @@ \ : ux. ( adr -- ) base @ >r hex (u.) type r> base ! ; \ ' ux. is showaddr +\ Integer division which rounds to nearest instead of truncating +: rounded-/ ( dividend divisor -- rounded-result ) + swap 2* swap / ( result*2 ) + dup 1 and + \ add 1 to the result if it is odd + 2/ ( rounded-result ) +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r329 - cpu/x86
by svn＠openbios.org 27 Apr '07

27 Apr '07

Author: wmb Date: 2007-04-27 23:50:36 +0200 (Fri, 27 Apr 2007) New Revision: 329 Modified: cpu/x86/assem.fth cpu/x86/disassem.fth Log: x86 assembler/disassembler - added support for cpuid instruction. Modified: cpu/x86/assem.fth =================================================================== --- cpu/x86/assem.fth 2007-04-27 21:50:06 UTC (rev 328) +++ cpu/x86/assem.fth 2007-04-27 21:50:36 UTC (rev 329) @@ -686,6 +686,7 @@ : wrmsr ( -- ) h# 0f asm8, h# 30 asm8, ; : rdtsc ( -- ) h# 0f asm8, h# 31 asm8, ; : rdmsr ( -- ) h# 0f asm8, h# 32 asm8, ; +: cpuid ( -- ) h# 0f asm8, h# a2 asm8, ; \ Arg in %eax, results in ax,bx,dx,cx \ Structured Conditionals \ single pass forces fixed size. optimize for small, fast structures: Modified: cpu/x86/disassem.fth =================================================================== --- cpu/x86/disassem.fth 2007-04-27 21:50:06 UTC (rev 328) +++ cpu/x86/disassem.fth 2007-04-27 21:50:36 UTC (rev 329) @@ -244,6 +244,7 @@ low4bits case 0 of .push ." fs" endof 1 of .pop ." fs" endof + 2 of ." cpuid" endof 3 of ." bt" op-col ea,g endof 4 of ." shld" op-col 1 is wbit ea,g ,ib endof 5 of ." shld" op-col 1 is wbit ea,g ,cl endof @@ -251,6 +252,7 @@ 7 of ." cmpxchg" op-col ea,g endof 8 of .push ." gs" endof 9 of .pop ." gs" endof + \ a of ??? b of ." bt" op-col ea,g endof c of ." shrd" op-col 1 is wbit ea,g ,ib endof d of ." shrd" op-col 1 is wbit ea,g ,cl endof

1 0

r328 - clients/memtest86
by svn＠openbios.org 27 Apr '07

27 Apr '07

Author: wmb Date: 2007-04-27 23:50:06 +0200 (Fri, 27 Apr 2007) New Revision: 328 Modified: clients/memtest86/head.S clients/memtest86/init.c Log: OLPC trac #1375 - memtest fails to find L1/L2 cache size. Added CPUID entries for the AMD Geode GX and LX chips. Modified: clients/memtest86/head.S =================================================================== --- clients/memtest86/head.S 2007-04-27 06:49:05 UTC (rev 327) +++ clients/memtest86/head.S 2007-04-27 21:50:06 UTC (rev 328) @@ -368,6 +368,8 @@ movl X86_VENDOR_ID+8(%esi),%eax cmpl $0x444d4163, %eax # Is this an AMD CPU? je amd_type + cmpl $0x43534e20, %eax # " NSC" - Geode GX, now owned by AMD + je amd_type cmpl $0x736c7561, %eax # Is this a VIA CENTAUR? jne not_amd amd_type: Modified: clients/memtest86/init.c =================================================================== --- clients/memtest86/init.c 2007-04-27 06:49:05 UTC (rev 327) +++ clients/memtest86/init.c 2007-04-27 21:50:06 UTC (rev 328) @@ -280,9 +280,9 @@ v->pae = 0; #ifdef CPUID_DEBUG - dprint(11,0,cpu_id.type,3,1); - dprint(12,0,cpu_id.model,3,1); - dprint(13,0,cpu_id.cpuid,3,1); + dprint(13,0,cpu_id.type,3,1); + dprint(14,0,cpu_id.model,3,1); + dprint(15,0,cpu_id.cpuid,3,1); #endif /* If the CPUID instruction is not supported then this is */ @@ -371,6 +371,9 @@ cprint(LINE_CPU, 0, "AMD K5"); off = 6; break; + /* case 5 doesn't exist, because it would be the */ + /* AMD Geode GX, but the vendor ID string for that */ + /* part says "Geode by NSC", handled elsewhere. */ case 6: case 7: cprint(LINE_CPU, 0, "AMD K6"); @@ -392,6 +395,14 @@ l2_cache = (cpu_id.cache_info[11] << 8); l2_cache += cpu_id.cache_info[10]; break; + case 10: + cprint(LINE_CPU, 0, "AMD Geode LX"); + off = 12; + l1_cache = cpu_id.cache_info[3]; + l1_cache += cpu_id.cache_info[7]; + l2_cache = (cpu_id.cache_info[11] << 8); + l2_cache += cpu_id.cache_info[10]; + break; case 13: cprint(LINE_CPU, 0, "AMD K6-III+"); off = 11; @@ -513,6 +524,11 @@ } l1_cache = cpu_id.cache_info[3] + cpu_id.cache_info[7]; l2_cache = (cpu_id.cache_info[11]*256) + cpu_id.cache_info[10]; + } else if ( cpu_id.vend_id[9] == 'N' ) { /* Geode by NSC (now AMD) */ + cprint(LINE_CPU, 0, "AMD Geode GX"); + off = 12; + l1_cache = cpu_id.cache_info[3]; + l1_cache += cpu_id.cache_info[7]; } else { /* GenuineIntel */ if (cpu_id.type == 4) { switch(cpu_id.model) {

1 0

r327 - ofw/gui
by svn＠openbios.org 26 Apr '07

26 Apr '07

Author: wmb Date: 2007-04-27 08:49:05 +0200 (Fri, 27 Apr 2007) New Revision: 327 Added: ofw/gui/rgb565bmp24.fth Log: Added rgb565bmp24.fth - tool for converting OLPC RGB565 files back to BMP24 format. Added: ofw/gui/rgb565bmp24.fth =================================================================== --- ofw/gui/rgb565bmp24.fth (rev 0) +++ ofw/gui/rgb565bmp24.fth 2007-04-27 06:49:05 UTC (rev 327) @@ -0,0 +1,119 @@ +\ See license at end of file +purpose: Conversion from RGB565 raw format to RGB888 BMP + +0 value image-width +0 value image-height +0 value #planes +0 value line-bytes + +h# 36 constant /bmp-hdr +/bmp-hdr buffer: bmp-hdr + +d# 8 constant /565-hdr +/565-hdr buffer: 565-hdr + +: copy-scan-line ( #entries -- ) + 0 ?do + ifd @ fgetc ifd @ fgetc bwjoin ( rgb565 ) + dup h# 1f and 3 lshift ofd @ fputc ( rgb565 ) \ B + dup d# 5 rshift h# 3f and 2 lshift ofd @ fputc ( rgb565 ) \ G + d# 11 rshift h# 1f and 3 lshift ofd @ fputc ( ) \ R + loop +; + +: get-planes ( -- ) + #planes 0 ?do + image-height 0 do + image-height i 1+ - line-bytes * /565-hdr + ifd @ fseek + image-width copy-scan-line +ifd @ ftell . ofd @ ftell . cr + + loop + loop +; + +: putw ( w -- ) wbsplit swap ofd @ fputc ofd @ fputc ; + +: 565>rects ( -- ) + 1 to #planes + image-width 2 * to line-bytes + + " BM" bmp-hdr swap move \ Signature + image-width 3 * 4 round-up image-height * + dup bmp-hdr h# 22 + le-l! \ Image size + /bmp-hdr + bmp-hdr 2 + le-l! \ File size + + 0 bmp-hdr 6 + le-l! \ Reserved + /bmp-hdr bmp-hdr h# 0a + le-l! \ Image offset + h# 28 bmp-hdr h# 0e + le-l! \ Some variant of header size + image-width bmp-hdr h# 12 + le-l! + image-height bmp-hdr h# 16 + le-l! + #planes bmp-hdr h# 1a + le-w! + d# 24 bmp-hdr h# 1c + le-w! + 0 bmp-hdr h# 1e + le-l! \ Compression + + d# 2835 bmp-hdr h# 26 + le-l! \ X pixels/meter + d# 2835 bmp-hdr h# 2a + le-l! \ Y pixels/meter + 0 bmp-hdr h# 2e + le-l! \ Colors used + 0 bmp-hdr h# 32 + le-l! \ Colors important + + bmp-hdr /bmp-hdr ofd @ fputs + + get-planes +; + +: get-c565-hdr ( -- ) + 565-hdr /565-hdr ifd @ fgets /565-hdr <> abort" Can't get header" + 565-hdr " C565" comp abort" Source file not in C565 format" + 565-hdr 4 + le-w@ to image-width + 565-hdr 6 + le-w@ to image-height +; +: rgb565bmp24 ( -- ) + reading writing + + get-c565-hdr + + 565>rects + ifd @ fclose ofd @ fclose +; +: raw565bmp24 ( -- ) + reading writing + d# 640 to image-width + d# 480 to image-height + + 565>rects + ifd @ fclose ofd @ fclose +; +: xraw565bmp24 ( -- ) + reading writing + d# 1200 to image-width + d# 256 to image-height + + 565>rects + ifd @ fclose ofd @ fclose +; + + +\ LICENSE_BEGIN +\ Copyright (c) 2006 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

r131 - openbios-devel/drivers
by svn＠openbios.org 26 Apr '07

26 Apr '07

Author: blueswirl Date: 2007-04-26 19:15:45 +0200 (Thu, 26 Apr 2007) New Revision: 131 Modified: openbios-devel/drivers/iommu.c Log: Add memory mapping functions needed by NetBSD Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2007-04-25 19:57:23 UTC (rev 130) +++ openbios-devel/drivers/iommu.c 2007-04-26 17:15:45 UTC (rev 131) @@ -111,12 +111,8 @@ return p; } -/* - * Create a memory mapping from va to epa in page table pgd. - * highbase is used for v2p translation. - */ -int -map_page(unsigned long va, unsigned long epa, int type) +static unsigned long +find_pte(unsigned long va, int alloc) { uint32_t pte; void *p; @@ -124,30 +120,52 @@ pte = l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)]; if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { - p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PMD * sizeof(int), - SRMMU_PTRS_PER_PMD * sizeof(int)); - if (p == 0) - goto drop; - pte = SRMMU_ET_PTD | ((va2pa((unsigned long)p)) >> 4); - l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)] = pte; - /* barrier() */ + if (alloc) { + p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PMD * sizeof(int), + SRMMU_PTRS_PER_PMD * sizeof(int)); + if (p == 0) + return 1; + pte = SRMMU_ET_PTD | ((va2pa((unsigned long)p)) >> 4); + l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)] = pte; + /* barrier() */ + } else { + return 1; + } } pa = (pte & 0xFFFFFFF0) << 4; pa += ((va >> SRMMU_PMD_SHIFT) & (SRMMU_PTRS_PER_PMD - 1)) << 2; pte = *(uint32_t *)pa2va(pa); if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { - p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PTE * sizeof(void *), - SRMMU_PTRS_PER_PTE * sizeof(void *)); - if (p == 0) - goto drop; - pte = SRMMU_ET_PTD | ((va2pa((unsigned int)p)) >> 4); - *(uint32_t *)pa2va(pa) = pte; + if (alloc) { + p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PTE * sizeof(void *), + SRMMU_PTRS_PER_PTE * sizeof(void *)); + if (p == 0) + return 2; + pte = SRMMU_ET_PTD | ((va2pa((unsigned int)p)) >> 4); + *(uint32_t *)pa2va(pa) = pte; + } else { + return 2; + } } pa = (pte & 0xFFFFFFF0) << 4; pa += ((va >> PAGE_SHIFT) & (SRMMU_PTRS_PER_PTE - 1)) << 2; + return pa2va(pa); +} + +/* + * Create a memory mapping from va to epa. + */ +int +map_page(unsigned long va, unsigned long epa, int type) +{ + uint32_t pte; + unsigned long pa; + + pa = find_pte(va, 1); + pte = SRMMU_ET_PTE | ((epa & PAGE_MASK) >> 4); if (type) { /* I/O */ pte |= SRMMU_REF; @@ -157,14 +175,10 @@ pte |= SRMMU_REF | SRMMU_CACHE; pte |= SRMMU_PRIV; /* Supervisor only access */ } - *(uint32_t *)pa2va(pa) = pte; + *(uint32_t *)pa = pte; DPRINTF("map_page: va 0x%lx pa 0x%lx pte 0x%x\n", va, epa, pte); return 0; - - drop: - - return -1; } /* @@ -198,6 +212,66 @@ return (void *)((unsigned int)va + off); } +/* + * D5.3 pgmap@ ( va -- pte ) + */ +static void +pgmap_fetch(void) +{ + uint32_t pte; + unsigned long va, pa; + + va = POP(); + + pa = find_pte(va, 0); + if (pa == 1 || pa == 2) + goto error; + pte = *(uint32_t *)pa; + DPRINTF("pgmap@: va 0x%lx pa 0x%lx pte 0x%x\n", va, pa, pte); + + PUSH(pte); + return; + error: + PUSH(0); +} + +/* + * D5.3 pgmap! ( pte va -- ) + */ +static void +pgmap_store(void) +{ + uint32_t pte; + unsigned long va, pa; + + va = POP(); + pte = POP(); + + pa = find_pte(va, 1); + *(uint32_t *)pa = pte; + DPRINTF("pgmap!: va 0x%lx pa 0x%lx pte 0x%x\n", va, pa, pte); +} + +/* + * D5.3 map-pages ( pa space va size -- ) + */ +static void +map_pages(void) +{ + unsigned long va, pa; + int size; + + size = POP(); + va = POP(); + (void) POP(); + pa = POP(); + + for (; size > 0; size -= PAGE_SIZE, pa += PAGE_SIZE, va += PAGE_SIZE) + map_page(va, pa, 1); + DPRINTF("map-page: va 0x%lx pa 0x%lx size 0x%x\n", va, pa, size); +} + + void ob_init_mmu(unsigned long bus, unsigned long base) { @@ -280,6 +354,12 @@ fword("encode+"); push_str("reg"); fword("property"); + + PUSH(0); + fword("active-package!"); + bind_func("pgmap@", pgmap_fetch); + bind_func("pgmap!", pgmap_store); + bind_func("map-pages", map_pages); }

1 0