- OpenBIOS - mail.coreboot.org

r151 - openbios-devel/arch/sparc32
by svn＠openbios.org 10 Jun '07

10 Jun '07

Author: blueswirl Date: 2007-06-10 17:56:42 +0200 (Sun, 10 Jun 2007) New Revision: 151 Modified: openbios-devel/arch/sparc32/romvec.c Log: Fix obp_dumb_memalloc Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-05-27 19:49:35 UTC (rev 150) +++ openbios-devel/arch/sparc32/romvec.c 2007-06-10 15:56:42 UTC (rev 151) @@ -316,8 +316,8 @@ return ret; } -static char *obp_dumb_mmap(char *va, __attribute__((unused)) int which_io, - unsigned int pa, unsigned int size) +static char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, + unsigned int size) { unsigned int npages; unsigned int off; @@ -432,7 +432,7 @@ DPRINTF("obp_dumb_memalloc req null -> 0x%x\n", va); } - obp_dumb_mmap(va, 1, free_ram, size); + obp_dumb_mmap(va, 0, free_ram, size); return va; }

1 0

r444 - dev/olpc/kb3700
by svn＠openbios.org 08 Jun '07

08 Jun '07

Author: wmb Date: 2007-06-08 07:44:36 +0200 (Fri, 08 Jun 2007) New Revision: 444 Modified: dev/olpc/kb3700/ecio.fth Log: OLPC ecio.fth - Remove WLAN RESET workaround, fixed battery init commands. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-06-07 08:55:47 UTC (rev 443) +++ dev/olpc/kb3700/ecio.fth 2007-06-08 05:44:36 UTC (rev 444) @@ -71,8 +71,9 @@ : ec-date! ( day month year -- ) h# 1e ec-cmd-out ec-wb ec-wb ec-wb ; : ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; -: bat-init-lifepo4 ( -- ) h# 21 ec-cmd-out ; -: bat-init-nimh ( -- ) h# 22 ec-cmd-out ; +: bat-init-nimh-gp ( -- ) h# 20 ec-cmd-out ; +: bat-init-lifepo4-byd ( -- ) h# 21 ec-cmd-out ; +: bat-init-lifepo4-gp ( -- ) h# 22 ec-cmd-out ; : wlan-off ( -- ) 0 h# 23 ec-cmd-b! ; : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; : wlan-wake ( -- ) h# 24 ec-cmd-out ; @@ -115,12 +116,6 @@ \ the port 66 command sequence. : sci-quiet ( -- ) h# 50 h# ff03 ec! ; -.( Redefining wlan-reset to add temporary workaround) cr -: wlan-reset ( -- ) - h# fd h# fc15 ec! - wlan-reset -; - \ While accessing the SPI FLASH, we have to turn off the keyboard controller, \ because it continuously fetches from the SPI FLASH when it's on. That \ interferes with our accesses.

1 0

r443 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Jun '07

07 Jun '07

Author: wmb Date: 2007-06-07 10:55:47 +0200 (Thu, 07 Jun 2007) New Revision: 443 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2C16 - release candidate 2 for B4, with released EC bits. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-06-07 00:33:38 UTC (rev 442) +++ cpu/x86/pc/olpc/versions.fth 2007-06-07 08:55:47 UTC (rev 443) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 15 +macro: FW_MINOR 16 \ The EC microcode -macro: EC_VERSION c15 +macro: EC_VERSION c16 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r442 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Jun '07

07 Jun '07

Author: wmb Date: 2007-06-07 02:33:38 +0200 (Thu, 07 Jun 2007) New Revision: 442 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2C15 - release candidate for B4. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-06-07 00:32:10 UTC (rev 441) +++ cpu/x86/pc/olpc/versions.fth 2007-06-07 00:33:38 UTC (rev 442) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 14 +macro: FW_MINOR 15 \ The EC microcode -macro: EC_VERSION c13 +macro: EC_VERSION c15 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp ./c11t-1.bin ec.img +\ macro: GET_EC cp ./proto4.bin ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1

1 0

r441 - dev/olpc/cafenand
by svn＠openbios.org 07 Jun '07

07 Jun '07

Author: wmb Date: 2007-06-07 02:32:10 +0200 (Thu, 07 Jun 2007) New Revision: 441 Modified: dev/olpc/cafenand/selftest.fth Log: OLPC CaFe NAND selftest - fixed a stack error. Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2007-06-07 00:13:32 UTC (rev 440) +++ dev/olpc/cafenand/selftest.fth 2007-06-07 00:32:10 UTC (rev 441) @@ -67,10 +67,16 @@ ." Fill " dup .d ." random blocks with h# 55, h# aa and h# ff" cr 0 ?do - i 1 > if random-page else i 0<> if usable-page-limit 1- else 0 then then - pages/eblock 1- invert and + i case + 0 of 0 endof + 1 of usable-page-limit 1- endof + ( default ) random-page swap + endcase ( block# ) + pages/eblock 1- invert and ( block#' ) - dup block-bad? not if + dup block-bad? if ( block#' ) + drop ( ) + else ( block#' ) (cr dup . sbuf over read-eblock dup record-err 0= if dup h# 55 test-eblock record-err

1 0

r440 - dev/olpc/kb3700
by svn＠openbios.org 07 Jun '07

07 Jun '07

Author: wmb Date: 2007-06-07 02:13:32 +0200 (Thu, 07 Jun 2007) New Revision: 440 Modified: dev/olpc/kb3700/ecio.fth Log: OLPC ecio.fth - In wlan-reset, added a workaround for an EC bug. Hopefully the EC bug will be fixed soon and we can remove the workaround. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-06-07 00:11:52 UTC (rev 439) +++ dev/olpc/kb3700/ecio.fth 2007-06-07 00:13:32 UTC (rev 440) @@ -115,6 +115,12 @@ \ the port 66 command sequence. : sci-quiet ( -- ) h# 50 h# ff03 ec! ; +.( Redefining wlan-reset to add temporary workaround) cr +: wlan-reset ( -- ) + h# fd h# fc15 ec! + wlan-reset +; + \ While accessing the SPI FLASH, we have to turn off the keyboard controller, \ because it continuously fetches from the SPI FLASH when it's on. That \ interferes with our accesses.

1 0

r439 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Jun '07

07 Jun '07

Author: wmb Date: 2007-06-07 02:11:52 +0200 (Thu, 07 Jun 2007) New Revision: 439 Modified: cpu/x86/pc/olpc/resume.bth Log: OLPC resume - don't clear the wakeup status bits in PM1_STS (ACPI+0) in the assembly code, so high-level code can look at them. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-06-05 19:18:50 UTC (rev 438) +++ cpu/x86/pc/olpc/resume.bth 2007-06-07 00:11:52 UTC (rev 439) @@ -325,9 +325,6 @@ si bx cmp = until - h# 1840 # dx mov \ PM1_STS/EN I/O port number - dx ax in ax dx out \ Preserve EN bits and clear STS bits - h# 38 [bp] si lea \ Save area ax lods ax dx xchg ax lods ax dx xchg h# 4c00.0014 wmsr \ RSTPLL

1 0

r438 - dev
by svn＠openbios.org 05 Jun '07

05 Jun '07

Author: wmb Date: 2007-06-05 21:18:50 +0200 (Tue, 05 Jun 2007) New Revision: 438 Modified: dev/pckbd.fth Log: OLPC - use an abbreviated init sequence for the OLPC keyboard, to avoid startup failures with the EC wants to send us events from non-keyboard sources. Modified: dev/pckbd.fth =================================================================== --- dev/pckbd.fth 2007-06-05 19:15:23 UTC (rev 437) +++ dev/pckbd.fth 2007-06-05 19:18:50 UTC (rev 438) @@ -335,9 +335,24 @@ false ; +: ?olpc-keyboard ( -- ) + " enable-intf" $call-parent + begin get-data? while + drop + true to keyboard-present? + 5 ms + repeat + keyboard-present? if exit then + kbd-reset 0= to keyboard-present? +; + : reset ( -- ) init-data - clear-state get-initial-state + clear-state +[ifdef] olpc + ?olpc-keyboard +[else] + get-initial-state \ Test the keyboard interface clock and data lines " test-lines" $call-parent if false to keyboard-present? exit then @@ -354,6 +369,7 @@ \ 7 set-leds d# 100 ms 0 set-leds then +[then] \ Leave the keyboard in scan set 2 (its default state), but also leave \ the 8042 in the mode where it translates to scan set 1.

1 0

r437 - cpu/x86/pc/olpc/sdtools
by svn＠openbios.org 05 Jun '07

05 Jun '07

Author: wmb Date: 2007-06-05 21:15:23 +0200 (Tue, 05 Jun 2007) New Revision: 437 Modified: cpu/x86/pc/olpc/sdtools/maketar cpu/x86/pc/olpc/sdtools/sd.fth Log: OLPC sdkit - added EC access routines, put all the files in a subdirectory. Modified: cpu/x86/pc/olpc/sdtools/maketar =================================================================== --- cpu/x86/pc/olpc/sdtools/maketar 2007-06-04 23:30:10 UTC (rev 436) +++ cpu/x86/pc/olpc/sdtools/maketar 2007-06-05 19:15:23 UTC (rev 437) @@ -1,9 +1,11 @@ #!/bin/sh -ls ../../../../../cpu/x86/Linux -cp ../../../../../cpu/x86/Linux/forth . -cp ../../../../../cpu/x86/build/builder.dic . -cp ../../../../../cpu/x86/ioports.fth . -cp ../../../../../cpu/x86/pc/olpc/mfgdata.fth . -cp ../../../../../dev/olpc/dcon/dconsmb.fth . -tar cfz sdkit.tgz forth builder.dic sd.fth ioports.fth dconsmb.fth mfgdata.fth dumpgamma.fth sd -rm -f builder.dic forth ioports.fth mfgdata.fth dconsmb.fth +mkdir -p sdkit +cp ../../../../../cpu/x86/Linux/forth sdkit +cp ../../../../../cpu/x86/build/builder.dic sdkit +cp ../../../../../cpu/x86/ioports.fth sdkit +cp ../../../../../cpu/x86/pc/olpc/mfgdata.fth sdkit +cp ../../../../../dev/olpc/dcon/dconsmb.fth sdkit +cp ../../../../../dev/olpc/kb3700/ecio.fth sdkit +cp sd sd.fth dumpgamma.fth sdkit +tar cfz sdkit.tgz sdkit +# rm sdkit/* Modified: cpu/x86/pc/olpc/sdtools/sd.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/sd.fth 2007-06-04 23:30:10 UTC (rev 436) +++ cpu/x86/pc/olpc/sdtools/sd.fth 2007-06-05 19:15:23 UTC (rev 437) @@ -34,7 +34,8 @@ : r ( offset -- ) sdl@ u. ; : w ( l offset -- ) sdl! ; -fff0.0000 10.0000 mmap constant flash-base +-1 value flash-base +fff0.0000 10.0000 mmap to flash-base \needs cdump : cdump ( adr len -- ) bounds ?do i c@ .x loop ; \needs .mfg-data fload mfgdata.fth @@ -60,6 +61,12 @@ \needs vp@ fload dumpgamma.fth +: unimp true abort" SPI reflashing is not implemented in this version" ; +: spicmd! unimp ; : spi-cmd-wait unimp ; : power-off unimp ; +defer spi-start defer spi@ defer spi! defer spi-out defer spi-reprogrammed +1 value spi-us +\needs ec@ fload ecio.fth + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r436 - cpu/x86/pc/olpc
by svn＠openbios.org 05 Jun '07

05 Jun '07

Author: wmb Date: 2007-06-05 01:30:10 +0200 (Tue, 05 Jun 2007) New Revision: 436 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC - (a) Don't freeze display by default (b) Play startup only if left-side button held (c) The only game key that invokes interactive mode is X (above power button) Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-06-04 23:27:29 UTC (rev 435) +++ cpu/x86/pc/olpc/fw.bth 2007-06-04 23:30:10 UTC (rev 436) @@ -318,7 +318,10 @@ h# 1454 pl@ 2 and if ." Interacting due to botched resume" cr hex interact then - i-key-wait if ." Interacting" cr hex interact then + i-key-wait if + " patch false fast-boot? startup" eval + ." Interacting" cr hex interact + then [ifdef] lx-devel init-superio [then] @@ -434,17 +437,19 @@ \ fload ${BP}/cpu/x86/pc/report.fth fload ${BP}/ofw/core/dualconsole.fth -: user-switch? ( -- flag ) +0 value game-key-mask + +: read-game-keys ( -- f) [ifdef] lx-devel false exit [then] atest? if true exit then - game-key@ 0<> dup if + game-key@ dup to game-key-mask if ." Release the game key to continue" cr begin d# 100 ms game-key@ 0= until then ; : fast-boot? ( -- flag ) [ifdef] rom-loaded - user-switch? 0= + game-key-mask h# 100 and 0= [else] false [then] @@ -510,6 +515,9 @@ r> to playback-volume ; +: ?start-sound ( -- ) + game-key-mask h# 40 and if start-sound then +; : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then ; @@ -527,25 +535,25 @@ no-page console-start + read-game-keys fast-boot? if stdout off probe-pci - start-sound + ?start-sound ['] false to interrupt-auto-boot? interpreter-init [ifndef] lx-devel enable-power-button [then] - freeze auto-boot screen-ih stdout ! open-keyboard optional-startup else banner - + probe-pci + ?start-sound open-keyboard - probe-pci optional-startup interpreter-init [ifndef] lx-devel

1 0

r435 - in dev: geode olpc/kb3700 olpc/spiflash
by svn＠openbios.org 05 Jun '07

05 Jun '07

Author: wmb Date: 2007-06-05 01:27:29 +0200 (Tue, 05 Jun 2007) New Revision: 435 Modified: dev/geode/acpi.fth dev/olpc/kb3700/ecio.fth dev/olpc/spiflash/spiui.fth Log: OLPC - Fixes for new EC command protocol - see trac #1562. Modified: dev/geode/acpi.fth =================================================================== --- dev/geode/acpi.fth 2007-06-04 23:21:02 UTC (rev 434) +++ dev/geode/acpi.fth 2007-06-04 23:27:29 UTC (rev 435) @@ -19,8 +19,12 @@ \ If the keyboard controller is off (after "flash"), power off doesn't work. \ I suspect that is because the EC doesn't notice the deassertion \ of main_on and sus_on from the 5536. - kbc-on + ec-power-off + \ The rest of this will succeed in turning off the CPU, but the EC will + \ stay on. The ec-power-off above turns off both the EC and CPU, so the + \ rest of this is for historical interest only. + \ Recipe from AMD; no way I would have figured this out from manual 5 d# 10 << 1 or 8 acpi-w! \ S5 - power off Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-06-04 23:21:02 UTC (rev 434) +++ dev/olpc/kb3700/ecio.fth 2007-06-04 23:27:29 UTC (rev 435) @@ -21,12 +21,6 @@ \ EC internal addresses -h# fc2a constant GPIO5 - -: flash-write-protect-on ( -- ) GPIO5 ec@ h# 80 invert and GPIO5 ec! ; - -: flash-write-protect-off ( -- ) GPIO5 ec@ h# 80 or GPIO5 ec! ; - : wait-ib-empty ( -- ) d# 1000 0 do h# 6c pc@ 2 and 0= if unloop exit then 1 ms loop true abort" EC port 6c input buffer timeout" @@ -70,25 +64,25 @@ : bat-gauge-id@ ( -- sn0 .. sn7 ) h# 17 ec-cmd-out 8 0 do ec-rb loop ; : bat-gauge@ ( -- b ) h# 18 ec-cmd-out h# 31 ec-wb ec-rb ; \ 31 is the EEPROM address : board-id@ ( -- b ) h# 19 ec-cmd-b@ ; -: sci-source@ ( -- b ) h# 1a ec-cmd-w@ ; +: sci-source@ ( -- b ) h# 1a ec-cmd-b@ ; : sci-mask! ( b -- ) h# 1b ec-cmd-b! ; : sci-mask@ ( -- b ) h# 1c ec-cmd-b@ ; : game-key@ ( -- w ) h# 1d ec-cmd-out ec-rw ; : ec-date! ( day month year -- ) h# 1e ec-cmd-out ec-wb ec-wb ec-wb ; -: ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; \ XXX is this byte or word? +: ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; : bat-init-lifepo4 ( -- ) h# 21 ec-cmd-out ; : bat-init-nimh ( -- ) h# 22 ec-cmd-out ; : wlan-off ( -- ) 0 h# 23 ec-cmd-b! ; : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; : wlan-wake ( -- ) h# 24 ec-cmd-out ; -: wlan-rst ( -- ) h# 25 ec-cmd-out ; +: wlan-reset ( -- ) h# 25 ec-cmd-out ; : dcon-disable ( -- ) 0 h# 26 ec-cmd-b! ; : dcon-enable ( -- ) 1 h# 26 ec-cmd-b! ; : reset-ec-warm ( -- ) h# 27 ec-cmd-out ; : reset-ec ( -- ) h# 28 ec-cmd-out ; : write-protect-fw ( -- ) h# 29 ec-cmd-out ; -: ebook-mode? ( -- ) h# 2a ec-cmd-b@ ; +: ebook-mode? ( -- b ) h# 2a ec-cmd-b@ ; \ EC mailbox access words @@ -117,8 +111,6 @@ : kb3920? ( -- flag ) h# 6c pc@ h# ff = if true exit then 9 ec-cmd 9 = ; -: snoop-board-id@ ( -- id ) h# fa20 ec@ ; - \ This makes the EC stop generating a flood of SCIs every time you do \ the port 66 command sequence. : sci-quiet ( -- ) h# 50 h# ff03 ec! ; @@ -135,14 +127,39 @@ true to kbc-off? ; +: ec-power-off ( -- ) + 1 h# ff14 ec! + 1 h# ff01 ec! \ Tell the EC to bounce us on restart + 0 h# ff14 ec! +; + \ Unfortunately, since the system reset is mediated by the keyboard \ controller, turning the keyboard controller back on resets the system. : kbc-on ( -- ) h# ff14 ec@ 1 invert and h# ff14 ec! \ Innocuous if already on + false to kbc-off? ; +: fancy-kbc-on ( -- ) + 2 h# ff01 ec! \ Prevent full system reset + h# ff14 ec@ 1 invert and h# ff14 ec! \ Innocuous if already on + d# 400 ms \ Give the EC time to start up + h# 44 h# fc80 ec! \ Re-enable scan code conversion and system flag + h# 43 h# fc81 ec! \ Re-enable fast gate and ibf/obf interrupts + h# f h# fe51 ec! \ Clear pending interrupts + h# f h# fe50 ec! \ Re-enable GPT interrupts + h# 0 h# fea7 ec! \ Clear FLASH write enable + h# 4 h# fead ec! \ fast read mode + h# fe95 ec@ h# 80 or h# fe95 ec! \ Write-protect LPC + h# 3 h# ff04 ec! \ enable IBF/OBF interrupts +\ h# 40 h# ff08 ec! \ Clear some interrupt + h# ff30 ec@ h# 10 or h# ff30 ec! \ Enable interrupt from GPIO04, PCI_RST# + + false to kbc-off? +; + \ kbc-pause temporarily halts execution of the keyboard controller microcode. \ kbc-resume makes it run again, picking up where it left off. \ This is useful for accessing the SPI FLASH in cases where you do not @@ -151,21 +168,6 @@ : kbc-pause ( -- ) h# dd ec-cmd66 ; : kbc-resume ( -- ) h# df ec-cmd66 ; - - -: kbd-led-on ( -- ) h# fc21 ec@ 1 invert and h# fc21 ec! ; -: kbd-led-off ( -- ) h# fc21 ec@ 1 or h# fc21 ec! ; - -: wlan-reset ( -- ) - \ WLAN reset is EC GPIOEE, controlled by EC registers fc15 and fc25 - h# fc15 ec@ h# fc25 ec@ ( enable data ) - dup h# 40 invert and h# fc25 ec! ( enable data ) \ WLAN_RESET data output low - over h# 40 or h# fc15 ec! ( enable data ) \ Assert output enable - 1 ms - h# 40 or h# fc25 ec! ( enable ) \ Drive data high - h# 40 invert and h# fc15 ec! ( ) \ Release output enable -; - : io-spi@ ( reg# -- b ) h# fea8 + ec@ ; : io-spi! ( b reg# -- ) h# fea8 + ec! ; @@ -179,6 +181,8 @@ : io-spi-reprogrammed ( -- ) ." Powering off..." d# 2000 ms cr power-off +\ kbc-on +\ ." Keyboard back on" cr ; : io-spi-start ( -- ) Modified: dev/olpc/spiflash/spiui.fth =================================================================== --- dev/olpc/spiflash/spiui.fth 2007-06-04 23:21:02 UTC (rev 434) +++ dev/olpc/spiflash/spiui.fth 2007-06-04 23:27:29 UTC (rev 435) @@ -236,7 +236,7 @@ $get-file ; -: flash ( ["filename"] -- ) get-file reflash power-off ; +: flash ( ["filename"] -- ) get-file reflash ; [ifdef] dev dev /flash

1 0

r434 - forth/lib
by svn＠openbios.org 05 Jun '07

05 Jun '07

Author: wmb Date: 2007-06-05 01:21:02 +0200 (Tue, 05 Jun 2007) New Revision: 434 Modified: forth/lib/breakpt.fth Log: Fixed single-stepping breakage resulting from no longer loading fixkbd.fth Modified: forth/lib/breakpt.fth =================================================================== --- forth/lib/breakpt.fth 2007-06-01 22:56:19 UTC (rev 433) +++ forth/lib/breakpt.fth 2007-06-04 23:21:02 UTC (rev 434) @@ -26,7 +26,7 @@ \ nuser restartable? restartable? off defer restart ( -- ) -defer restart-step ( -- ) +defer restart-step ( -- ) ' restart to restart-step hidden definitions

1 0

Re: [OpenBIOS] r433 - dev/usb2/device/wlan
by Segher Boessenkool 02 Jun '07

02 Jun '07

> +: reset-wlan ( -- ) " wlan-reset" evaluate ; Can't you use DEFER , or at least put a CATCH around the EVALUATE ? Segher

1 0

r433 - dev/usb2/device/wlan
by svn＠openbios.org 02 Jun '07

02 Jun '07

Author: wmb Date: 2007-06-02 00:56:19 +0200 (Sat, 02 Jun 2007) New Revision: 433 Modified: dev/usb2/device/wlan/usb8388.fth Log: OLPC WLAN driver - Don't implement EC-based WLAN reset directly, instead call out to a reset routine defined elsewhere. Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2007-06-01 18:20:38 UTC (rev 432) +++ dev/usb2/device/wlan/usb8388.fth 2007-06-01 22:56:19 UTC (rev 433) @@ -510,13 +510,7 @@ \ Reset \ ========================================================================= -: reset-wlan ( -- ) - fc25 dup " ec@" evaluate 40 invert and swap " ec!" evaluate \ Assert WLAN_RESET# - fc15 dup " ec@" evaluate 40 or swap " ec!" evaluate \ Enable output - 100 ms - fc15 dup " ec@" evaluate 40 invert and swap " ec!" evaluate \ Disable output - 5 ms -; +: reset-wlan ( -- ) " wlan-reset" evaluate ; \ ========================================================================= \ MAC address

1 0

r432 - dev/olpc/spiflash
by svn＠openbios.org 01 Jun '07

01 Jun '07

Author: wmb Date: 2007-06-01 20:20:38 +0200 (Fri, 01 Jun 2007) New Revision: 432 Modified: dev/olpc/spiflash/spiflash.fth Log: OLPC SPI FLASH utility - Added a workaround message for trac #1300, the problem with the SPI ID sometimes reading as 14 instead of 13. Modified: dev/olpc/spiflash/spiflash.fth =================================================================== --- dev/olpc/spiflash/spiflash.fth 2007-05-31 20:15:17 UTC (rev 431) +++ dev/olpc/spiflash/spiflash.fth 2007-06-01 18:20:38 UTC (rev 432) @@ -288,6 +288,11 @@ case h# 13 of ['] common-write endof h# bf of ['] sst-write endof + h# 14 of + ." The SPI FLASH ID reads as 14. This is due to an infrequent hardware problem." cr + ." If you power cycle and try again, it will probably work the next time." cr + abort + endof ( default ) ." Unsupported SPI FLASH ID " dup .x cr abort endcase to write-spi-flash

1 0

r431 - dev/olpc/kb3700
by svn＠openbios.org 31 May '07

31 May '07

Author: wmb Date: 2007-05-31 22:15:17 +0200 (Thu, 31 May 2007) New Revision: 431 Modified: dev/olpc/kb3700/ecio.fth Log: Support new EC command protocol. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-31 00:05:36 UTC (rev 430) +++ dev/olpc/kb3700/ecio.fth 2007-05-31 20:15:17 UTC (rev 431) @@ -27,12 +27,25 @@ : flash-write-protect-off ( -- ) GPIO5 ec@ h# 80 or GPIO5 ec! ; - -: ec-cmd ( cmd -- response ) - h# 6c pc! begin 1 ms h# 6c pc@ 3 and 1 = until 1 ms h# 68 pc@ - h# ff h# 6c pc! \ Release ownership +: wait-ib-empty ( -- ) + d# 1000 0 do h# 6c pc@ 2 and 0= if unloop exit then 1 ms loop + true abort" EC port 6c input buffer timeout" ; +: ec-cmd-out ( cmd -- ) wait-ib-empty h# 6c pc! ; +: ec-wb ( -- ) wait-ib-empty h# 68 pc! ; +: ec-rb ( -- b ) + d# 1000 0 do + h# 6c pc@ 3 and 1 = if + h# 68 pc@ + unloop exit + then + 1 ms + loop + true abort" EC port 6c output buffer timeout" +; +: ec-cmd ( cmd -- response ) ec-cmd-out ec-rb ; + : ec-cmd66 ( byte -- ) h# 66 pc! \ It typically requires about 200 polls @@ -40,53 +53,13 @@ true abort" EC didn't respond to port 66 command" ; -: ec-cmd@ ( -- b ) h# 6c pc@ ; - -: ec-release ( -- ) h# ff h# 6c pc! 1 ms h# 68 pc@ drop ; -: ec-wait-wr ( -- ) - d# 140 0 do - ec-cmd@ 2 and 0= if unloop exit then - 5 ms - loop - ." EC write timed out" cr -; -\ Empirically, it can take a long time for the EC to sense the game -\ keys when several are down at once. 500 mS is not enough. -: ec-wait-rd ( -- ) - d# 700 0 do - ec-cmd@ 1 and if unloop exit then - d# 1 ms - loop - ." EC read timed out" cr -; -: flush-ec ( -- ) - begin ec-cmd@ dup h# 80 and while - drop ." EC release" cr ec-release d# 10 ms - repeat ( 6c-val ) - - begin 1 and while ( ) - h# 68 pc@ drop ( ) - d# 200 us ( ) - ec-cmd@ ( 6c-val ) - repeat ( 6c-val ) -; -: 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-wait-wr ; - -: 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 ; -: ec-cmda ( b -- ) flush-ec ec-cmd! ec-dat@ drop ; -: ec-cmd0 ( -- ) ec-cmda ec-release ; +: ec-cmd-w@ ( cmd -- w ) ec-cmd-out ec-rw ; +: ec-cmd-b@ ( cmd -- b ) ec-cmd ; +: ec-cmd-b! ( b cmd -- ) ec-cmd-out ec-wb ; -: ec-cmd-w@ ( cmd -- w ) ec-cmda ec-rw ec-release ; -: ec-cmd-b@ ( cmd -- w ) ec-cmda ec-rb ec-release ; -: ec-cmd-b! ( b cmd -- ) ec-cmda ec-wb ec-release ; - : bat-voltage@ ( -- w ) h# 10 ec-cmd-w@ ; : bat-current@ ( -- w ) h# 11 ec-cmd-w@ ; : bat-acr@ ( -- w ) h# 12 ec-cmd-w@ ; @@ -94,51 +67,48 @@ : ambient-temp@ ( -- w ) h# 14 ec-cmd-w@ ; : bat-status@ ( -- b ) h# 15 ec-cmd-b@ ; : bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; -: bat-gauge-id@ ( -- sn0 .. sn7 ) - h# 17 ec-cmda - 8 0 do ec-rb loop - ec-release -; -: bat-gauge@ ( -- b ) h# 18 ec-cmda h# 31 ec-wb ec-dat@ ec-release ; \ 31 is the EEPROM address +: bat-gauge-id@ ( -- sn0 .. sn7 ) h# 17 ec-cmd-out 8 0 do ec-rb loop ; +: bat-gauge@ ( -- b ) h# 18 ec-cmd-out h# 31 ec-wb ec-rb ; \ 31 is the EEPROM address : board-id@ ( -- b ) h# 19 ec-cmd-b@ ; : sci-source@ ( -- b ) h# 1a ec-cmd-w@ ; : sci-mask! ( b -- ) h# 1b ec-cmd-b! ; : sci-mask@ ( -- b ) h# 1c ec-cmd-b@ ; -: game-key@ ( -- w ) h# 1d ec-cmda ec-rw ec-release ; -: ec-date! ( day month year -- ) h# 1e ec-cmda ec-wb ec-wb ec-wb ec-release ; +: game-key@ ( -- w ) h# 1d ec-cmd-out ec-rw ; +: ec-date! ( day month year -- ) h# 1e ec-cmd-out ec-wb ec-wb ec-wb ; : ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; \ XXX is this byte or word? -: bat-init-lifepo4 ( -- ) h# 21 ec-cmd0 ; -: bat-init-nimh ( -- ) h# 22 ec-cmd0 ; +: bat-init-lifepo4 ( -- ) h# 21 ec-cmd-out ; +: bat-init-nimh ( -- ) h# 22 ec-cmd-out ; : wlan-off ( -- ) 0 h# 23 ec-cmd-b! ; : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; -: wlan-wake ( -- ) h# 24 ec-cmd0 ; -: wlan-rst ( -- ) h# 25 ec-cmd0 ; +: wlan-wake ( -- ) h# 24 ec-cmd-out ; +: wlan-rst ( -- ) h# 25 ec-cmd-out ; : dcon-disable ( -- ) 0 h# 26 ec-cmd-b! ; : dcon-enable ( -- ) 1 h# 26 ec-cmd-b! ; -: reset-ec-warm ( -- ) h# 27 ec-cmd0 ; -: reset-ec ( -- ) h# 28 ec-cmd0 ; -: write-protect-fw ( -- ) h# 29 ec-cmd0 ; -\ : disable-ec-io ( -- ) h# 2a ec-cmd0 ; \ ??? +: reset-ec-warm ( -- ) h# 27 ec-cmd-out ; +: reset-ec ( -- ) h# 28 ec-cmd-out ; +: write-protect-fw ( -- ) h# 29 ec-cmd-out ; +: ebook-mode? ( -- ) h# 2a ec-cmd-b@ ; \ 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-adr@ ( -- w ) h# 80 ec-cmd-out ec-rw ; +: ec-mb-adr! ( w -- ) h# 81 ec-cmd-out ec-ww ; +: ec-mb-setup ( cmd w -- ) ec-mb-adr! ec-cmd-out ; : ec-mb-b@ ( adr -- b ) h# 8a ec-mb-setup h# 84 ec-cmd-b@ ; : ec-mb-w@ ( adr -- w ) h# 88 ec-mb-setup h# 82 ec-cmd-w@ ; -: ec-mb-b! ( b adr -- ) h# 85 ec-mb-setup ec-wb h# 8b ec-cmda ec-release ; -: ec-mb-w! ( w adr -- ) h# 83 ec-mb-setup ec-ww h# 89 ec-cmda ec-release ; +: ec-mb-b! ( b adr -- ) h# 85 ec-mb-setup ec-wb h# 8b ec-cmd-out ; +: ec-mb-w! ( w adr -- ) h# 83 ec-mb-setup ec-ww h# 89 ec-cmd-out ; \ 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_ABNORMAL_EVENT 0x08 \ SCI_EB_MODE_CHANGE 0x10 +\ SCI_WAKEUP_WLAN_EVENT 0x20 \ This command hard-resets the EC deeply enough for the SP write-protect to \ be off when the system is powered up again.

1 0

r430 - cpu/x86/pc/olpc
by svn＠openbios.org 31 May '07

31 May '07

Author: wmb Date: 2007-05-31 02:05:36 +0200 (Thu, 31 May 2007) New Revision: 430 Modified: cpu/x86/pc/olpc/copynand.fth Log: OLPC copy-nand - Trac #498 - Check the nand.img file against the nand.crc file if there is one. Also changed "crc-img" to require only one argument, the name of the .img file (the .crc filename is synthesized from the .img filename.). Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-05-30 22:41:42 UTC (rev 429) +++ cpu/x86/pc/olpc/copynand.fth 2007-05-31 00:05:36 UTC (rev 430) @@ -3,14 +3,35 @@ 0 value fileih 0 value nandih +0 value crc-ih + 0 value /nand-block 0 value /nand-page 0 value nand-pages/block 0 value #nand-pages +: close-nand-ihs ( -- ) + fileih ?dup if 0 to fileih close-dev then + nandih ?dup if 0 to nandih close-dev then + crc-ih ?dup if 0 to crc-ih close-dev then +; + +: ?nand-abort ( flag msg$ -- ) + rot if + close-nand-ihs $abort + else + 2drop + then +; + +: ?key-stop ( -- ) + key? dup if key drop then ( stop? ) + " Stopped by keystroke" ?nand-abort +; + : open-nand ( -- ) " /nandflash" open-dev to nandih - nandih 0= abort" Can't open NAND FLASH device" + nandih 0= " Can't open NAND FLASH device" ?nand-abort " erase-size" nandih $call-method to /nand-block " block-size" nandih $call-method to /nand-page " size" nandih $call-method /nand-page um/mod nip to #nand-pages @@ -18,18 +39,66 @@ " start-scan" nandih $call-method ; +h# 20 buffer: line-buf +: next-crc ( -- false | crc true ) + line-buf 9 " read" crc-ih $call-method ( len ) + dup 0= if exit then ( len ) + 9 <> " Bad CRC line length" ?nand-abort ( ) + line-buf 8 $number " Bad number in CRC file" ?nand-abort ( crc ) + true +; + + +: open-crcs ( name$ -- ) + open-dev to crc-ih + crc-ih 0= " Can't open CRC file" ?nand-abort +; + +h# 100 buffer: image-name-buf +: image-name$ ( -- adr len ) image-name-buf count ; + + +: ?open-crcs ( -- ) + image-name$ + 4 - 4 " .img" $= if + " crc" image-name$ + 3 - swap move + image-name$ open-crcs + else + 0 to crc-ih + then + crc-ih if ." Check file is " image-name$ type cr then +; + : open-img ( "devspec" -- ) - safe-parse-word open-dev to fileih - fileih 0= abort" Can't open NAND image file" + safe-parse-word 2dup image-name-buf place ( devspec$ ) + open-dev to fileih + fileih 0= " Can't open NAND image file" ?nand-abort ; : #records ( ih /record -- n ) swap " size" rot $call-method rot um/mod nip ; +: check-mem-crc ( crc -- ) + load-base /nand-block $crc ( crc actual-crc ) + 2dup <> if + cr ." CRC miscompare - expected " swap . ." got " . cr + true " Stopping" ?nand-abort + ?key-stop + else + 2drop + then ( ) +; + +: ?check-crc ( -- ) + crc-ih if + next-crc 0= " Premature end of .crc file" ?nand-abort + check-mem-crc + then +; : copy-nand ( "devspec" -- ) open-nand open-img + ?open-crcs ['] noop to show-progress @@ -42,11 +111,11 @@ load-base /nand-block " read" fileih $call-method 0> while (cr dup . 1+ + ?check-crc load-base " copy-block" nandih $call-method repeat drop - fileih close-dev - nandih close-dev + close-nand-ihs ; : verify-nand ( "devspec" -- ) @@ -65,37 +134,19 @@ load-base load-base /nand-block + /nand-block comp if ( block# ) cr ." Miscompare in block starting at page# " ( block# ) " scan-page#" nandih $call-method .x cr ( block# ) - key? if - nandih close-dev fileih close-dev ( block# ) - key drop true abort" Aborted by keystroke" - then + ?key-stop then ( block# ) repeat ( block# ) drop ( ) - fileih close-dev - nandih close-dev + close-nand-ihs ; -0 value crc-ih -h# 20 buffer: line-buf -: next-crc ( -- false | crc true ) - line-buf 9 " read" crc-ih $call-method ( len ) - dup 0= if exit then ( len ) - 9 <> abort" Bad CRC line length" ( ) - line-buf 8 $number abort" Bad number in CRC file" ( crc ) - true -; - -: open-crcs ( -- ) - safe-parse-word open-dev to crc-ih - crc-ih 0= abort" Can't open CRC file" -; - -: crc-img ( "img-devspec" "crc-devspec" -- ) +: crc-img ( "img-devspec" -- ) hex - open-nand nandih close-dev \ To set sizes + open-nand close-nand-ihs \ To set sizes open-img - open-crcs + ?open-crcs + crc-ih 0= " No CRC file" ?nand-abort ['] noop to show-progress @@ -106,28 +157,18 @@ swap (cr dup . 1+ swap ( block#' crc ) load-base /nand-block " read" fileih $call-method ( block# crc len ) - /nand-block <> abort" Short img file" ( block# crc ) + /nand-block <> " Short img file" ?nand-abort ( block# crc ) - load-base /nand-block $crc ( block# crc actual-crc ) - 2dup <> if - cr ." CRC miscompare - expected " swap . ." got " . cr - key? if - crc-ih close-dev fileih close-dev - key drop true abort" Aborted by keystroke" - then - else - 2drop - then ( block# ) + check-mem-crc ( block# ) repeat ( block# ) drop ( ) - fileih close-dev - crc-ih close-dev + close-nand-ihs ; : crc-nand ( "crc-devspec" -- ) hex open-nand - open-crcs + safe-parse-word open-crcs ['] noop to show-progress ." Verifying " crc-ih 9 #records . ." blocks" cr @@ -143,17 +184,13 @@ cr ." CRC miscompare - expected " swap . ." got " . ." in NAND block starting at page " " scan-page#" nandih $call-method . cr - key? if - nandih close-dev crc-ih close-dev - key drop true abort" Aborted by keystroke" - then + ?key-stop else 2drop then ( block# ) repeat ( block# ) drop ( ) - nandih close-dev - crc-ih close-dev + close-nand-ihs ; @@ -181,7 +218,7 @@ then to fileih - fileih 0= if nandih close-dev true abort" Can't open output" then + fileih 0= " Can't open output" ?nand-abort \ The stack is empty at the end of each line unless otherwise noted #nand-pages 0 do @@ -202,8 +239,7 @@ nand-pages/block +loop cr ." Done" cr - fileih close-dev - nandih close-dev + close-nand-ihs ; : dump-nand ( "devspec" -- ) true to dump-oob? (dump-nand) ; : save-nand ( "devspec" -- ) false to dump-oob? (dump-nand) ; @@ -213,13 +249,11 @@ open-nand safe-parse-word open-dev to fileih - fileih 0= abort" Can't open NAND fastboot image file" + fileih 0= " Can't open NAND fastboot image file" ?nand-abort - " size" fileih $call-method drop ( len ) - " start-fastcopy" nandih $call-method if ( ) - nandih close-dev fileih close-dev - true abort" Not enough spare NAND space for fast copy" - then ( ) + " size" fileih $call-method drop ( len ) + " start-fastcopy" nandih $call-method ( error? ) + " Not enough spare NAND space for fast copy" ?nand-abort begin ( ) load-base /nand-block " read" fileih $call-method ( len ) @@ -232,8 +266,7 @@ drop ( ) " end-fastcopy" nandih $call-method ( ) - fileih close-dev - nandih close-dev + close-nand-ihs ; \ LICENSE_BEGIN

1 0

r429 - ofw/fs/jffs2
by svn＠openbios.org 31 May '07

31 May '07

Author: wmb Date: 2007-05-31 00:41:42 +0200 (Thu, 31 May 2007) New Revision: 429 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - OLPC Trac #1609 - Handle truncated files without crashing (don't erase a negative length). Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-30 07:32:30 UTC (rev 428) +++ ofw/fs/jffs2/jffs2.fth 2007-05-30 22:41:42 UTC (rev 429) @@ -820,7 +820,7 @@ 2 pick ( final write hiwater final ) over - ( final write hiwater extra ) swap file-buf + swap ( final write buf-adr extra ) - erase ( final write ) + 0 max erase ( final write ) \ 0 max accounts for truncation then ( final write ) drop to file-size \ Set overall length ;

1 0

r428 - dev/olpc/cafecamera
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 09:32:30 +0200 (Wed, 30 May 2007) New Revision: 428 Modified: dev/olpc/cafecamera/cafecamera.fth Log: OLPC cafecamera.fth - Trac #1577 - Turn off camera power at probe time. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-05-30 06:11:53 UTC (rev 427) +++ dev/olpc/cafecamera/cafecamera.fth 2007-05-30 07:32:30 UTC (rev 428) @@ -555,6 +555,11 @@ 0 close ( error? ) ; +\ Do this at probe time to make sure the camera power is off +map-regs +0000.0008 3038 cl! \ Turn on CaFe GPIO3 to enable power +0008.0000 315c cl! \ Set VDD to off +unmap-regs \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

r427 - dev/olpc/cafecamera
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:11:53 +0200 (Wed, 30 May 2007) New Revision: 427 Modified: dev/olpc/cafecamera/cafecamera.fth Log: OLPC cafecamera.fth - Trac #1580 - Must reinit camera on every open, now that we power it off on close. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-05-30 06:10:31 UTC (rev 426) +++ dev/olpc/cafecamera/cafecamera.fth 2007-05-30 06:11:53 UTC (rev 427) @@ -22,7 +22,6 @@ : my-w@ ( offset -- w ) my-space + " config-w@" $call-parent ; : my-w! ( w offset -- ) my-space + " config-w!" $call-parent ; -true value first-open? 0 instance value chip : cl! ( l adr -- ) chip + rl! ; @@ -467,9 +466,8 @@ : open ( -- flag ) map-regs - first-open? if init then + init ov7670-detected? 0= if unmap-regs false exit then - false to first-open? alloc-dma-bufs read-setup true

1 0

r426 - cpu/x86/pc/olpc
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:10:31 +0200 (Wed, 30 May 2007) New Revision: 426 Modified: cpu/x86/pc/olpc/copynand.fth Log: OLPC copynand.fth - Close files when aborting via the keyboard. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-05-30 06:09:43 UTC (rev 425) +++ cpu/x86/pc/olpc/copynand.fth 2007-05-30 06:10:31 UTC (rev 426) @@ -65,7 +65,10 @@ load-base load-base /nand-block + /nand-block comp if ( block# ) cr ." Miscompare in block starting at page# " ( block# ) " scan-page#" nandih $call-method .x cr ( block# ) - key? abort" Aborted by keystroke" ( block# ) + key? if + nandih close-dev fileih close-dev ( block# ) + key drop true abort" Aborted by keystroke" + then then ( block# ) repeat ( block# ) drop ( ) @@ -108,7 +111,10 @@ load-base /nand-block $crc ( block# crc actual-crc ) 2dup <> if cr ." CRC miscompare - expected " swap . ." got " . cr - key? abort" Aborted by keystroke" + key? if + crc-ih close-dev fileih close-dev + key drop true abort" Aborted by keystroke" + then else 2drop then ( block# ) @@ -137,7 +143,10 @@ cr ." CRC miscompare - expected " swap . ." got " . ." in NAND block starting at page " " scan-page#" nandih $call-method . cr - key? abort" Aborted by keystroke" + key? if + nandih close-dev crc-ih close-dev + key drop true abort" Aborted by keystroke" + then else 2drop then ( block# )

1 0

r425 - cpu/x86/pc/olpc
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:09:43 +0200 (Wed, 30 May 2007) New Revision: 425 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC fw.bth - Don't load fixkbd.fth; there is no need to switch the keyboard scan set on x86 OSs. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-30 06:08:53 UTC (rev 424) +++ cpu/x86/pc/olpc/fw.bth 2007-05-30 06:09:43 UTC (rev 425) @@ -172,8 +172,6 @@ fload ${BP}/ofw/core/symdebug.fth : release-load-area ( boundary-adr -- ) drop ; -fload ${BP}/cpu/x86/pc/fixkbd.fth \ Switch keyboard scan codes - [ifdef] use-elf fload ${BP}/ofw/elf/elf.fth fload ${BP}/ofw/elf/elfdebug.fth

1 0

r424 - cpu/x86/pc/olpc
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:08:53 +0200 (Wed, 30 May 2007) New Revision: 424 Modified: cpu/x86/pc/olpc/devices.fth Log: OLPC devices.fth - deleted some commented-out code that will never be reinstated. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-30 06:07:35 UTC (rev 423) +++ cpu/x86/pc/olpc/devices.fth 2007-05-30 06:08:53 UTC (rev 424) @@ -315,24 +315,6 @@ fload ${BP}/cpu/x86/adpcm.fth \ ADPCM decoding -[ifdef] notdef-olpc -\ fload ${BP}/dev/olpc/plccflash.fth \ PLCC LPC debug FLASH - -0 0 " " " /" begin-package \ DCON driver -fload ${BP}/dev/olpc/dcon/dconsmb.fth \ SMB access to DCON chip -fload ${BP}/dev/olpc/dcon/dcon.fth \ DCON control -fload ${BP}/dev/olpc/dcon/methods.fth \ DCON interface methods -end-package - -: dcon-present? ( -- flag ) - " /dcon" open-dev ?dup if close-dev true else false then -; -\ Doing this has the useful side effect of turning on the backlight -stand-init: DCON - dcon-present? drop -; -[then] - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r423 - cpu/x86/pc/olpc
by svn＠openbios.org 30 May '07

30 May '07

Author: wmb Date: 2007-05-30 08:07:35 +0200 (Wed, 30 May 2007) New Revision: 423 Modified: cpu/x86/pc/olpc/lxmsrs.fth Log: OLPC - changed the PCI latency timer to 0x40 to conform to the setting that the kernel tries to establish by writing to (nonexistent) PCI config header registers. Modified: cpu/x86/pc/olpc/lxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/lxmsrs.fth 2007-05-29 18:47:52 UTC (rev 422) +++ cpu/x86/pc/olpc/lxmsrs.fth 2007-05-30 06:07:35 UTC (rev 423) @@ -107,7 +107,7 @@ msr: 5000.2003 00000000.00370037. \ No ERRs msr: 5000.2004 00000000.00000015. \ Clock gating for 3 clocks msr: 5000.2005 00000000.00000000. \ Enable some PCI errors - msr: 5000.2010 fff01120.001a021d. \ PCI timings - LB has the latency timer at max + msr: 5000.2010 fff01140.001a021d. \ PCI timings - LB has the latency timer at max msr: 5000.2011 04000300.00800f01. \ GLPCI_ARB - LX page 581 \ I don't think we need to do anything special for the DOS hole from PCI

1 0

r422 - cpu/x86/pc/biosload
by svn＠openbios.org 29 May '07

29 May '07

Author: wmb Date: 2007-05-29 20:47:52 +0200 (Tue, 29 May 2007) New Revision: 422 Modified: cpu/x86/pc/biosload/addrs.fth Log: Added ResetBase definition to fix biosload build. Modified: cpu/x86/pc/biosload/addrs.fth =================================================================== --- cpu/x86/pc/biosload/addrs.fth 2007-05-24 02:27:49 UTC (rev 421) +++ cpu/x86/pc/biosload/addrs.fth 2007-05-29 18:47:52 UTC (rev 422) @@ -11,10 +11,12 @@ [ifdef] linuxbios-loaded h# fff8.0000 constant dropin-base \ Location of payload in FLASH h# 08.0000 constant dropin-size +dropin-base h# 80 + h# 20 + constant ResetBase \ Location of "reset" dropin in ROM [then] \needs dropin-base h# 198.0000 constant dropin-base \needs dropin-size h# 8.0000 constant dropin-size +\needs ResetBase dropin-base h# 20 + constant ResetBase \ Location of "reset" dropin in ROM \ This is considerably more memory than Open Firmware needs \ on platforms where you have a well bounded set of I/O devices.

1 0

r150 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 27 May '07

27 May '07

Author: blueswirl Date: 2007-05-27 21:49:35 +0200 (Sun, 27 May 2007) New Revision: 150 Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/romvec.c openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h Log: Try to fix system reset for SMP and SS-10 cases Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-05-19 12:55:01 UTC (rev 149) +++ openbios-devel/arch/sparc32/entry.S 2007-05-27 19:49:35 UTC (rev 150) @@ -57,6 +57,7 @@ ! Check if this not the first SMP CPU, if so, bypass PROM entirely set PHYS_JJ_EEPROM + 0x2E, %g1 lduba [%g1] ASI_M_BYPASS, %g2 + stba %g0, [%g1] ASI_M_BYPASS set PHYS_JJ_EEPROM + 0x30, %g1 lda [%g1] ASI_M_BYPASS, %g1 tst %g2 @@ -71,15 +72,18 @@ add %g2, 4, %g2 sta %g0, [%g2] ASI_M_BYPASS ! clear softints set PHYS_JJ_EEPROM + 0x3C, %g1 - lda [%g1] ASI_M_BYPASS, %g1 - set AC_M_CTPR, %g2 - sta %g1, [%g2] ASI_M_MMUREGS ! set ctx table ptr + lda [%g1] ASI_M_BYPASS, %g2 + sta %g0, [%g1] ASI_M_BYPASS + set AC_M_CTPR, %g1 + sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr set PHYS_JJ_EEPROM + 0x40, %g1 - lda [%g1] ASI_M_BYPASS, %g1 - set AC_M_CXR, %g2 - sta %g1, [%g2] ASI_M_MMUREGS ! set context + lda [%g1] ASI_M_BYPASS, %g2 + sta %g0, [%g1] ASI_M_BYPASS + set AC_M_CXR, %g1 + sta %g2, [%g1] ASI_M_MMUREGS ! set context set PHYS_JJ_EEPROM + 0x38, %g1 lda [%g1] ASI_M_BYPASS, %g2 + sta %g0, [%g1] ASI_M_BYPASS set 1, %g1 jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu @@ -111,6 +115,7 @@ ! Check if this not the first SMP CPU, if so, bypass PROM entirely set PHYS_SS10_EEPROM + 0x2E, %g1 lduba [%g1] ASI_M_CTL, %g2 + stba %g0, [%g2] ASI_M_CTL set PHYS_SS10_EEPROM + 0x30, %g1 lda [%g1] ASI_M_CTL, %g1 tst %g2 @@ -124,15 +129,18 @@ add %g2, 4, %g2 sta %g0, [%g2] ASI_M_CTL ! clear softints set PHYS_SS10_EEPROM + 0x3C, %g1 - lda [%g1] ASI_M_CTL, %g1 - set AC_M_CTPR, %g2 - sta %g1, [%g2] ASI_M_MMUREGS ! set ctx table ptr + lda [%g1] ASI_M_CTL, %g2 + sta %g0, [%g1] ASI_M_CTL + set AC_M_CTPR, %g1 + sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr set PHYS_JJ_EEPROM + 0x40, %g1 - lda [%g1] ASI_M_CTL, %g1 - set AC_M_CXR, %g2 - sta %g1, [%g2] ASI_M_MMUREGS ! set context + lda [%g1] ASI_M_CTL, %g2 + sta %g0, [%g1] ASI_M_CTL + set AC_M_CXR, %g1 + sta %g2, [%g1] ASI_M_MMUREGS ! set context set PHYS_SS10_EEPROM + 0x38, %g1 lda [%g1] ASI_M_CTL, %g2 + sta %g0, [%g1] ASI_M_CTL set 1, %g1 jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-05-19 12:55:01 UTC (rev 149) +++ openbios-devel/arch/sparc32/romvec.c 2007-05-27 19:49:35 UTC (rev 150) @@ -246,22 +246,31 @@ static void obp_reboot(char *str) { + extern volatile int *reset_reg; + printk("rebooting (%s)\n", str); - outb(1, 0x71f00000); + *reset_reg = 1; + printk("reboot failed\n"); for (;;) {} } static void obp_abort(void) { + extern volatile int *power_reg; + printk("abort, power off\n"); - outb(1, 0x71910000); + *power_reg = 1; + printk("power off failed\n"); for (;;) {} } static void obp_halt(void) { + extern volatile int *power_reg; + printk("halt, power off\n"); - outb(1, 0x71910000); + *power_reg = 1; + printk("power off failed\n"); for (;;) {} } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-05-19 12:55:01 UTC (rev 149) +++ openbios-devel/drivers/obio.c 2007-05-27 19:49:35 UTC (rev 150) @@ -809,13 +809,18 @@ fword("finish-device"); } +volatile int *power_reg, *reset_reg; + static void ob_power_init(uint64_t base, uint64_t offset, int intr) { ob_new_obio_device("power", NULL); - ob_reg(base, offset, POWER_REGS, 0); + power_reg = ob_reg(base, offset, POWER_REGS, 1); + // Not in device tree + reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); + ob_intr(intr); fword("finish-device"); Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2007-05-19 12:55:01 UTC (rev 149) +++ openbios-devel/drivers/obio.h 2007-05-27 19:49:35 UTC (rev 150) @@ -29,6 +29,9 @@ #define SLAVIO_INTERRUPT 0x00e00000ULL #define INTERRUPT_REGS 0x10 +#define SLAVIO_RESET 0x00f00000ULL +#define RESET_REGS 1 + #define SLAVIO_SIZE 0x01000000 struct qemu_nvram_v1 {

1 0

r421 - cpu/x86/pc/olpc
by svn＠openbios.org 24 May '07

24 May '07

Author: wmb Date: 2007-05-24 04:27:49 +0200 (Thu, 24 May 2007) New Revision: 421 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2C14 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-05-24 02:26:08 UTC (rev 420) +++ cpu/x86/pc/olpc/versions.fth 2007-05-24 02:27:49 UTC (rev 421) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 13 +macro: FW_MINOR 14 \ The EC microcode macro: EC_VERSION c13

1 0

r420 - cpu/x86/pc/olpc dev/usb2/hcd dev/usb2/hcd/ehci
by svn＠openbios.org 24 May '07

24 May '07

Author: wmb Date: 2007-05-24 04:26:08 +0200 (Thu, 24 May 2007) New Revision: 420 Modified: cpu/x86/pc/olpc/usb.fth dev/usb2/hcd/control.fth dev/usb2/hcd/ehci/probe.fth Log: USB - added a configurable delay to the probe process as a workaround for OLPC trac 1473: ok setenv usb-delay 3000 \ 3000 milliseconds, i.e. 3 seconds ok probe-usb Modified: cpu/x86/pc/olpc/usb.fth =================================================================== --- cpu/x86/pc/olpc/usb.fth 2007-05-24 02:19:40 UTC (rev 419) +++ cpu/x86/pc/olpc/usb.fth 2007-05-24 02:26:08 UTC (rev 420) @@ -1,6 +1,8 @@ purpose: USB elaborations for the OLPC platform \ See license at end of file +0 config-int usb-delay \ Milliseconds to wait before set-address + devalias usb1 /usb@f,4 devalias usb2 /usb@f,5 devalias u /usb/disk Modified: dev/usb2/hcd/control.fth =================================================================== --- dev/usb2/hcd/control.fth 2007-05-24 02:19:40 UTC (rev 419) +++ dev/usb2/hcd/control.fth 2007-05-24 02:26:08 UTC (rev 420) @@ -46,6 +46,8 @@ headers : set-address ( dev -- usberr ) + " usb-delay" ['] eval catch if 2drop else ms then + \ To get the right characteristics for dev in control-set, then normal \ set-my-dev is nooped. We set my-dev and my-real-dev here instead. ['] set-my-dev behavior swap ( xt dev ) \ Save set-my-dev Modified: dev/usb2/hcd/ehci/probe.fth =================================================================== --- dev/usb2/hcd/ehci/probe.fth 2007-05-24 02:19:40 UTC (rev 419) +++ dev/usb2/hcd/ehci/probe.fth 2007-05-24 02:26:08 UTC (rev 420) @@ -4,15 +4,6 @@ hex headers -: retry-set-address ( dev -- error? ) - d# 200 ms - d# 5 0 do - dup set-address 0= if drop false unloop exit then - d# 1000 - loop - drop true -; - : make-root-hub-node ( port -- ) ok-to-add-device? 0= if drop exit then \ Can't add another device @@ -21,9 +12,7 @@ 0 set-target ( port dev ) \ Address it as device 0 - dup retry-set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev -\ d# 4000 ms -\ dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev + dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev dup set-target ( port dev ) \ Address it as device dev make-device-node ( )

1 0

r419 - cpu/x86/pc/olpc
by svn＠openbios.org 24 May '07

24 May '07

Author: wmb Date: 2007-05-24 04:19:40 +0200 (Thu, 24 May 2007) New Revision: 419 Modified: cpu/x86/pc/olpc/fw.bth Log: Freeze the screen upon entry to the kernel for the fast-boot case - OLPC Trac #1328 . Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-24 02:16:29 UTC (rev 418) +++ cpu/x86/pc/olpc/fw.bth 2007-05-24 02:19:40 UTC (rev 419) @@ -516,6 +516,13 @@ " keyboard" open-dev ?dup if set-stdin then ; +: go-hook-freeze + [ ' go-hook behavior compile, ] + 0 " set-source" $call-screen +; +: freeze ( -- ) ['] go-hook-freeze to go-hook ; +: unfreeze ( -- ) ['] usb-quiet to go-hook ; + : startup ( -- ) standalone? 0= if exit then @@ -531,6 +538,7 @@ [ifndef] lx-devel enable-power-button [then] + freeze auto-boot screen-ih stdout ! open-keyboard

1 0

r418 - cpu/x86
by svn＠openbios.org 24 May '07

24 May '07

Author: wmb Date: 2007-05-24 04:16:29 +0200 (Thu, 24 May 2007) New Revision: 418 Modified: cpu/x86/adpcm.fth Log: ADPCM decoder - allocate DMA memory for the sound so "boot" doesn't overwrite it. OLPC trac #1563 Modified: cpu/x86/adpcm.fth =================================================================== --- cpu/x86/adpcm.fth 2007-05-23 20:56:34 UTC (rev 417) +++ cpu/x86/adpcm.fth 2007-05-24 02:16:29 UTC (rev 418) @@ -257,49 +257,58 @@ d# -9 value playback-volume \ -9 is clipping threshold -: play-pcm ( adr -- error? ) - wav-in-#ch 0= if drop true exit then - playback-volume set-volume - set-sample-rate - wav-data-adr 4 - le-l@ to /pcm-output - wav-in-#ch #output-ch <> if - /pcm-output wav-in-#ch / #output-ch * to /pcm-output - #output-ch wav-in-#ch < if - dup condense-pcm \ Skip extra channel data - else - dup expand-pcm \ Convert mono to stereo - then - then - /pcm-output (play-pcm) +0 value pcm-base + +: play-raw-pcm ( adr -- error? ) + wav-in-#ch 0= if drop true exit then ( adr ) + + \ Allocate DMA memory for the decoded output + wav-data-adr 4 - le-l@ ( adr in-len ) + dup wav-in-#ch / #output-ch * to /pcm-output ( adr in-len ) + /pcm-output " dma-alloc" $call-audio to pcm-base ( adr in-len ) + + pcm-base swap move ( ) + + #output-ch wav-in-#ch < if pcm-base condense-pcm then \ Skip extra channel data + #output-ch wav-in-#ch > if pcm-base expand-pcm then \ Convert mono to stereo + + pcm-base /pcm-output (play-pcm) false ; : play-ima-adpcm ( adr -- error? ) wav-fact-adr 0= if drop true exit then - playback-volume set-volume - set-sample-rate + wav-#sample #output-ch * /w* to /pcm-output - \ Because alloc-mem does not guarantee contiguous physical memory, use load-base area. - loaded + pagesize round-up tuck ( out in out ) + \ Allocate DMA memory for the decoded output + /pcm-output " dma-alloc" $call-audio to pcm-base - dup /pcm-output erase ( out in out ) - wav-#sample wav-in-#ch wav-blk-size ( out in out #sample #ch blk-size ) - adpcm-decoder ( out ) - #output-ch 2 = wav-in-#ch 1 = and if ( out ) - dup /pcm-output mono16>stereo16 ( out ) - then ( out ) - /pcm-output (play-pcm) ( ) + pcm-base /pcm-output erase ( in ) + pcm-base wav-#sample wav-in-#ch wav-blk-size adpcm-decoder ( ) + #output-ch 2 = wav-in-#ch 1 = and if ( ) + pcm-base /pcm-output mono16>stereo16 ( ) + then ( ) + pcm-base /pcm-output (play-pcm) ( ) false ( error? ) ; : (play-wav) ( adr -- error? ) + pcm-base if + pcm-base /pcm-output " dma-free" $call-audio + 0 to pcm-base + then + parse-wav-ok? not if ." Not a .wav file" cr true exit then " /audio" open-dev ?dup 0= if ." Cannot open audio device" cr true exit then to audio-ih + + playback-volume set-volume + set-sample-rate + wav-cc case - 1 of wav-data-adr play-pcm endof - h# 11 of wav-data-adr play-ima-adpcm endof + 1 of wav-data-adr play-raw-pcm endof + h# 11 of wav-data-adr play-ima-adpcm endof ( default ) ." Cannot play .wav format type: " dup .wav-cc true swap cr endcase audio-ih close-dev

1 0

r417 - dev/olpc/cafenand
by svn＠openbios.org 23 May '07

23 May '07

Author: wmb Date: 2007-05-23 22:56:34 +0200 (Wed, 23 May 2007) New Revision: 417 Modified: dev/olpc/cafenand/selftest.fth Log: CaFe NAND selftest - Reinstate fix for selftest failure on ST and Samsung parts, which was undone by svn 355. Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2007-05-23 00:13:56 UTC (rev 416) +++ dev/olpc/cafenand/selftest.fth 2007-05-23 20:56:34 UTC (rev 417) @@ -182,7 +182,6 @@ : selftest ( -- error? ) open 0= if true exit then get-msecs rn ! - read-id 1+ c@ h# dc <> if close true exit then show-bbt cr (selftest) close

1 0

r416 - cpu/x86/pc/olpc
by svn＠openbios.org 23 May '07

23 May '07

Author: wmb Date: 2007-05-23 02:13:56 +0200 (Wed, 23 May 2007) New Revision: 416 Modified: cpu/x86/pc/olpc/resume.bth Log: Fixed OLPC trac #1554 by clearing the positive and negative edge event status bits for GPIO pins that are not powered during suspend. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-05-23 00:07:01 UTC (rev 415) +++ cpu/x86/pc/olpc/resume.bth 2007-05-23 00:13:56 UTC (rev 416) @@ -325,8 +325,8 @@ si bx cmp = until - h# 1840 # di mov \ PM1_STS/EN I/O port number - di ax in ax di out \ Preserve EN bits and cleare STS bits + h# 1840 # dx mov \ PM1_STS/EN I/O port number + dx ax in ax dx out \ Preserve EN bits and clear STS bits h# 38 [bp] si lea \ Save area @@ -344,6 +344,12 @@ ax dx out \ Write to GPIO control register 4 # dx sub \ Next port address loopa + + \ Clear edge detects for GPIO pins that are not powered during suspend + h# ffff # ax mov + h# 1048 # dx mov ax dx out \ Pos edge status + h# 104c # dx mov ax dx out \ Neg edge status + ax lods h# 1040 # dx mov ax dx out \ Pos edge enable ax lods h# 1044 # dx mov ax dx out \ Neg edge enable ax lods h# 103c # dx mov ax dx out \ Low bank lock @@ -355,6 +361,13 @@ ax dx out \ Write to GPIO control register 4 # dx sub \ Next port address loopa + + \ Clear edge detects for GPIO pins that are not powered during suspend + \ GPIOs 28:24 are in the suspend power well. GPIOs 31:29 don't exist. + h# e0ff # ax mov + h# 10c8 # dx mov ax dx out \ Pos edge status + h# 10cc # dx mov ax dx out \ Neg edge status + ax lods h# 10c0 # dx mov ax dx out \ Pos edge enable ax lods h# 10c4 # dx mov ax dx out \ Neg edge enable ax lods h# 10bc # dx mov ax dx out \ High bank lock

1 0

r415 - dev/geode/ac97
by svn＠openbios.org 23 May '07

23 May '07

Author: wmb Date: 2007-05-23 02:07:01 +0200 (Wed, 23 May 2007) New Revision: 415 Modified: dev/geode/ac97/ac97.fth Log: OLPC audio - driver tweaks to deal with the MIC bias being turned off by early startup code. Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-05-22 22:53:34 UTC (rev 414) +++ dev/geode/ac97/ac97.fth 2007-05-23 00:07:01 UTC (rev 415) @@ -211,17 +211,7 @@ : set-sample-rate ( hz -- ) to sample-rate ; -: open-in ( -- ) - sample-rate d# 1000 / to s/ms ( hz ) - sample-rate h# 32 codec! - 0 set-record-gain - mic+0db - mic-input -; : amp-default-on? ( -- flag ) " gx?" eval ; -: close-in ( -- ) -\ h# 8000 set-record-gain \ mute -; : codec-set ( bitmask reg# -- ) dup >r codec@ or r> codec! ; : codec-clr ( bitmask reg# -- ) dup >r codec@ swap invert and r> codec! ; : amplifier-on ( -- ) @@ -240,7 +230,6 @@ : open-out ( -- ) amplifier-on disable-playback - h# 010 h# 76 codec! \ Route mixer out to headphones, unlock sample rate sample-rate d# 1000 / to s/ms sample-rate h# 2e codec! \ Only need to set surround DAC for OLPC h# 606 set-pcm-gain \ Basic PCM Gain - -9 dB, just below clipping @@ -338,12 +327,26 @@ : 48khz ( -- ) d# 48000 set-sample-rate ; : default ( -- ) 48khz disable-playback ; +: open-in ( -- ) + sample-rate d# 1000 / to s/ms ( hz ) + sample-rate h# 32 codec! + 0 set-record-gain + vbias-on + mic+0db + mic-input +; +: close-in ( -- ) +\ h# 8000 set-record-gain \ mute + vbias-off +; + : open ( -- ok? ) map-regs codec-ready? 0= if false exit then get-device-id fatal-error? if false exit then default + h# 10 h# 76 codec-set \ Unlock sample rate h# 2801 h# 2a codec-set \ Enable variable rate, power down LFE and center DACs parse-args 0= if unmap-regs false exit then true

1 0

r414 - cpu/x86/pc/olpc
by svn＠openbios.org 23 May '07

23 May '07

Author: wmb Date: 2007-05-23 00:53:34 +0200 (Wed, 23 May 2007) New Revision: 414 Modified: cpu/x86/pc/olpc/rmstart.fth Log: OLPC Trac 1476 - turn off the microphone bias very early to eliminate the MIC LED blink on resume from S3. Modified: cpu/x86/pc/olpc/rmstart.fth =================================================================== --- cpu/x86/pc/olpc/rmstart.fth 2007-05-22 22:50:22 UTC (rev 413) +++ cpu/x86/pc/olpc/rmstart.fth 2007-05-22 22:53:34 UTC (rev 414) @@ -128,6 +128,31 @@ h# 01 # al mov al h# 80 # out + \ The next few MSRs allow us to access the 5536 + \ EXTMSR - page 449 \ Use PCI device #F for port 2 + + op: dx dx xor + op: h# f00 # ax mov \ 00000000.00000f00. + op: h# 5000201e # cx mov \ MSR number + wrmsr + + op: h# 44000020 # dx mov + op: h# 00200013 # ax mov \ 44000020.00200013 \ mode C + op: h# 51000010 # cx mov \ MSR number - CPU interface serial + wrmsr + + op: h# 014fc001 # dx mov + op: h# 01480001 # ax mov + op: h# 51000026 # cx mov + wrmsr + + op: h# a0000001 # dx mov + op: h# 480fff80 # ax mov + op: h# 510100e1 # cx mov + wrmsr + + op: h# 7601.0004 # ax mov op: h# 148c # dx mov op: ax dx out + \ This code is highly optimized because it runs when the CPU is in \ it slowest operation mode, so we want to get it done fast. \ GLCP_SYS_RSTPLL - page 406

1 0

r413 - cpu/x86/pc/olpc dev/olpc/spiflash
by svn＠openbios.org 23 May '07

23 May '07

Author: wmb Date: 2007-05-23 00:50:22 +0200 (Wed, 23 May 2007) New Revision: 413 Modified: cpu/x86/pc/olpc/devices.fth dev/olpc/spiflash/recover.fth dev/olpc/spiflash/spiui.fth Log: Added "recover <device_specifier>" and "clone" commands, for rewriting another machine's SPI FLASH. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-22 01:52:08 UTC (rev 412) +++ cpu/x86/pc/olpc/devices.fth 2007-05-22 22:50:22 UTC (rev 413) @@ -285,6 +285,7 @@ fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming +fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery : ofw-fw-filename$ " disk:\boot\olpc.rom" ; ' ofw-fw-filename$ to fw-filename$ Modified: dev/olpc/spiflash/recover.fth =================================================================== --- dev/olpc/spiflash/recover.fth 2007-05-22 01:52:08 UTC (rev 412) +++ dev/olpc/spiflash/recover.fth 2007-05-22 22:50:22 UTC (rev 413) @@ -30,7 +30,6 @@ ." Getting a copy of this machine's FLASH" cr h# fff0.0000 flash-buf /flash move true to file-loaded? - flash-buf ec-buf /ec move \ Save a copy for merging (serial-flash) ; Modified: dev/olpc/spiflash/spiui.fth =================================================================== --- dev/olpc/spiflash/spiui.fth 2007-05-22 01:52:08 UTC (rev 412) +++ dev/olpc/spiflash/spiui.fth 2007-05-22 22:50:22 UTC (rev 413) @@ -153,6 +153,24 @@ : ?move-mfg-data ( -- ) ." Merging existing manufacturing data" cr + flash-base -1 = if + \ Read the manufacturing data from the other FLASH + \ First try the new location in the e.0000 block + flash-buf mfg-data-offset + /flash-block mfg-data-offset read-spi-flash + + \ If there is no mfg data in the e.000 block, get whatever is in the + \ last 2K of the 0 block, where the mfg data used to live. + flash-buf mfg-data-end-offset + invalid-tag? if + flash-buf mfg-data-offset + /flash-block h# ff erase + + flash-buf mfg-data-end-offset + h# 800 - h# 800 ( adr len ) + mfg-data-end-offset h# 800 - ( adr len offset ) + read-spi-flash ( ) + then + exit + then + + \ If the system has mfg data in the old place, move it to the new place mfg-data-top flash-base h# 1.0000 + = if \ Copy just the manufacturing data into the memory buffer; don't

1 0

r412 - cpu/x86/pc/olpc dev/usb2/hcd/ehci
by svn＠openbios.org 22 May '07

22 May '07

Author: wmb Date: 2007-05-22 03:52:08 +0200 (Tue, 22 May 2007) New Revision: 412 Modified: cpu/x86/pc/olpc/suspend.fth dev/usb2/hcd/ehci/probe.fth Log: OLPC - USB2 devices now work after suspend/resume. Modified: cpu/x86/pc/olpc/suspend.fth =================================================================== --- cpu/x86/pc/olpc/suspend.fth 2007-05-22 01:51:09 UTC (rev 411) +++ cpu/x86/pc/olpc/suspend.fth 2007-05-22 01:52:08 UTC (rev 412) @@ -28,6 +28,7 @@ " video-save" stdout @ $call-method \ Freeze display s3 " video-restore" stdout @ $call-method \ Unfreeze display + " /usb@f,5" open-dev ?dup if " resume" 2 pick $call-method close-dev then ; alias s suspend Modified: dev/usb2/hcd/ehci/probe.fth =================================================================== --- dev/usb2/hcd/ehci/probe.fth 2007-05-22 01:51:09 UTC (rev 411) +++ dev/usb2/hcd/ehci/probe.fth 2007-05-22 01:52:08 UTC (rev 412) @@ -4,6 +4,15 @@ hex headers +: retry-set-address ( dev -- error? ) + d# 200 ms + d# 5 0 do + dup set-address 0= if drop false unloop exit then + d# 1000 + loop + drop true +; + : make-root-hub-node ( port -- ) ok-to-add-device? 0= if drop exit then \ Can't add another device @@ -11,7 +20,11 @@ speed-high over di-speed! ( port dev ) 0 set-target ( port dev ) \ Address it as device 0 - dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev + + dup retry-set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev +\ d# 4000 ms +\ dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev + dup set-target ( port dev ) \ Address it as device dev make-device-node ( ) ; @@ -74,6 +87,13 @@ true ; +: resume ( -- ) + init-ehci-regs + start-usb + claim-ownership + framelist-phys periodic! +; + : close ( -- ) open-count 1- to open-count end-extra

1 0

r411 - cpu/x86/pc/olpc
by svn＠openbios.org 22 May '07

22 May '07

Author: wmb Date: 2007-05-22 03:51:09 +0200 (Tue, 22 May 2007) New Revision: 411 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC - Make the WiFi SSID default to OLPCOFW, making unattended boot from wlan possible. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-21 07:20:51 UTC (rev 410) +++ cpu/x86/pc/olpc/fw.bth 2007-05-22 01:51:09 UTC (rev 411) @@ -415,6 +415,9 @@ support-package: supplicant fload ${BP}/ofw/wifi/loadpkg.fth end-support-package +stand-init: + " ??,OLPCOFW" $wifi +; [ifdef] use-ppp fload ${BP}/ofw/ppp/loadppp.fth

1 0

r410 - cpu/x86 cpu/x86/pc/olpc dev/geode/ac97
by svn＠openbios.org 21 May '07

21 May '07

Author: wmb Date: 2007-05-21 09:20:51 +0200 (Mon, 21 May 2007) New Revision: 410 Modified: cpu/x86/adpcm.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/gui.fth dev/geode/ac97/ac97.fth dev/geode/ac97/selftest.fth Log: OLPC - incorporate startup sound into fast-boot startup sequence. Modified: cpu/x86/adpcm.fth =================================================================== --- cpu/x86/adpcm.fth 2007-05-20 22:59:57 UTC (rev 409) +++ cpu/x86/adpcm.fth 2007-05-21 07:20:51 UTC (rev 410) @@ -115,8 +115,8 @@ : adpcm-decode-blk ( in out #sample -- ) #ch #output-ch min 0 ?do ( in out #sample ) - 2 pick i /l * + ( in out #sample in' ) - 2 pick i /w * + ( in out #sample in out' ) + 2 pick i /l* + ( in out #sample in' ) + 2 pick i /w* + ( in out #sample in out' ) init-ch-vars ( in out #sample in' out' ) 2 pick 1- ( in out #sample in out #sample-1 ) adpcm-decode-ch ( in out #sample ) @@ -130,8 +130,8 @@ dup to blk-size ( in out #sample #ch blk-size ) over 4 * - 2* over / 1+ to #sample/blk ( in out #sample #ch ) dup to #ch ( in out #sample #ch ) - /l * to in-skip ( in out #sample ) - #output-ch /w * to out-skip ( in out #sample ) + /l* to in-skip ( in out #sample ) + #output-ch /w* to out-skip ( in out #sample ) begin dup 0> while ( in out #sample ) 3dup #sample/blk min adpcm-decode-blk @@ -204,65 +204,91 @@ : wav-#sample ( -- #sample ) wav-fact-adr dup if 8 + le-l@ then ; : wav-blk-size ( -- blk-size ) wav-fmt-adr dup if h# 14 + le-w@ then ; +: set-volume ( -- ) " set-volume" $call-audio ; : set-sample-rate ( -- ) wav-fmt-adr ?dup if h# c + le-l@ " set-sample-rate" $call-audio then ; 0 value out-move + +\ Collapse a sample array with "#output-ch" channels/sample into a smaller +\ array with "wav-in-#ch" channels/sample, discarding the excess channels. + : condense-pcm ( adr -- ) - wav-in-#ch #output-ch - /w * to in-skip - #output-ch /w * to out-move + wav-in-#ch #output-ch - /w* to in-skip + #output-ch /w* to out-move dup dup 4 - le-l@ bounds ?do ( out ) i over out-move move ( out ) out-move + ( out' ) in-skip +loop drop ( ) ; + +\ Spread a sample array with "wav-in-#ch" channels/sample into a larger +\ array with "#output-ch" channels/sample, zeroing the new channels. + : expand-pcm ( adr -- ) - #output-ch wav-in-#ch - /w * to out-skip - wav-in-#ch /w * to out-move - dup dup 4 - le-l@ bounds swap out-move - ( out in-begin in-end ) - begin 2dup u< while ( out in-begin in ) - dup 3 pick out-move move ( out in-begin in ) - out-move - rot out-move + -rot ( out' in-begin in' ) - 2 pick out-skip erase ( out in-begin in ) - rot out-skip + -rot ( out' in-begin in ) - repeat 3drop ( ) + #output-ch wav-in-#ch - /w* to out-skip ( adr ) + wav-in-#ch /w* to out-move ( adr ) + dup /l - le-l@ ( adr in-len ) + 2dup wav-in-#ch / #output-ch * ( adr in-len adr out-len ) + + -rot ( out-adr in-start in-len ) + over + out-move - do ( out-adr ) + out-skip - dup out-skip erase ( out-adr' ) + out-move - i over out-move move ( out-adr' ) + out-move negate +loop ( out-adr ) + drop ; -: play-pcm-once ( adr len -- ) " write" $call-audio drop " write-done" $call-audio ; +\ Given a sample array of the form L0, R0, L1, R1, ..., copy the left +\ channel into the right, giving L0, L0, L1, L1, etc. This is +\ particularly useful when the R samples are initially 0. + +: mono16>stereo16 ( adr len -- ) bounds ?do i w@ i wa1+ w! /l +loop ; + +: play-wait ( -- ) " write-done" $call-audio ; + +: play-pcm-once ( adr len -- ) " write" $call-audio drop ; + : play-pcm-loop ( adr len -- ) - ." Press a key to abort" cr - begin 2dup play-pcm-once key? until key drop 2drop + ." Press a key to stop" cr + begin 2dup play-pcm-once play-wait key? until key drop 2drop ; ' play-pcm-once to (play-pcm) +d# -9 value playback-volume \ -9 is clipping threshold + : play-pcm ( adr -- error? ) wav-in-#ch 0= if drop true exit then + playback-volume set-volume set-sample-rate - wav-data-adr 4 - le-l@ to /pcm-output - wav-in-#ch #output-ch = if - /pcm-output (play-pcm) \ Play straight from the source - else - /pcm-output wav-in-#ch / #output-ch * to /pcm-output - #output-ch wav-in-#ch < if - dup condense-pcm \ Skip extra channel data - /pcm-output (play-pcm) - else - dup expand-pcm \ Convert mono to stereo - /pcm-output (play-pcm) - then then + wav-data-adr 4 - le-l@ to /pcm-output + wav-in-#ch #output-ch <> if + /pcm-output wav-in-#ch / #output-ch * to /pcm-output + #output-ch wav-in-#ch < if + dup condense-pcm \ Skip extra channel data + else + dup expand-pcm \ Convert mono to stereo + then + then + /pcm-output (play-pcm) false ; : play-ima-adpcm ( adr -- error? ) wav-fact-adr 0= if drop true exit then + playback-volume set-volume set-sample-rate - wav-#sample #output-ch * /w * to /pcm-output + wav-#sample #output-ch * /w* to /pcm-output + \ Because alloc-mem does not guarantee contiguous physical memory, use load-base area. loaded + pagesize round-up tuck ( out in out ) + dup /pcm-output erase ( out in out ) wav-#sample wav-in-#ch wav-blk-size ( out in out #sample #ch blk-size ) adpcm-decoder ( out ) + #output-ch 2 = wav-in-#ch 1 = and if ( out ) + dup /pcm-output mono16>stereo16 ( out ) + then ( out ) /pcm-output (play-pcm) ( ) false ( error? ) ; Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-20 22:59:57 UTC (rev 409) +++ cpu/x86/pc/olpc/fw.bth 2007-05-21 07:20:51 UTC (rev 410) @@ -500,6 +500,15 @@ ?usb-keyboard ; +: start-sound ( -- ) + playback-volume >r d# -21 to playback-volume + ['] load-started behavior >r + ['] noop to load-started + " rom:splash" ['] $play-wav catch if 2drop then + r> to load-started + r> to playback-volume +; + : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then ; @@ -513,6 +522,7 @@ fast-boot? if stdout off probe-pci + start-sound ['] false to interrupt-auto-boot? interpreter-init [ifndef] lx-devel Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2007-05-20 22:59:57 UTC (rev 409) +++ cpu/x86/pc/olpc/gui.fth 2007-05-21 07:20:51 UTC (rev 410) @@ -373,7 +373,7 @@ drop ; -: (?show-device) ( adr len -- ihandle ) +: (?show-device) ( adr len -- adr len ) not-screen? 0= if 2dup ?show-icon then ; ' (?show-device) to ?show-device Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-05-20 22:59:57 UTC (rev 409) +++ dev/geode/ac97/ac97.fth 2007-05-21 07:20:51 UTC (rev 410) @@ -231,22 +231,23 @@ h# 8000 h# 26 amp-default-on? if codec-set else codec-clr then ; +h# 606 value volume +: set-volume ( db -- ) + dup 0> if drop 0 then + negate 1+ 2* 3 / dup bwjoin to volume +; + : open-out ( -- ) amplifier-on disable-playback + h# 010 h# 76 codec! \ Route mixer out to headphones, unlock sample rate sample-rate d# 1000 / to s/ms - sample-rate dup h# 2c codec! dup h# 2e codec! h# 30 codec! - 0 set-master-volume -\ 0 set-mono-volume - h# 0f0f set-headphone-volume - h# 606 set-pcm-gain \ enable line-out - h# 606 h# 38 codec! \ enable surround out (headphones) - h# 010 h# 76 codec! \ Route mixer out to headphones, unlock sample rate + sample-rate h# 2e codec! \ Only need to set surround DAC for OLPC + h# 606 set-pcm-gain \ Basic PCM Gain - -9 dB, just below clipping + volume h# 38 codec! \ headphone/surround output pin gain ; : close-out ( -- ) - h# 8808 set-pcm-gain \ mute - h# 8000 set-master-volume - h# 8000 set-mono-volume + h# 8808 set-pcm-gain \ mute amplifier-off ; @@ -343,7 +344,7 @@ get-device-id fatal-error? if false exit then default - 1 h# 2a codec-set \ Enable variable rate + h# 2801 h# 2a codec-set \ Enable variable rate, power down LFE and center DACs parse-args 0= if unmap-regs false exit then true ; Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2007-05-20 22:59:57 UTC (rev 409) +++ dev/geode/ac97/selftest.fth 2007-05-21 07:20:51 UTC (rev 410) @@ -23,20 +23,8 @@ record-base record-len audio-in drop ; -h# 606 value plevel \ -9 dB, highest gain without digital clipping -: set-plevel ( db -- ) - dup 0> if drop 0 then - negate 1+ 2* 3 / dup bwjoin to plevel -; - -h# 0 value glevel -: set-glevel ( db -- ) - dup 0> if drop 0 then - negate 1+ 2* 3 / dup bwjoin to glevel -; - : play ( -- ) - open-out plevel set-pcm-gain glevel h# 38 codec! + open-out record-base record-len audio-out drop write-done ; @@ -78,7 +66,7 @@ : tone ( freq -- ) record-len la1+ alloc-mem to record-base make-tone - d# -9 set-glevel play + d# -9 set-volume play record-base record-len la1+ free-mem ; @@ -125,14 +113,14 @@ : sweep-test ( -- ) ." Playing sweep" cr make-sweep - d# -9 set-glevel play + d# -9 set-volume play ; : mic-test ( -- ) ." Recording ..." cr record ." Playing ..." cr - d# -3 set-glevel play + d# -3 set-volume play ; : selftest ( -- error? )

1 0

r409 - dev/geode/ac97
by svn＠openbios.org 21 May '07

21 May '07

Author: wmb Date: 2007-05-21 00:59:57 +0200 (Mon, 21 May 2007) New Revision: 409 Modified: dev/geode/ac97/ac97.fth Log: OLPC AC97 driver - fixed problem with sample rate being locked to 48K. Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-05-20 22:57:47 UTC (rev 408) +++ dev/geode/ac97/ac97.fth 2007-05-20 22:59:57 UTC (rev 409) @@ -241,7 +241,7 @@ h# 0f0f set-headphone-volume h# 606 set-pcm-gain \ enable line-out h# 606 h# 38 codec! \ enable surround out (headphones) - h# 000 h# 76 codec! \ Route mixer out to headphones + h# 010 h# 76 codec! \ Route mixer out to headphones, unlock sample rate ; : close-out ( -- ) h# 8808 set-pcm-gain \ mute

1 0

r408 - in cpu/x86/pc/olpc: . images
by svn＠openbios.org 21 May '07

21 May '07

Author: wmb Date: 2007-05-21 00:57:47 +0200 (Mon, 21 May 2007) New Revision: 408 Added: cpu/x86/pc/olpc/images/olpc16.wav cpu/x86/pc/olpc/images/olpc16EQ.wav cpu/x86/pc/olpc/images/olpc16EQima.wav Modified: cpu/x86/pc/olpc/images/README cpu/x86/pc/olpc/olpc.bth Log: OLPC - Added new startup sound file from Barry Vercoe. Modified: cpu/x86/pc/olpc/images/README =================================================================== --- cpu/x86/pc/olpc/images/README 2007-05-20 07:48:05 UTC (rev 407) +++ cpu/x86/pc/olpc/images/README 2007-05-20 22:57:47 UTC (rev 408) @@ -1,3 +1,25 @@ +Image files - audio and graphics + +Audio: + +olpc16.wav is a startup sound by Barry Vercoe, 16K samples/sec. + +olpc16EQ.wav is the sound with some equalization to partially compensate + for OLPC speaker deficiencies. + +olpc16EQima.wav is olpc16EQ.wav encoded with IMA ADPCM to save space: + + sox olpc16EQ.wav -i olpc16EQima.wav + +Barry also provided 24K and 32K samples/sec versions of the sound, but +the difference is inaudible, especially on OLPC speakers, so I chose +the 16K version to save space in ROM. + +Graphics / Icons: + +The boot progress icons were created by Eben Eliason to match the +style of the OLPC logo. + The .565 image format is a very simple format for 16-bit RGB 565 image data. The reason I invented this new format is because I couldn't find an existing standard format that handles 565 representation. There is Added: cpu/x86/pc/olpc/images/olpc16.wav =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/olpc16.wav ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/olpc16EQ.wav =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/olpc16EQ.wav ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/olpc16EQima.wav =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/olpc16EQima.wav ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: cpu/x86/pc/olpc/olpc.bth =================================================================== --- cpu/x86/pc/olpc/olpc.bth 2007-05-20 07:48:05 UTC (rev 407) +++ cpu/x86/pc/olpc/olpc.bth 2007-05-20 22:57:47 UTC (rev 408) @@ -72,8 +72,8 @@ " sourceurl" " sourceurl" $add-dropin [ifndef] lx-devel - " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/olpc-t0.wav" " splash" $add-deflated-dropin + " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/olpc16EQima.wav" " splash" $add-deflated-dropin [then] [ifdef] lx-devel " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin

1 0

r407 - cpu/x86/pc/olpc
by svn＠openbios.org 20 May '07

20 May '07

Author: wmb Date: 2007-05-20 09:48:05 +0200 (Sun, 20 May 2007) New Revision: 407 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2C13 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-05-20 07:43:43 UTC (rev 406) +++ cpu/x86/pc/olpc/versions.fth 2007-05-20 07:48:05 UTC (rev 407) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 12 +macro: FW_MINOR 13 \ The EC microcode -macro: EC_VERSION c11 +macro: EC_VERSION c13 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r406 - ofw/fs/jffs2
by svn＠openbios.org 20 May '07

20 May '07

Author: wmb Date: 2007-05-20 09:43:43 +0200 (Sun, 20 May 2007) New Revision: 406 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - Fixed bug in handling of deleted files. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-20 04:34:30 UTC (rev 405) +++ ofw/fs/jffs2/jffs2.fth 2007-05-20 07:43:43 UTC (rev 406) @@ -1059,7 +1059,7 @@ then ( rdirent ) i tdlen ( rdirent ) +loop ( rdirent ) - place-tdirent ( ) + dup rdinode@ if place-tdirent else drop then ( ) ; : prep-dirents ( -- )

1 0

r405 - cpu/x86/pc/olpc
by svn＠openbios.org 20 May '07

20 May '07

Author: wmb Date: 2007-05-20 06:34:30 +0200 (Sun, 20 May 2007) New Revision: 405 Modified: cpu/x86/pc/olpc/banner.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/loaddropins.fth Log: OLPC - Back to using the game keys, and suppress text in fast boot mode. Modified: cpu/x86/pc/olpc/banner.fth =================================================================== --- cpu/x86/pc/olpc/banner.fth 2007-05-20 04:32:57 UTC (rev 404) +++ cpu/x86/pc/olpc/banner.fth 2007-05-20 04:34:30 UTC (rev 405) @@ -36,7 +36,6 @@ stop-auto? if suppress-auto-boot then gui-banner drop - banner ; headers Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-20 04:32:57 UTC (rev 404) +++ cpu/x86/pc/olpc/fw.bth 2007-05-20 04:34:30 UTC (rev 405) @@ -436,7 +436,6 @@ : user-switch? ( -- flag ) [ifdef] lx-devel false exit [then] atest? if true exit then -true exit game-key@ 0<> dup if ." Release the game key to continue" cr begin d# 100 ms game-key@ 0= until @@ -508,12 +507,11 @@ : startup ( -- ) standalone? 0= if exit then -\ ?bailout - no-page console-start fast-boot? if + stdout off probe-pci ['] false to interrupt-auto-boot? interpreter-init @@ -521,15 +519,14 @@ enable-power-button [then] auto-boot + screen-ih stdout ! open-keyboard optional-startup else - ." Interactive boot" cr - ." Keyboard probe" cr -\ ?bailout + banner + open-keyboard probe-pci - ." USB probe" cr optional-startup interpreter-init [ifndef] lx-devel Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-05-20 04:32:57 UTC (rev 404) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-05-20 04:34:30 UTC (rev 405) @@ -34,7 +34,7 @@ " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nandflash.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " usbkey.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " usbdisk.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/sd.565" " sdmmc.565" $add-deflated-dropin

1 0

r404 - ofw/fs/jffs2
by svn＠openbios.org 20 May '07

20 May '07

Author: wmb Date: 2007-05-20 06:32:57 +0200 (Sun, 20 May 2007) New Revision: 404 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - reduce memory usage for dirents. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-20 04:31:54 UTC (rev 403) +++ ofw/fs/jffs2/jffs2.fth 2007-05-20 04:32:57 UTC (rev 404) @@ -31,10 +31,12 @@ variable 'next-dirent \ Pointer into dirent buffer : next-dirent ( -- val ) 'next-dirent @ ; -\ 0 ( instance ) value minodes \ Buffer for per-file inode list +\ minodes is an area that is used for constructing dynamic lists +\ that don't persist between opens + variable 'next-minode \ Pointer into per-file inode list -: next-minode 'next-minode @ ; -: minodes next-inode ; \ Start the inode pointer list after the inodes +: next-minode ( -- adr ) 'next-minode @ ; +: minodes ( -- adr ) next-inode ; \ Start the inode pointer list after the inodes 0 instance value file-buf \ Buffer for constructing file 0 instance value file-size \ Actual size of file @@ -49,49 +51,12 @@ 0 instance value the-page# 0 instance value the-eblock# -\ In-memory inode structure - \ Access a field within a JFFS2 FLASH data structure : j@ ( adr offset -- value ) la+ l@ ; : j! ( adr offset -- value ) la+ l! ; -\ Access fields within the memory data structure for volume inodes -\ Based on struct jffs2_sum_inode_flash, with "nodetype" replaced -\ by the eblock number. This is not the complete inode data, just -\ the part that is in the summary node. It is just enough information -\ to let us create the list of inodes associated with a given file. -\ Having created that list, we can get the full inodes from FLASH. -\ Storing it in this form saves space and time, because we only have -\ to read the full inodes for the few files that we actually access. +: pack-offset ( offset -- n ) the-eblock# /eblock * + ; -instance variable splices 0 splices ! - -: pack-offset ( offset block -- n ) the-eblock# /eblock * + ; - -: minum@ ( adr -- inode# ) 0 j@ ; -: mversion@ ( adr -- version ) 1 j@ ; -: moffset@ ( adr -- block+offset ) 2 j@ ; -\ : moffset/block@ ( adr -- offset block ) moffset@ /eblock /mod ; -\ : meblock@ ( adr -- eblock# ) 0 j@ ; -\ : moffset@ ( adr -- offset ) 3 j@ ; -\ 4 /l* constant /mem-inode -3 /l* constant /mem-inode -\ : mtotlen@ ( adr -- offset ) 4 j@ ; -\ 5 /l* constant /mem-inode - -\ Fields within in-memory directory entry data structure. -\ Based on struct jffs2_sum_dirent_flash, without the -\ "nodetype", "totlen", and "offset" fields. - -: pino@ ( adr -- parent ) 0 j@ ; -: version@ ( adr -- version ) 1 j@ ; \ $find-name and insert-dirent -: dirino@ ( adr -- inode ) 2 j@ ; -: ftype@ ( adr -- type ) d# 13 + c@ ; -: fname$ ( node-adr -- adr len ) - dup d# 14 + ( node-adr name-adr ) - swap d# 12 + c@ ( name-adr name-len ) -; - \ Access fields in per-file raw inode structure - based on \ struct jffs2_raw_inode : riinode@ ( adr -- inode# ) 3 j@ ; @@ -114,22 +79,6 @@ \ see forth/lib/crc32.fth and cpu/x86/crc32.fth : crc ( adr len -- crc ) 0 crctab 2swap ($crc) ; -: set-sizes ( -- ) - -1 to file-size - - " block-size" $call-parent to /page - - " erase-size" ['] $call-parent ( adr len xt ) - catch if 2drop h# 20000 then ( n ) - to /eblock - - /eblock /page / to pages/eblock - - " size" $call-parent ( d ) - /page um/mod to pages/chip ( rem ) - drop -; - : dma-alloc ( len -- adr ) " dma-alloc" $call-parent ; : dma-free ( len -- adr ) " dma-free" $call-parent ; @@ -232,8 +181,15 @@ \ 0 instance variable cur-vers \ 0 instance variable cur-offset -: init-curvars ( -- ) curinum 3 /n* erase ; +instance variable dirent-offset +instance variable cur-pino +: init-curvars ( -- ) + h# -100000 dup dirent-offset ! curoffs ! + 0 curinum ! + 0 curvers ! +; + 1 [if] code aencode-inode ( version inum offset 'curinum 'next-inode -- ) dx pop \ dx: 'next-inode @@ -448,20 +404,60 @@ d# 18 ( len ) ; +: encode-dirent ( boffset pino adr len -- ) + 2 pick >r ( boffset pino adr len r: pino ) + crctab -rot ($crc) ( boffset hash ) + next-dirent ! ( boffset ) + + pack-offset ( offset ) + + dup dirent-offset @ - 2 rshift ( offset delta ) + dup h# 10000 < ( offset delta short-offset? ) + r@ cur-pino @ = and ( offset delta short-encode? ) + + if ( offset delta ) + next-dirent na1+ w! ( offset ) + 6 ( offset de-len ) + else ( offset ) + drop 0 next-dirent na1+ w! ( offset ) + r@ next-dirent 6 + ! ( offset ) \ Encode pino + dup next-dirent d# 10 + ! ( offset ) \ Encode offset + d# 14 ( offset de-len ) + then ( offset r: pino ) + r> cur-pino ! ( offset de-len ) + 'next-dirent +! ( offset ) + dirent-offset ! ( ) +; + +: w@+ ( adr -- w adr' ) dup w@ swap wa1+ ; +: l@+ ( adr -- l adr' ) dup l@ swap la1+ ; + +: decode-dirent ( adr -- false | adr' offset pino hash true ) + dup next-dirent >= if drop false exit then + l@+ ( hash adr' ) + w@+ ( hash w adr' ) + swap ?dup if ( hash adr' w ) \ Short form + swap -rot ( adr' hash w ) + /l* dirent-offset +! ( adr' hash ) + dirent-offset @ ( adr' hash offset ) + cur-pino @ rot ( adr' offset pino hash ) + else ( hash adr' ) \ Long form + l@+ over cur-pino ! ( hash pino adr' ) + l@+ over dirent-offset ! ( hash pino offset adr' ) + swap 2swap swap ( adr' offset pino hash ) + then + true +; + \ Copy summary dirent from FLASH to memory \ Summary dirent: w.nodetype l.totlen l.offset l.pino l.version \ l.ino c.nsize c.type name : scan-sum-dirent ( adr -- len ) - d# 10 + ( offset-adr ) - next-dirent ( offset-adr dst-adr ) - over d# 12 + c@ d# 14 + ( src dst len ) - dup >r ( src dst len r: len ) - move ( ) - - r@ 'next-dirent +! ( offset-adr ) - - \ 10 is the length of the fields that were skipped, not copied - r> d# 10 + ( len ) + 2+ >r + r@ 1 j@ r@ 2 j@ ( offset pino ) + r@ d# 22 + r> 5 la+ c@ ( offset pino adr namelen ) + dup >r encode-dirent ( r: namelen ) + r> d# 24 + ( len ) ; [ifdef] notdef @@ -493,9 +489,6 @@ 2drop ; : no-summary? ( page# -- flag ) -\ drop true - -\ dup h# 47100 = if debug-me then dup pages/eblock + 1- 1 read-pages if ( page# ) drop true exit then ( page# ) @@ -550,22 +543,11 @@ : rdnsize@ ( adr -- nsize ) 7 la+ c@ ; : rdtype@ ( adr -- type ) 7 la+ 1+ c@ ; : >rdname ( adr -- adr' ) d# 10 la+ ; +: rdname$ ( adr -- adr len ) dup >rdname swap rdnsize@ ; : scan-raw-dirent ( adr -- adr ) -\ XXX dup 1 j@ 4 round-up ( adr len ) -\ XXX 2dup next-dirent swap move ( adr len ) - \ - next-dirent - over rdpino@ l+! - over rdversion@ l+! - over rdinode@ l+! ( adr iadr' ) - over rdnsize@ c+! ( adr iadr' ) - over rdtype@ c+! ( adr iadr' ) - over >rdname swap ( adr str-adr iadr ) - 2 pick rdnsize@ move ( adr ) - dup rdnsize@ d# 14 + ( adr dirent-len ) - - 'next-dirent +! ( adr ) + dup >r + r@ block-buf - r@ rdpino@ r> rdname$ encode-dirent ; \ Copy the raw inode information to memory in summary inode form @@ -574,8 +556,6 @@ \ we actually access. : scan-raw-inode ( adr -- ) >r r@ riversion@ r@ riinode@ r> block-buf - pack-offset ( version inum offset ) -\ store-inode -\ encode-inode curinum 'next-inode aencode-inode \ false to cleanmark? ; @@ -640,6 +620,11 @@ ; 0 [if] +\ This is some unfinished filesystem consistency checking code +\ It was started for debugging a crash that turned out to be +\ caused by overflow of the memory tables, leading to a rewrite +\ to use much less memory. + /eblock value summary-start : .eb ( -- ) @@ -722,7 +707,7 @@ crc swap ridcrc@ = ; -: get-inode ( offset -- adr ) /eblock /mod read-eblock block-buf + ; +: get-node ( offset -- adr ) /eblock /mod read-eblock block-buf + ; \ This is a brute-force, no tricks, insertion sort. \ Insertion sort is bad for large numbers of elements, but in this @@ -758,7 +743,7 @@ \ and if it is valid, replace the existing one. We will \ end up with only the last good one in the slot. drop ( offset ) - dup get-inode inode-good? if ( offset ) + dup get-node inode-good? if ( offset ) i na1+ ! ( ) else ( offset ) drop ( ) @@ -773,23 +758,25 @@ ; -\ Also used by insert-dirent -: place-node ( node where -- ) - ! - /n 'next-minode +! ( ) -; +\ Information that we need about the working file/directory +\ The working file changes at each level of a path search -\ This is used for symlinks and directory inodes where there -\ can only be one of them. --1 value max-version \ Local variable for latest-node and $find-name -\ -1 value the-inode \ Local variable for latest-node +0 instance value wd-inum \ Inumber of directory +0 instance value wf-inum \ Inumber of file or directory +0 instance value wf-type \ Type - 4 for directory, d# 10 for symlink, etc + +: set-root ( -- ) 1 to wd-inum 1 to wf-inum 4 to wf-type ; + +\ latest-node is for symlinks and directories, which have only one data node. + +-1 value max-version \ Local variable for latest-node -1 value the-offset \ Local variable for latest-node -: latest-node ( inum -- true | offset false ) - init-curvars - -1 to max-version + +: latest-node ( inum -- true | rinode false ) + init-curvars -1 to max-version ( inum ) inodes begin next-inode curinum amatch-inode while ( inum inode' offset version ) -\ inodes begin match-inode while ( inum inode' offset version ) - over get-inode inode-good? if ( inum inode' offset version ) +\ inodes begin match-inode while ( inum inode' offset version ) + over get-node inode-good? if ( inum inode' offset version ) dup max-version > if ( inum inode' offset version ) to max-version ( inum inode' offset ) to the-offset ( inum inode' ) @@ -802,10 +789,13 @@ repeat ( inum ) drop max-version -1 = if true exit then - the-offset false + the-offset get-node false ; -: collect-nodes ( inum -- any? ) +\ collect-node is for ordinary files which can have many data nodes + +: collect-nodes ( -- any? ) + wf-inum init-curvars minodes 'next-minode ! \ Empty the list @@ -877,20 +867,12 @@ r> outpos @ ?outlen ( ) ; -: .inode ( inode - ) - ." tot " dup riisize@ 8 u.r space - ." len " dup ridsize@ 8 u.r space - ." extent " dup rioffset@ over ridsize@ + 8 u.r space - ." comp " ricompr@ 3 u.r - cr -; : (play-inode) ( inode -- ) dup inode-good? 0= if ( inode ) debug-scan? if ." Skipping bad inode." cr then drop exit then - debug-scan? if dup .inode cr then >r r@ riisize@ r@ rioffset@ r@ ridsize@ + set-length @@ -910,22 +892,14 @@ -1 to the-eblock# -1 to have-eblock# 0 to file-size - next-minode minodes ?do i na1+ @ get-inode (play-inode) 8 +loop + next-minode minodes ?do i na1+ @ get-node (play-inode) 8 +loop release-inflater ; : ?play-log ( -- ) file-size -1 = if play-log then ; -: .ftype ( adr -- ) - ftype@ 2/ 0 max " / @=" rot min + c@ emit -; +: +dirent ( adr -- adr' ) na1+ dup w@ 0= if 2 na+ then wa1+ ; -: .fname ( dirent -- ) - dup fname$ space space type space .ftype -; - -: +dirent ( adr -- adr' ) 3 la+ dup c@ + 2+ ; - : #dirents ( -- n ) 0 next-dirent dirents ( n endadr adr ) @@ -935,164 +909,175 @@ char \ instance value delimiter -create root-dirent - 0 , \ pino - 0 , \ version - 1 , \ ino - 0 c, \ nsize - 4 c, \ type +defer $resolve-path +d# 1024 constant /symlink \ Max length of a symbolic link --1 instance value pwd -: set-root ( -- dirent ) root-dirent dup to pwd ; - -: strip\ ( name$ dirent -- name$' dirent' ) - -rot - dup 0<> if ( dirent name$ ) - over c@ delimiter = if ( dirent name$ ) - 1 /string ( dirent name$ ) - rot drop set-root -rot ( dirent name$ ) - then ( dirent name$ ) - then ( dirent name$ ) - rot +: strip\ ( name$ -- name$' ) + dup 0<> if ( name$ ) + over c@ delimiter = if ( name$ ) + 1 /string ( name$ ) + set-root ( name$ ) + then ( name$ ) + then ( name$ ) ; -: dir-match? ( name$ par adr -- flag ) - tuck pino@ <> if ( name$ adr ) - 3drop false ( false ) - else ( name$ adr ) - fname$ $= ( flag ) - then +0 instance value my-vers \ Highest version number - local to $find-name + +: ?update-dirent ( offset name$ -- ) + rot get-node >r ( name$ r: rdirent ) + r@ rdname$ $= if ( r: rdirent ) + wd-inum r@ rdpino@ = if ( r: rdirent ) + r@ rdversion@ my-vers > if ( r: rdirent ) + r@ rdversion@ to my-vers ( r: rdirent ) + r@ rdinode@ to wf-inum ( r: rdirent ) + r@ rdtype@ to wf-type ( r: rdirent ) + then ( r: rdirent ) + then ( r: rdirent ) + then ( r: rdirent ) + r> drop ( ) ; --1 ( instance ) value the-dirent \ Local variable for $find-name -: $find-name ( name$ dirent -- true | dirent false ) - -1 to max-version - dirino@ ( name$ parent-inode ) - dirents ( name$ parent-inode adr ) - begin dup next-dirent u< while ( $ par adr ) +: $find-name ( name$ -- error? ) + -1 to my-vers ( name$ ) + wd-inum crctab 2over ($crc) >r ( name$ r: hash ) - \ Look for a directory type dirent with the right name and parent - 2over 2over dir-match? if ( $ par adr ) - - \ If this is the latest version, record its inode - dup version@ max-version > if - dup version@ to max-version - dup to the-dirent - then - then - +dirent - repeat ( name$ parent adr ) - 4drop - max-version 0< if true exit then - the-dirent false + 0 dirent-offset ! + dirents begin decode-dirent while ( name$ adr' offset pino' hash' ) + nip ( name$ adr offset hash' ) + \ Check for a hash match + r@ = if ( name$ adr offset ) + 2over ?update-dirent ( name$ adr ) + else ( name$ adr offset ) + drop ( name$ adr ) + then ( name$ adr ) + repeat ( name$ adr r: hash ) + 2drop r> drop ( ) + my-vers 0< if true exit then ( ) + wf-type 4 = if wf-inum to wd-inum then + false ; -defer $resolve-path -d# 1024 constant /symlink \ Max length of a symbolic link - -\ The input dirent is for a symlink. Resolve it to a new dirent -: dir-link ( dirent -- true | dirent' false ) +\ The work file is a symlink. Resolve it to a new dirent +: dir-link ( -- error? ) delimiter >r [char] / to delimiter + + \ Allocate temporary space for the symlink value (new name) /symlink alloc-mem >r - dirino@ latest-node if ( ) + wf-inum latest-node if ( ) true - else ( offset ) - get-inode ( rinode ) + else ( rinode ) dup >ridata swap ridsize@ ( adr len ) tuck r@ swap move ( len ) - r@ swap pwd $resolve-path ( true | dirent false ) + r@ swap $resolve-path ( error? ) then r> /symlink free-mem r> to delimiter ; -: $find-path ( path$ dirent -- true | dirent' false ) - begin strip\ over while ( path$ dirent' ) - dup ftype@ case ( path$ dirent c: type ) +: ($resolve-path) ( path$ -- error? ) + 4 to wf-type + begin strip\ dup while ( path$ ) + wf-type case ( path$ c: type ) + 4 of \ Directory ( path$ ) + delimiter left-parse-string ( rem$' head$ ) + $find-name if 2drop true exit then ( rem$ ) + endof ( rem$ ) - 4 of \ Directory ( path$ dirent ) - dup to pwd ( path$ dirent ) - >r delimiter left-parse-string r> ( rem$' head$ dirent ) - $find-name if ( rem$' ) - 2drop true exit - then ( rem$ dirent ) - endof ( rem$ dirent ) + d# 10 of \ symlink ( rem$ ) + dir-link if 2drop true exit then ( rem$ ) + endof ( rem$ ) + ( default ) ( rem$ c: type ) - d# 10 of ( rem$ dirent ) - dir-link if ( rem$ ) - 2drop true exit - then ( rem$ dirent ) - endof ( rem$ dirent ) \ symlink - ( default ) ( rem$ dirent c: type ) - \ The parent is an ordinary file or something else that \ can't be treated as a directory - 4drop true exit - endcase ( rem$ dirent ) - repeat ( rem$ dirent ) - nip nip false ( dirent ) + 3drop true exit + endcase ( rem$ ) + repeat ( rem$ ) + 2drop false ( false ) ; -' $find-path to $resolve-path -\ Leaves pwd set to the containing directory -: $chdir ( path$ -- error? ) - $find-path if true exit then ( inode ) - ftype@ 4 <> \ Return false (no error) if it's a directory -; +\ Leaves the-wd set to the containing directory +\ : $chdir ( path$ -- error? ) +\ \ XXX should save wf-* and restore them on failure +\ $resolve-path if true exit then ( dirent ) +\ wf-type 4 <> \ Return true (error) if it's not a directory +\ ; -: advance-dirent ( dirent -- false | dirent' true ) - pwd dirino@ swap ( parent-inode dirent ) - begin dup next-dirent u< while ( par dirent ) - 2dup pino@ = if ( par dirent ) - nip true exit - then ( par dirent ) - +dirent ( par dirent' ) - repeat ( par dirent' ) - 2drop false +' ($resolve-path) to $resolve-path + +\ "tdirent" section + +\ This section makes a list of directory entries for a given directory. +\ It is used only by "next-file-info". It scans the in-memory abbreviated +\ directory list, looking for entries whose parent inum matches that of +\ the current directory. It checks for duplicate names, superseding +\ older versions and removing unlinked ones. + +: tdinum@ ( tdirent -- inum ) l@ ; +: tdversion@ ( tdirent -- vers ) la1+ l@ ; +: tdname$ ( tdirent -- name$ ) 2 la+ count ; +: tdlen ( tdirent -- len ) dup tdname$ + swap - ; + +\ Move down all the following tdirents to overwrite the current one. + +: remove-tdirent ( tdirent -- ) + dup tdlen ( tdirent len ) + 2dup + ( tdirent len next-tdirent ) + rot ( len next-tdirent tdirent ) + next-minode 2 pick - ( len next-tdirent tdirent move-len ) + move ( len ) + negate 'next-minode +! ( ) +; +: replace-tdirent ( rdirent tdirent -- ) + over rdinode@ over l! ( rdirent tdirent' ) \ Inum + swap rdversion@ swap la1+ l! ( ) \ Version ; -: insert-dirent ( dirent -- ) - minodes begin dup next-minode u< while ( dirent listadr ) - over fname$ 2 pick @ fname$ $= if ( dirent listadr ) - over version@ over @ version@ > if ( dirent listadr ) - ! ( ) - else ( dirent listadr ) - 2drop ( ) - then ( ) - exit - then ( dirent listadr ) - na1+ ( dirent listadr' ) - repeat ( dirent listadr ) - place-node ( ) +: place-tdirent ( rdirent -- ) + next-minode ( rdirent tdirent ) + over rdinode@ l+! ( rdirent tdirent' ) + over rdversion@ l+! ( rdirent tdirent' ) + swap rdname$ ( tdirent name$ ) + rot pack ( tdirent ) + count + 'next-minode ! ( ) ; -\ Having collected the list of directory entries for the current -\ target directory, we must prune the list to remove unlinked ones. -: remove-unlinks ( -- ) - minodes begin dup next-minode < while ( minode ) - dup @ dirino@ if ( minode ) - na1+ ( minode' ) - else ( minode ) - \ Deleted, remove from list - -1 /n* 'next-minode +! ( minode ) - dup na1+ over ( minode src dst ) - next-minode over - move ( minode ) - then ( minode' ) - repeat ( minode' ) - drop ( ) +: insert-dirent ( offset -- ) + get-node ( rdirent ) + next-minode minodes ?do ( rdirent ) + dup rdname$ i tdname$ $= if ( rdirent ) \ Same name + dup rdversion@ i tdversion@ > if ( rdirent ) \ New version + dup rdinode@ if ( rdirent ) + dup i replace-tdirent ( rdirent ) \ Not unlinked + else ( rdirent ) + i remove-tdirent ( rdirent ) \ Unlinked + then ( rdirent ) + then ( rdirent ) + drop unloop exit + then ( rdirent ) + i tdlen ( rdirent ) + +loop ( rdirent ) + place-tdirent ( ) ; + : prep-dirents ( -- ) minodes 'next-minode ! \ Empty the list - dirents - begin advance-dirent while - dup insert-dirent - +dirent - repeat - remove-unlinks + dirents begin decode-dirent while ( adr offset pino hash ) + drop wd-inum = if ( adr offset ) + insert-dirent ( adr ) + else ( adr offset ) + drop ( adr ) + then ( adr ) + repeat ( ) ; +\ End of "tdirent" section + +false [if] +\ "delete file" section + \ For now, just 0 the modify time, since we only support deleting : now-seconds ( -- secs ) 0 ; @@ -1145,15 +1130,18 @@ 1 <> if ." JFFS2: write failed" then ( ) ; -\ pwd is the parent dirent +\ the-wd is the parent dirent : $delete ( adr len -- error? ) - pwd $resolve-path dup if true exit then ( dirent' ) - >r r@ pino@ r@ version@ 1+ r> fname$ ( parent-ino new-version name$ ) + $resolve-path if true exit then ( dirent' ) + >r r@ xxpino@ r@ xxversion@ 1+ r> xxfname$ ( parent-ino new-version name$ ) 0 0 make-raw-dirent ( adr len ) find-empty-page ( adr len page# ) put-node ; +\ End of "delete file" section +[then] + decimal headerless @@ -1167,6 +1155,22 @@ : update-ptr ( len' -- len' ) dup seek-ptr + to seek-ptr ; : 'base-adr ( -- adr ) seek-ptr file-buf + ; +: set-sizes ( -- ) + -1 to file-size + + " block-size" $call-parent to /page + + " erase-size" ['] $call-parent ( adr len xt ) + catch if 2drop h# 20000 then ( n ) + to /eblock + + /eblock /page / to pages/eblock + + " size" $call-parent ( d ) + /page um/mod to pages/chip ( rem ) + drop +; + headers external : seek ( d.offset -- status ) @@ -1196,21 +1200,20 @@ my-args " <NoFile>" $= if true exit then - my-args set-root $resolve-path if false ?release exit then ( dirent ) + my-args set-root $resolve-path if false ?release exit then ( ) begin \ We now have the dirent for the file at the end of the string - dup ftype@ case ( dirent ) - 4 of to pwd true exit endof \ Directory - 8 of dirino@ collect-nodes ?release exit endof \ Regular file - d# 10 of \ Link - dir-link if false ?release exit then ( dirent ) - endof + wf-type case + 4 of wf-inum to wd-inum true exit endof \ Directory + 8 of collect-nodes ?release exit endof \ Regular file + d# 10 of dir-link if false ?release exit then endof \ Link ( default ) \ Anything else (special file) is error - 2drop false ?release exit - endcase ( dirent ) + drop false ?release exit + endcase again ; + : close ( -- ) release-buffers ; : size ( -- d.size ) ?play-log file-size 0 ; @@ -1264,104 +1267,25 @@ \ End of common code : next-file-info ( id -- false | id' s m h d m y len attributes name$ true ) - dup 0= if drop prep-dirents minodes then ( minode ) - dup next-minode = if drop false exit then ( minode ) - dup @ >r na1+ ( id' r: dirent ) - r@ dirino@ latest-node if ( id' r: dirent ) - 0 0 0 0 0 0 ( id' s m h d m y r: dirent ) - 0 ( ... len r: dirent ) - 0 ( ... attributes r: dirent ) - else ( id' offset r: dirent ) - get-inode >r ( id' r: dirent rinode ) - r@ rimtime@ sec>time&date ( id' s m h d m y r: dirent rinode ) - r@ riisize@ ( id' s m h d m y len r: dirent rinode ) - r> rimode@ ( id' s m h d m y len mode r: dirent ) + dup 0= if drop prep-dirents minodes then ( tdirent ) + dup next-minode = if drop false exit then ( tdirent ) + dup >r dup tdlen + ( id' r: tdirent ) + r@ tdinum@ latest-node if ( id' r: tdirent ) +." Can't find data node" cr + 0 0 0 0 0 0 ( id' s m h d m y r: tdirent ) + 0 ( ... len r: tdirent ) + 0 ( ... attributes r: tdirent ) + else ( id' rinode r: tdirent ) + >r ( id' r: tdirent rinode ) + r@ rimtime@ sec>time&date ( id' s m h d m y r: tdirent rinode ) + r@ riisize@ ( id' s m h d m y len r: tdirent rinode ) + r> rimode@ ( id' s m h d m y len mode r: tdirent ) then - r> fname$ true + r> tdname$ true ; : free-bytes ( -- d.#bytes ) 0 0 ; - -\ create debug-jffs -[ifdef] debug-jffs -\needs mcr : mcr cr exit? if abort then ; - -\ Tools for dumping the dirent table, for debugging -: .ldirent-hdr ( -- ) - ." Inode Version Eblock Offs Parent Name" cr -; -: .ldirent ( adr -- adr' ) - dup dirino@ 8 u.r \ Inode - dup version@ 8 u.r \ Version - dup eblock@ 7 u.r \ Eblock# - dup offset@ 6 u.r \ Offset on eblock - dup pino@ 7 u.r \ Parent Inode - dup .fname mcr - +dirent -; - -: .dirents ( -- ) - .ldirent-hdr - next-dirent dirents ( endadr adr ) - begin 2dup > while .ldirent repeat ( endadr adr ) - 2drop -; - - -: .inode-hdr ( -- ) ." Inode Version Eblock Offs" cr ; -: .inode ( adr ) - dup minum@ 8 u.r \ Inode - dup mversion@ 8 u.r \ Version - dup moffset@ /eblock /mod 7 u.r 6 u.r \ Eblock#, offset on eblock -\ dup mtotlen@ 8 u.r \ Total length - mcr - /mem-inode + -; - -: .inodes ( -- ) - .inode-hdr - next-inode inodes ( endadr adr ) - begin 2dup > while .inode repeat ( endadr adr ) - 2drop -; - -: .dirent ( adr parent -- adr' ) - over pino@ = if ( adr ) \ Check Parent Inode -\ dup version@ 8 u.r \ Version - dup dirino@ 8 u.r \ Inode - dup .fname mcr - then ( adr ) - +dirent ( adr' ) -; - -: .dir ( parent-inode -- ) - >r - next-dirent dirents ( endadr adr ) - begin 2dup > while r@ .dirent repeat ( endadr adr ) - 2drop - r> drop -; - -: $fdir ( path$ -- ) - $resolve-path abort" Not found" ( dirent ) - dup ftype@ 4 = if - dirino@ .dir - else - dup dirino@ . .fname cr - then -; - -: dir parse-word set-root $fdir ; - -: expand-file ( inum -- ) - collect-nodes 0= abort" none" - play-log -; -[then] - - - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r403 - cpu/x86/pc/olpc
by svn＠openbios.org 20 May '07

20 May '07

Author: wmb Date: 2007-05-20 06:31:54 +0200 (Sun, 20 May 2007) New Revision: 403 Modified: cpu/x86/pc/olpc/copynand.fth Log: save-nand - Now can write to raw disks. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-05-19 02:01:40 UTC (rev 402) +++ cpu/x86/pc/olpc/copynand.fth 2007-05-20 04:31:54 UTC (rev 403) @@ -162,9 +162,17 @@ cr ." Dumping to " 2dup type cr 2dup ['] $delete catch if 2drop then ( name$ ) - $create-file to fileih + 2dup ['] $create-file catch if + 2drop + " Can't open a file. Try using the raw disk?" confirm if + open-file + else + 2drop 0 + then + then + to fileih - fileih 0= if nandih close-dev true abort" Can't open file" then + fileih 0= if nandih close-dev true abort" Can't open output" then \ The stack is empty at the end of each line unless otherwise noted #nand-pages 0 do

1 0

r149 - in openbios-devel: arch/sparc32 drivers include/openbios include/sparc32
by svn＠openbios.org 19 May '07

19 May '07

Author: blueswirl Date: 2007-05-19 14:55:01 +0200 (Sat, 19 May 2007) New Revision: 149 Modified: openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/openbios.h openbios-devel/arch/sparc32/romvec.c openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h openbios-devel/drivers/sbus.c openbios-devel/include/openbios/drivers.h openbios-devel/include/sparc32/io.h Log: Use full 36-bit physical address space on SS10 Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/arch/sparc32/console.c 2007-05-19 12:55:01 UTC (rev 149) @@ -17,10 +17,10 @@ #ifdef CONFIG_DEBUG_CONSOLE_SERIAL -static unsigned long kbd_base, serial_base; +static volatile unsigned char *kbd_dev, *serial_dev; -#define CTRL(port) (serial_base + (port) * 2 + 0) -#define DATA(port) (serial_base + (port) * 2 + 2) +#define CTRL(port) serial_dev[(port) * 2 + 0] +#define DATA(port) serial_dev[(port) * 2 + 2] /* Conversion routines to/from brg time constants from/to bits * per second. @@ -54,53 +54,62 @@ static int uart_charav(int port) { - return ((inb(CTRL(port)) & Rx_CH_AV) != 0); + return ((CTRL(port) & Rx_CH_AV) != 0); } static char uart_getchar(int port) { - while (!uart_charav(port)); - return ((char) (inb(DATA(port))) & 0177); + while (!uart_charav(port)) + ; + return DATA(port) & 0177; } static void uart_putchar(int port, unsigned char c) { - if (c == '\n') - uart_putchar(port, '\r'); - while (!inb(CTRL(port)) & 4); - outb(c, DATA(port)); + if (!serial_dev) + return; + + if (c == '\n') + uart_putchar(port, '\r'); + while (!(CTRL(port) & 4)) + ; + DATA(port) = c; } static void uart_init_line(int port, unsigned long baud) { - outb(4, CTRL(port)); // reg 4 - outb(SB1 | X16CLK, CTRL(port)); // no parity, async, 1 stop - // bit, 16x clock + CTRL(port) = 4; // reg 4 + CTRL(port) = SB1 | X16CLK; // no parity, async, 1 stop bit, 16x + // clock - baud = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); + baud = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); - outb(12, CTRL(port)); // reg 12 - outb(baud & 0xff, CTRL(port)); - outb(13, CTRL(port)); // reg 13 - outb((baud >> 8) & 0xff, CTRL(port)); - outb(14, CTRL(port)); // reg 14 - outb(BRSRC | BRENAB, CTRL(port)); + CTRL(port) = 12; // reg 12 + CTRL(port) = baud & 0xff; + CTRL(port) = 13; // reg 13 + CTRL(port) = (baud >> 8) & 0xff; + CTRL(port) = 14; // reg 14 + CTRL(port) = BRSRC | BRENAB; - outb(3, CTRL(port)); // reg 3 - outb(RxENAB | Rx8, CTRL(port)); // enable rx, 8 bits/char + CTRL(port) = 3; // reg 3 + CTRL(port) = RxENAB | Rx8; // enable rx, 8 bits/char - outb(5, CTRL(port)); // reg 5 - outb(RTS | TxENAB | Tx8 | DTR, CTRL(port)); // enable tx, 8 - // bits/char, set - // RTS & DTR + CTRL(port) = 5; // reg 5 + CTRL(port) = RTS | TxENAB | Tx8 | DTR; // enable tx, 8 bits/char, + // set RTS & DTR } -int uart_init(int port, unsigned long speed) +int uart_init(uint64_t port, unsigned long speed) { - serial_base = ((unsigned long)port) & ~3; - uart_init_line(port & 3, speed); - return -1; + int line; + + serial_dev = map_io(port & ~7ULL, 2 * 4); + serial_dev += port & 7ULL; + line = port & 3ULL; + uart_init_line(line, speed); + + return -1; } static void serial_putchar(int c) @@ -126,9 +135,9 @@ #ifdef CONFIG_DEBUG_CONSOLE_VIDEO -#define VMEM_BASE 0x00800000 +#define VMEM_BASE 0x00800000ULL #define VMEM_SIZE (1024*768*1) -#define DAC_BASE 0x00200000 +#define DAC_BASE 0x00200000ULL #define DAC_SIZE 16 static unsigned char *vmem; @@ -170,7 +179,7 @@ memset((void *)vmem, 0, VMEM_SIZE); } -void tcx_init(unsigned long base) +void tcx_init(uint64_t base) { vmem = map_io(base + VMEM_BASE, VMEM_SIZE); dac = map_io(base + DAC_BASE, DAC_SIZE); @@ -178,9 +187,10 @@ console_init(); } -void kbd_init(unsigned long base) +void kbd_init(uint64_t base) { - kbd_base = base + 4; + kbd_dev = map_io(base, 2 * 4); + kbd_dev += 4; } static const unsigned char sunkbd_keycode[128] = { @@ -216,7 +226,7 @@ int keyboard_dataready(void) { - return ((inb(kbd_base) & 1) == 1); + return ((kbd_dev[0] & 1) == 1); } unsigned char @@ -227,7 +237,7 @@ while (!keyboard_dataready()) { } do { - ch = inb(kbd_base + 2) & 0xff; + ch = kbd_dev[2] & 0xff; if (ch == 99) shiftstate |= 1; else if (ch == 110) Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/arch/sparc32/entry.S 2007-05-19 12:55:01 UTC (rev 149) @@ -14,8 +14,8 @@ #define PHYS_JJ_EEPROM 0x71200000 /* [2000] MK48T08 */ #define PHYS_JJ_INTR0 0x71E00000 /* CPU0 interrupt control registers */ -#define PHYS_SS10_EEPROM 0xf1200000 /* XXX Actually at 0xff1200000ULL (36 bits)*/ -#define PHYS_SS10_INTR0 0xf1400000 /* 0xff1400000ULL */ +#define PHYS_SS10_EEPROM 0xf1200000 +#define PHYS_SS10_INTR0 0xf1400000 #define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */ @@ -58,6 +58,7 @@ set PHYS_JJ_EEPROM + 0x2E, %g1 lduba [%g1] ASI_M_BYPASS, %g2 set PHYS_JJ_EEPROM + 0x30, %g1 + lda [%g1] ASI_M_BYPASS, %g1 tst %g2 bz first_cpu nop @@ -89,30 +90,29 @@ nop ss10: set PHYS_SS10_EEPROM, %g1 - ! XXX use full 36 bits access - lduba [%g1] ASI_M_BYPASS, %g2 + lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'Q' bne bad_nvram inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 + lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'E' bne bad_nvram inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 + lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'M' bne bad_nvram inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 + lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'U' bne bad_nvram ! Ok, this is SS-10 mov 0x72, %y ! Check if this not the first SMP CPU, if so, bypass PROM entirely - ! XXX use full 36 bits access set PHYS_SS10_EEPROM + 0x2E, %g1 - lduba [%g1] ASI_M_BYPASS, %g2 + lduba [%g1] ASI_M_CTL, %g2 set PHYS_SS10_EEPROM + 0x30, %g1 + lda [%g1] ASI_M_CTL, %g1 tst %g2 bz first_cpu nop @@ -120,19 +120,19 @@ sll %g2, 12, %g2 add %g1, %g2, %g2 set 0xffffffff, %g1 - sta %g1, [%g2] ASI_M_BYPASS ! clear softints + sta %g1, [%g2] ASI_M_CTL ! clear softints add %g2, 4, %g2 - sta %g0, [%g2] ASI_M_BYPASS ! clear softints + sta %g0, [%g2] ASI_M_CTL ! clear softints set PHYS_SS10_EEPROM + 0x3C, %g1 - lda [%g1] ASI_M_BYPASS, %g1 + lda [%g1] ASI_M_CTL, %g1 set AC_M_CTPR, %g2 sta %g1, [%g2] ASI_M_MMUREGS ! set ctx table ptr set PHYS_JJ_EEPROM + 0x40, %g1 - lda [%g1] ASI_M_BYPASS, %g1 + lda [%g1] ASI_M_CTL, %g1 set AC_M_CXR, %g2 sta %g1, [%g2] ASI_M_MMUREGS ! set context set PHYS_SS10_EEPROM + 0x38, %g1 - lda [%g1] ASI_M_BYPASS, %g2 + lda [%g1] ASI_M_CTL, %g2 set 1, %g1 jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu @@ -140,7 +140,6 @@ first_cpu: /* Create temporary page tables and map the ROM area to end of RAM. This will be done properly in iommu.c later. */ - lda [%g1] ASI_M_BYPASS, %g1 set _end, %g3 set 0xfff, %g2 add %g3, %g2, %g3 Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/arch/sparc32/openbios.c 2007-05-19 12:55:01 UTC (rev 149) @@ -18,28 +18,25 @@ void boot(void); void ob_ide_init(void); -void tcx_init(unsigned long base); -void kbd_init(unsigned long base); +void tcx_init(uint64_t base); +void kbd_init(uint64_t base); int qemu_machine_type; struct hwdef { - unsigned long iommu_high, iommu_base; - unsigned long slavio_high, slavio_base; - unsigned long intctl_base, counter_base, nvram_base, ms_kb_base, serial_base; + uint64_t iommu_base, slavio_base; + uint64_t intctl_base, counter_base, nvram_base, ms_kb_base, serial_base; unsigned long fd_offset, counter_offset, intr_offset; - unsigned long dma_base, esp_base, le_base; - unsigned long tcx_base; + uint64_t dma_base, esp_base, le_base; + uint64_t tcx_base; int machine_id; }; static const struct hwdef hwdefs[] = { /* SS-5 */ { - .iommu_high = 0x0, .iommu_base = 0x10000000, .tcx_base = 0x50000000, - .slavio_high = 0x0, .slavio_base = 0x71000000, .ms_kb_base = 0x71000000, .serial_base = 0x71100000, @@ -54,20 +51,18 @@ }, /* SS-10 */ { - .iommu_high = 0xf, - .iommu_base = 0xe0000000, // XXX Actually at 0xfe0000000ULL (36 bits) - .tcx_base = 0x20000000, // 0xe20000000ULL, - .slavio_high = 0xf, - .slavio_base = 0xf1000000, // 0xff1000000ULL, - .ms_kb_base = 0xf1000000, // 0xff1000000ULL, - .serial_base = 0xf1100000, // 0xff1100000ULL, - .nvram_base = 0xf1200000, // 0xff1200000ULL, + .iommu_base = 0xfe0000000ULL, + .tcx_base = 0xe20000000ULL, + .slavio_base = 0xff1000000ULL, + .ms_kb_base = 0xff1000000ULL, + .serial_base = 0xff1100000ULL, + .nvram_base = 0xff1200000ULL, .fd_offset = 0x00700000, // 0xff1700000ULL, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, - .dma_base = 0xf0400000, // 0xef0400000ULL, - .esp_base = 0xf0800000, // 0xef0800000ULL, - .le_base = 0xf0c00000, // 0xef0c00000ULL, + .dma_base = 0xef0400000ULL, + .esp_base = 0xef0800000ULL, + .le_base = 0xef0c00000ULL, .machine_id = 0x72, }, }; @@ -95,9 +90,9 @@ void setup_timers(void); modules_init(); - ob_init_mmu(hwdef->iommu_high, hwdef->iommu_base); + ob_init_mmu(hwdef->iommu_base); #ifdef CONFIG_DRIVER_OBIO - ob_obio_init(hwdef->slavio_high, hwdef->slavio_base, hwdef->fd_offset, + ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, hwdef->counter_offset, hwdef->intr_offset); nvram_init(); #endif @@ -105,7 +100,7 @@ #ifdef CONFIG_DEBUG_CONSOLE_VIDEO init_video(); #endif - ob_sbus_init(hwdef->iommu_high, hwdef->iommu_base + 0x1000, hwdef->machine_id); + ob_sbus_init(hwdef->iommu_base + 0x1000ULL, hwdef->machine_id); #endif device_end(); @@ -133,7 +128,7 @@ #endif #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - uart_init(hwdef->serial_base | (CONFIG_SERIAL_PORT? 0: 4), + uart_init(hwdef->serial_base | (CONFIG_SERIAL_PORT? 0ULL: 4ULL), CONFIG_SERIAL_SPEED); #endif #ifdef CONFIG_DEBUG_CONSOLE_VIDEO Modified: openbios-devel/arch/sparc32/openbios.h =================================================================== --- openbios-devel/arch/sparc32/openbios.h 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/arch/sparc32/openbios.h 2007-05-19 12:55:01 UTC (rev 149) @@ -22,7 +22,7 @@ /* console.c */ extern void cls(void); #ifdef CONFIG_DEBUG_CONSOLE -extern int uart_init(int port, unsigned long speed); +extern int uart_init(uint64_t port, unsigned long speed); extern void video_init(void); #endif Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/arch/sparc32/romvec.c 2007-05-19 12:55:01 UTC (rev 149) @@ -313,18 +313,20 @@ unsigned int npages; unsigned int off; unsigned int mva; + uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; - DPRINTF("obp_dumb_mmap: virta 0x%x, which_io %d, paddr 0x%x, sz %d\n", (unsigned int)va, which_io, pa, size); + DPRINTF("obp_dumb_mmap: virta 0x%x, paddr 0x%llx, sz %d\n", + (unsigned int)va, mpa, size); off = pa & (PAGE_SIZE-1); - npages = (off + size + (PAGE_SIZE-1)) / PAGE_SIZE; - pa &= ~(PAGE_SIZE-1); + npages = (off + (size - 1) + (PAGE_SIZE-1)) / PAGE_SIZE; + mpa &= ~(uint64_t)(PAGE_SIZE - 1); mva = (unsigned int) va; while (npages-- != 0) { - map_page(mva, pa, 1); + map_page(mva, mpa, 1); mva += PAGE_SIZE; - pa += PAGE_SIZE; + mpa += (uint64_t)PAGE_SIZE; } return va; Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/drivers/esp.c 2007-05-19 12:55:01 UTC (rev 149) @@ -25,8 +25,8 @@ #include "asm/dma.h" #include "esp.h" -#define MACIO_ESPDMA 0x00400000 /* ESP DMA controller */ -#define MACIO_ESP 0x00800000 /* ESP SCSI */ +#define MACIO_ESPDMA 0x00400000ULL /* ESP DMA controller */ +#define MACIO_ESP 0x00800000ULL /* ESP SCSI */ #define BUFSIZE 4096 @@ -309,10 +309,10 @@ static int -espdma_init(unsigned int slot, unsigned long base, unsigned long offset, +espdma_init(unsigned int slot, uint64_t base, unsigned long offset, struct esp_dma *espdma) { - espdma->regs = (void *)map_io(base + offset + MACIO_ESPDMA, 0x10); + espdma->regs = (void *)map_io(base + (uint64_t)offset + MACIO_ESPDMA, 0x10); if (espdma->regs == 0) { DPRINTF("espdma_init: cannot map registers\n"); @@ -424,7 +424,7 @@ } int -ob_esp_init(unsigned int slot, unsigned long base, unsigned long offset) +ob_esp_init(unsigned int slot, uint64_t base, unsigned long offset) { int id, diskcount = 0, cdcount = 0, *counter_ptr; char nodebuff[256], aliasbuff[256]; @@ -444,7 +444,8 @@ return -1; } /* Get the IO region */ - esp->ll = (void *)map_io(base + offset + MACIO_ESP, sizeof(struct esp_regs)); + esp->ll = (void *)map_io(base + (uint64_t)offset + MACIO_ESP, + sizeof(struct esp_regs)); if (esp->ll == 0) { DPRINTF("Can't map ESP registers\n"); return -1; Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/drivers/iommu.c 2007-05-19 12:55:01 UTC (rev 149) @@ -62,7 +62,7 @@ struct iommu ciommu; static struct iommu_regs *regs; -static void iommu_init(struct iommu *t, unsigned long base); +static void iommu_init(struct iommu *t, uint64_t base); static void iommu_invalidate(struct iommu_regs *iregs) @@ -159,7 +159,7 @@ * Create a memory mapping from va to epa. */ int -map_page(unsigned long va, unsigned long epa, int type) +map_page(unsigned long va, uint64_t epa, int type) { uint32_t pte; unsigned long pa; @@ -176,7 +176,7 @@ pte |= SRMMU_PRIV; /* Supervisor only access */ } *(uint32_t *)pa = pte; - DPRINTF("map_page: va 0x%lx pa 0x%lx pte 0x%x\n", va, epa, pte); + DPRINTF("map_page: va 0x%lx pa 0x%llx pte 0x%x\n", va, epa, pte); return 0; } @@ -186,7 +186,7 @@ * Returns va of the mapping or 0 if unsuccessful. */ void * -map_io(unsigned pa, int size) +map_io(uint64_t pa, int size) { void *va; unsigned int npages; @@ -202,7 +202,7 @@ return va; mva = (unsigned int) va; - DPRINTF("map_io: va 0x%p pa 0x%x off 0x%x npages %d\n", va, pa, off, npages); /* P3 */ + DPRINTF("map_io: va 0x%p pa 0x%llx off 0x%x npages %d\n", va, pa, off, npages); /* P3 */ while (npages-- != 0) { map_page(mva, pa, 1); mva += PAGE_SIZE; @@ -258,13 +258,15 @@ static void map_pages(void) { - unsigned long va, pa; + unsigned long va; int size; + uint64_t pa; size = POP(); va = POP(); - (void) POP(); pa = POP(); + pa <<= 32; + pa |= POP() & 0xffffffff; for (; size > 0; size -= PAGE_SIZE, pa += PAGE_SIZE, va += PAGE_SIZE) map_page(va, pa, 1); @@ -273,7 +275,7 @@ void -ob_init_mmu(unsigned long bus, unsigned long base) +ob_init_mmu(uint64_t base) { extern unsigned int qemu_mem_size; @@ -305,9 +307,9 @@ push_str("/virtual-memory"); fword("find-device"); - PUSH(bus); + PUSH(base >> 32); fword("encode-int"); - PUSH(base); + PUSH(base & 0xffffffff); fword("encode-int"); fword("encode+"); PUSH(IOMMU_REGS); @@ -344,9 +346,9 @@ push_str("address"); fword("property"); - PUSH(bus); + PUSH(base >> 32); fword("encode-int"); - PUSH(base); + PUSH(base & 0xffffffff); fword("encode-int"); fword("encode+"); PUSH(IOMMU_REGS); @@ -367,7 +369,7 @@ * Switch page tables. */ void -init_mmu_swift(unsigned long base) +init_mmu_swift(uint64_t base) { unsigned int addr, i; unsigned long pa, va; @@ -473,7 +475,7 @@ * the routine is higher in food chain. */ static void -iommu_init(struct iommu *t, unsigned long base) +iommu_init(struct iommu *t, uint64_t base) { unsigned int *ptab; int ptsize; Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/drivers/obio.c 2007-05-19 12:55:01 UTC (rev 149) @@ -71,7 +71,7 @@ } static unsigned long -ob_reg(unsigned long base, unsigned long offset, unsigned long size, int map) +ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map) { PUSH(0); fword("encode-int"); @@ -248,7 +248,7 @@ }; static void -ob_zs_init(unsigned long base, unsigned long offset, int intr, int slave, int keyboard) +ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, int keyboard) { char nodebuff[256]; @@ -277,7 +277,7 @@ fword("finish-device"); - sprintf(nodebuff, "/obio/zs@0,%x", offset); + sprintf(nodebuff, "/obio/zs@0,%x", (int)offset & 0xffffffff); if (keyboard) { REGISTER_NODE_METHODS(zs_keyboard, nodebuff); } else { @@ -532,7 +532,7 @@ } static void -ob_nvram_init(unsigned long base, unsigned long offset) +ob_nvram_init(uint64_t base, uint64_t offset) { extern uint32_t kernel_image; extern uint32_t kernel_size; @@ -777,7 +777,7 @@ } static void -ob_fd_init(unsigned long base, unsigned long offset, int intr) +ob_fd_init(uint64_t base, uint64_t offset, int intr) { ob_new_obio_device("SUNW,fdtwo", "block"); @@ -790,7 +790,7 @@ static void -ob_sconfig_init(unsigned long base, unsigned long offset) +ob_sconfig_init(uint64_t base, uint64_t offset) { ob_new_obio_device("slavioconfig", NULL); @@ -800,7 +800,7 @@ } static void -ob_auxio_init(unsigned long base, unsigned long offset) +ob_auxio_init(uint64_t base, uint64_t offset) { ob_new_obio_device("auxio", NULL); @@ -810,7 +810,7 @@ } static void -ob_power_init(unsigned long base, unsigned long offset, int intr) +ob_power_init(uint64_t base, uint64_t offset, int intr) { ob_new_obio_device("power", NULL); @@ -822,7 +822,7 @@ } static void -ob_counter_init(unsigned long base, unsigned long offset) +ob_counter_init(uint64_t base, unsigned long offset) { volatile struct sun4m_timer_regs *regs; int i; @@ -855,7 +855,7 @@ fword("property"); - regs = map_io(base + offset, sizeof(*regs)); + regs = map_io(base + (uint64_t)offset, sizeof(*regs)); regs->l10_timer_limit = (((1000000/100) + 1) << 10); regs->cpu_timers[0].l14_timer_limit = 0; @@ -877,7 +877,7 @@ static volatile struct sun4m_intregs *intregs; static void -ob_interrupt_init(unsigned long base, unsigned long offset) +ob_interrupt_init(uint64_t base, unsigned long offset) { int i; @@ -908,7 +908,7 @@ push_str("reg"); fword("property"); - intregs = map_io(base + offset, sizeof(*intregs)); + intregs = map_io(base | (uint64_t)offset, sizeof(*intregs)); intregs->set = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; @@ -984,7 +984,7 @@ } static void -ob_set_obio_ranges(unsigned long high, unsigned long base) +ob_set_obio_ranges(uint64_t base) { push_str("/obio"); fword("find-device"); @@ -993,10 +993,10 @@ PUSH(0); fword("encode-int"); fword("encode+"); - PUSH(high); + PUSH(base >> 32); fword("encode-int"); fword("encode+"); - PUSH(base); + PUSH(base & 0xffffffff); fword("encode-int"); fword("encode+"); PUSH(SLAVIO_SIZE); @@ -1029,9 +1029,8 @@ int -ob_obio_init(unsigned long slavio_high, unsigned long slavio_base, - unsigned long fd_offset, unsigned long counter_offset, - unsigned long intr_offset) +ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, + unsigned long counter_offset, unsigned long intr_offset) { // All devices were integrated to NCR89C105, see @@ -1042,7 +1041,7 @@ REGISTER_NAMED_NODE(ob_obio, "/obio"); device_end(); #endif - ob_set_obio_ranges(slavio_high, slavio_base); + ob_set_obio_ranges(slavio_base); // Zilog Z8530 serial ports, see http://www.zilog.com // Must be before zs@0,0 or Linux won't boot Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/drivers/obio.h 2007-05-19 12:55:01 UTC (rev 149) @@ -1,32 +1,32 @@ /* Addresses, interrupt numbers, register sizes */ -#define SLAVIO_ZS 0x00000000 -#define SLAVIO_ZS1 0x00100000 +#define SLAVIO_ZS 0x00000000ULL +#define SLAVIO_ZS1 0x00100000ULL #define ZS_INTR 0x2c #define ZS_REGS 8 -#define SLAVIO_NVRAM 0x00200000 +#define SLAVIO_NVRAM 0x00200000ULL #define NVRAM_SIZE 0x2000 #define NVRAM_IDPROM 0x1fd8 -#define SLAVIO_FD 0x00400000 +#define SLAVIO_FD 0x00400000ULL #define FD_REGS 15 #define FD_INTR 0x2b -#define SLAVIO_SCONFIG 0x00800000 +#define SLAVIO_SCONFIG 0x00800000ULL #define SCONFIG_REGS 1 -#define SLAVIO_AUXIO 0x00900000 +#define SLAVIO_AUXIO 0x00900000ULL #define AUXIO_REGS 1 -#define SLAVIO_POWER 0x00910000 +#define SLAVIO_POWER 0x00910000ULL #define POWER_REGS 1 #define POWER_INTR 0x22 -#define SLAVIO_COUNTER 0x00d00000 +#define SLAVIO_COUNTER 0x00d00000ULL #define COUNTER_REGS 0x10 -#define SLAVIO_INTERRUPT 0x00e00000 +#define SLAVIO_INTERRUPT 0x00e00000ULL #define INTERRUPT_REGS 0x10 #define SLAVIO_SIZE 0x01000000 Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/drivers/sbus.c 2007-05-19 12:55:01 UTC (rev 149) @@ -21,21 +21,21 @@ #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 #define POWER_REGS 0x10 -#define POWER_OFFSET 0x0a000000 +#define POWER_OFFSET 0x0a000000ULL #define CS4231_REGS 0x40 -#define CS4231_OFFSET 0x0c000000 +#define CS4231_OFFSET 0x0c000000ULL static void -ob_sbus_node_init(unsigned long bus, unsigned long base) +ob_sbus_node_init(uint64_t base) { void *regs; push_str("/iommu/sbus"); fword("find-device"); - PUSH(bus); + PUSH(base >> 32); fword("encode-int"); - PUSH(base); + PUSH(base & 0xffffffff); fword("encode-int"); fword("encode+"); PUSH(SBUS_REGS); @@ -344,7 +344,7 @@ } static void -ob_macio_init(unsigned int slot, unsigned long base, unsigned long offset) +ob_macio_init(unsigned int slot, uint64_t base, unsigned long offset) { // All devices were integrated to NCR89C100, see // http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR89C100.t… @@ -366,7 +366,7 @@ } static void -sbus_probe_slot_ss5(unsigned int slot, unsigned long base) +sbus_probe_slot_ss5(unsigned int slot, uint64_t base) { // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { @@ -385,7 +385,7 @@ } static void -sbus_probe_slot_ss10(unsigned int slot, unsigned long base) +sbus_probe_slot_ss10(unsigned int slot, uint64_t base) { // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { @@ -425,99 +425,105 @@ { "close", ob_sbus_close }, }; -static const unsigned long sbus_offsets_ss5[SBUS_SLOTS][5] = { - { 0, 0, 0x0, 0x20000000, 0x10000000,}, - { 1, 0, 0x0, 0x30000000, 0x10000000,}, - { 2, 0, 0x0, 0x40000000, 0x10000000,}, - { 3, 0, 0x0, 0x50000000, 0x10000000,}, - { 4, 0, 0x0, 0x60000000, 0x10000000,}, - { 5, 0, 0x0, 0x70000000, 0x10000000,}, +struct sbus_offset { + int slot, type; + uint64_t base; + unsigned long size; }; -static const unsigned long sbus_offsets_ss10[SBUS_SLOTS][5] = { - { 0, 0, 0xe, 0x00000000, 0x10000000,}, - { 1, 0, 0xe, 0x10000000, 0x10000000,}, - { 2, 0, 0xe, 0x20000000, 0x10000000,}, - { 3, 0, 0xe, 0x30000000, 0x10000000,}, - [0xf] = { 0xf, 0, 0xe, 0xf0000000, 0x10000000,}, +static const struct sbus_offset sbus_offsets_ss5[SBUS_SLOTS] = { + { 0, 0, 0x20000000, 0x10000000,}, + { 1, 0, 0x30000000, 0x10000000,}, + { 2, 0, 0x40000000, 0x10000000,}, + { 3, 0, 0x50000000, 0x10000000,}, + { 4, 0, 0x60000000, 0x10000000,}, + { 5, 0, 0x70000000, 0x10000000,}, }; +static const struct sbus_offset sbus_offsets_ss10[SBUS_SLOTS] = { + { 0, 0, 0xe00000000ULL, 0x10000000,}, + { 1, 0, 0xe10000000ULL, 0x10000000,}, + { 2, 0, 0xe20000000ULL, 0x10000000,}, + { 3, 0, 0xe30000000ULL, 0x10000000,}, + [0xf] = { 0xf, 0, 0xef0000000ULL, 0x10000000,}, +}; + static void -ob_add_sbus_range(const unsigned long *range, int notfirst) +ob_add_sbus_range(const struct sbus_offset *range, int notfirst) { if (!notfirst) { push_str("/iommu/sbus"); fword("find-device"); } - PUSH(range[0]); + PUSH(range->slot); fword("encode-int"); if (notfirst) fword("encode+"); - PUSH(range[1]); + PUSH(range->type); fword("encode-int"); fword("encode+"); - PUSH(range[2]); + PUSH(range->base >> 32); fword("encode-int"); fword("encode+"); - PUSH(range[3]); + PUSH(range->base & 0xffffffff); fword("encode-int"); fword("encode+"); - PUSH(range[4]); + PUSH(range->size); fword("encode-int"); fword("encode+"); } static int -ob_sbus_init_ss5(unsigned long bus, unsigned long base) +ob_sbus_init_ss5(uint64_t base) { unsigned int slot; int notfirst = 0; for (slot = 0; slot < SBUS_SLOTS; slot++) { - if (sbus_offsets_ss5[slot][4] > 0) - ob_add_sbus_range(sbus_offsets_ss5[slot], notfirst++); + if (sbus_offsets_ss5[slot].size > 0) + ob_add_sbus_range(&sbus_offsets_ss5[slot], notfirst++); } push_str("ranges"); fword("property"); for (slot = 0; slot < SBUS_SLOTS; slot++) { - if (sbus_offsets_ss5[slot][4] > 0) - sbus_probe_slot_ss5(slot, sbus_offsets_ss5[slot][3]); + if (sbus_offsets_ss5[slot].size > 0) + sbus_probe_slot_ss5(slot, sbus_offsets_ss5[slot].base); } return 0; } static int -ob_sbus_init_ss10(unsigned long bus, unsigned long base) +ob_sbus_init_ss10(uint64_t base) { unsigned int slot; int notfirst = 0; for (slot = 0; slot < SBUS_SLOTS; slot++) { - if (sbus_offsets_ss10[slot][4] > 0) - ob_add_sbus_range(sbus_offsets_ss10[slot], notfirst++); + if (sbus_offsets_ss10[slot].size > 0) + ob_add_sbus_range(&sbus_offsets_ss10[slot], notfirst++); } push_str("ranges"); fword("property"); for (slot = 0; slot < SBUS_SLOTS; slot++) { - if (sbus_offsets_ss10[slot][4] > 0) - sbus_probe_slot_ss10(slot, sbus_offsets_ss10[slot][3]); + if (sbus_offsets_ss10[slot].size > 0) + sbus_probe_slot_ss10(slot, sbus_offsets_ss10[slot].base); } return 0; } -int ob_sbus_init(unsigned long bus, unsigned long base, int machine_id) +int ob_sbus_init(uint64_t base, int machine_id) { - ob_sbus_node_init(bus, base); + ob_sbus_node_init(base); switch (machine_id) { case 0x72: - return ob_sbus_init_ss10(bus, base); + return ob_sbus_init_ss10(base); case 0x80: - return ob_sbus_init_ss5(bus, base); + return ob_sbus_init_ss5(base); default: return -1; } Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/include/openbios/drivers.h 2007-05-19 12:55:01 UTC (rev 149) @@ -15,17 +15,16 @@ int ob_pci_init(void); #endif #ifdef CONFIG_DRIVER_SBUS -int ob_sbus_init(unsigned long bus, unsigned long base, int machine_id); +int ob_sbus_init(uint64_t base, int machine_id); #endif #ifdef CONFIG_DRIVER_IDE int ob_ide_init(void); #endif #ifdef CONFIG_DRIVER_ESP -int ob_esp_init(unsigned int slot, unsigned long base, unsigned long offset); +int ob_esp_init(unsigned int slot, uint64_t base, unsigned long offset); #endif #ifdef CONFIG_DRIVER_OBIO -int ob_obio_init(unsigned long slavio_high, unsigned long slavio_base, - unsigned long fd_offset, unsigned long counter_offset, - unsigned long intr_offset); +int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, + unsigned long counter_offset, unsigned long intr_offset); #endif Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2007-05-19 12:51:04 UTC (rev 148) +++ openbios-devel/include/sparc32/io.h 2007-05-19 12:55:01 UTC (rev 149) @@ -36,10 +36,10 @@ void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); void *mem_zalloc(struct mem *t, int size, int align); -int map_page(unsigned long va, unsigned long epa, int type); -void *map_io(unsigned pa, int size); -void ob_init_mmu(unsigned long bus, unsigned long base); -void init_mmu_swift(unsigned long base); +int map_page(unsigned long va, uint64_t epa, int type); +void *map_io(uint64_t pa, int size); +void ob_init_mmu(uint64_t base); +void init_mmu_swift(uint64_t base); void *dvma_alloc(int size, unsigned int *pphys); #ifndef BOOTSTRAP

1 0

r148 - openbios-devel/libc
by svn＠openbios.org 19 May '07

19 May '07

Author: blueswirl Date: 2007-05-19 14:51:04 +0200 (Sat, 19 May 2007) New Revision: 148 Modified: openbios-devel/libc/vsprintf.c Log: Update vsprintf.c from Linux to get 64-bit output Modified: openbios-devel/libc/vsprintf.c =================================================================== --- openbios-devel/libc/vsprintf.c 2007-05-17 19:16:06 UTC (rev 147) +++ openbios-devel/libc/vsprintf.c 2007-05-19 12:51:04 UTC (rev 148) @@ -5,7 +5,7 @@ /* * linux/lib/vsprintf.c * - * Copyright (C) 1991, 1992, Linus Torvalds + * Copyright (C) 1991, 1992 Linus Torvalds */ /* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ @@ -13,18 +13,20 @@ * Wirzenius wrote this portably, Torvalds fucked it up :-) */ +/* + * Fri Jul 13 2001 Crutcher Dunnavant <crutcher+kernel(a)datastacks.com> + * - changed to provide snprintf and vsnprintf functions + */ + #include "openbios/config.h" #include "libc/string.h" #include "libc/vsprintf.h" -/* we use this so that we can do without the ctype library */ -#define is_digit(c) ((c) >= '0' && (c) <= '9') - static int skip_atoi(const char **s) { int i=0; - while (is_digit(**s)) + while (isdigit(**s)) i = i*10 + *((*s)++) - '0'; return i; } @@ -39,21 +41,25 @@ #define do_div(n,base) ({ \ int __res; \ -__res = ((unsigned long) n) % (unsigned) base; \ -n = ((unsigned long) n) / (unsigned) base; \ +__res = ((unsigned long long) n) % (unsigned) base; \ +n = ((unsigned long long) n) / (unsigned) base; \ __res; }) static int mstrlen( const char *str ); -static char * number(char * str, long num, int base, int size, int precision - ,int type) +#ifndef PAGE_SIZE +#define PAGE_SIZE 4096 +#endif + +static char * number(char * buf, char * end, long long num, int base, int size, int precision, int type) { char c,sign,tmp[66]; - const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; + const char *digits; + static const char small_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static const char large_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; int i; - if (type & LARGE) - digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + digits = (type & LARGE) ? large_digits : small_digits; if (type & LEFT) type &= ~ZEROPAD; if (base < 2 || base > 36) @@ -82,52 +88,78 @@ i = 0; if (num == 0) tmp[i++]='0'; - else while (num != 0) { -#if 0 + else while (num != 0) tmp[i++] = digits[do_div(num,base)]; -#endif - int __res; - __res = ((unsigned long) num) % (unsigned) base; - num = ((unsigned long) num) / (unsigned) base; - tmp[i++] = digits[__res]; - } if (i > precision) precision = i; size -= precision; - if (!(type&(ZEROPAD+LEFT))) - while(size-->0) - *str++ = ' '; - if (sign) - *str++ = sign; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } if (type & SPECIAL) { - if (base==8) - *str++ = '0'; - else if (base==16) { - *str++ = '0'; - *str++ = digits[33]; + if (base==8) { + if (buf <= end) + *buf = '0'; + ++buf; + } else if (base==16) { + if (buf <= end) + *buf = '0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; } } - if (!(type & LEFT)) - while (size-- > 0) - *str++ = c; - while (i < precision--) - *str++ = '0'; - while (i-- > 0) - *str++ = tmp[i]; - while (size-- > 0) - *str++ = ' '; - return str; + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; } -/* Forward decl. to keep compiler happy. */ -//static int vsprintf(char *buf, const char *fmt, va_list args); - -int vsprintf(char *buf, const char *fmt, va_list args) +/** +* vsnprintf - Format a string and place it in a buffer +* @buf: The buffer to place the result into +* @size: The size of the buffer, including the trailing null space +* @fmt: The format string to use +* @args: Arguments for the format string +* +* Call this function if you are already dealing with a va_list. +* You probably want snprintf instead. + */ +int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) { int len; - unsigned long num; + unsigned long long num; int i, base; - char * str; + char *str, *end, c; const char *s; int flags; /* flags to number() */ @@ -136,13 +168,25 @@ int precision; /* min. # of digits for integers; max number of chars for from string */ int qualifier; /* 'h', 'l', or 'L' for integer fields */ + /* 'z' support added 23/7/1999 S.H. */ + /* 'z' changed to 'Z' --davidm 1/25/99 */ - for (str=buf ; *fmt ; ++fmt) { + str = buf; + end = buf + size - 1; + + if (end < buf - 1) { + end = ((void *) -1); + size = end - buf + 1; + } + + for (; *fmt ; ++fmt) { if (*fmt != '%') { - *str++ = *fmt; + if (str <= end) + *str = *fmt; + ++str; continue; } - + /* process flags */ flags = 0; repeat: @@ -153,11 +197,11 @@ case ' ': flags |= SPACE; goto repeat; case '#': flags |= SPECIAL; goto repeat; case '0': flags |= ZEROPAD; goto repeat; - } - + } + /* get field width */ field_width = -1; - if (is_digit(*fmt)) + if (isdigit(*fmt)) field_width = skip_atoi(&fmt); else if (*fmt == '*') { ++fmt; @@ -173,7 +217,7 @@ precision = -1; if (*fmt == '.') { ++fmt; - if (is_digit(*fmt)) + if (isdigit(*fmt)) precision = skip_atoi(&fmt); else if (*fmt == '*') { ++fmt; @@ -186,109 +230,202 @@ /* get the conversion qualifier */ qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') { + if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || + *fmt =='Z' || *fmt == 'z') { qualifier = *fmt; ++fmt; + if (qualifier == 'l' && *fmt == 'l') { + qualifier = 'L'; + ++fmt; + } } /* default base */ base = 10; switch (*fmt) { - case 'c': - if (!(flags & LEFT)) - while (--field_width > 0) - *str++ = ' '; - *str++ = (unsigned char) va_arg(args, int); - while (--field_width > 0) - *str++ = ' '; - continue; + case 'c': + if (!(flags & LEFT)) { + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + } + c = (unsigned char) va_arg(args, int); + if (str <= end) + *str = c; + ++str; + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + continue; - case 's': - s = va_arg(args, char *); - if (!s) - s = "<NULL>"; + case 's': + s = va_arg(args, char *); + if ((unsigned long)s < PAGE_SIZE) + s = "<NULL>"; #if 0 - len = strnlen(s, precision); + len = strnlen(s, precision); #else - len = mstrlen(s); - if( precision > len ) - len = precision; + len = mstrlen(s); + if( precision > len ) + len = precision; #endif + if (!(flags & LEFT)) { + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + } + for (i = 0; i < len; ++i) { + if (str <= end) + *str = *s; + ++str; ++s; + } + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + continue; - if (!(flags & LEFT)) - while (len < field_width--) - *str++ = ' '; - for (i = 0; i < len; ++i) - *str++ = *s++; - while (len < field_width--) - *str++ = ' '; - continue; + case 'p': + if (field_width == -1) { + field_width = 2*sizeof(void *); + flags |= ZEROPAD; + } + str = number(str, end, + (unsigned long) va_arg(args, void *), + 16, field_width, precision, flags); + continue; - case 'p': - if (field_width == -1) { - field_width = 2*sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, - (unsigned long) va_arg(args, void *), 16, - field_width, precision, flags); - continue; + case 'n': + /* FIXME: + * What does C99 say about the overflow case here? */ + if (qualifier == 'l') { + long * ip = va_arg(args, long *); + *ip = (str - buf); + } else if (qualifier == 'Z' || qualifier == 'z') { + size_t * ip = va_arg(args, size_t *); + *ip = (str - buf); + } else { + int * ip = va_arg(args, int *); + *ip = (str - buf); + } + continue; - case 'n': - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = (str - buf); - } else { - int * ip = va_arg(args, int *); - *ip = (str - buf); - } - continue; + case '%': + if (str <= end) + *str = '%'; + ++str; + continue; - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; + /* integer number formats - set up the flags and "break" */ + case 'o': + base = 8; + break; - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; + case 'X': + flags |= LARGE; + case 'x': + base = 16; + break; - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; + case 'd': + case 'i': + flags |= SIGN; + case 'u': + break; - default: - if (*fmt != '%') - *str++ = '%'; - if (*fmt) - *str++ = *fmt; - else - --fmt; - continue; + default: + if (str <= end) + *str = '%'; + ++str; + if (*fmt) { + if (str <= end) + *str = *fmt; + ++str; + } else { + --fmt; + } + continue; } - if (qualifier == 'l') + if (qualifier == 'L') + num = va_arg(args, long long); + else if (qualifier == 'l') { num = va_arg(args, unsigned long); - else if (qualifier == 'h') { + if (flags & SIGN) + num = (signed long) num; + } else if (qualifier == 'Z' || qualifier == 'z') { + num = va_arg(args, size_t); + } else if (qualifier == 'h') { num = (unsigned short) va_arg(args, int); if (flags & SIGN) - num = (short) num; - } else if (flags & SIGN) - num = va_arg(args, int); - else + num = (signed short) num; + } else { num = va_arg(args, unsigned int); - str = number(str, num, base, field_width, precision, flags); + if (flags & SIGN) + num = (signed int) num; + } + str = number(str, end, num, base, + field_width, precision, flags); } - *str = '\0'; + if (str <= end) + *str = '\0'; + else if (size > 0) + /* don't write out a null byte if the buf size is zero */ + *end = '\0'; + /* the trailing null byte doesn't count towards the total + * ++str; + */ return str-buf; } +/** + * snprintf - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @...: Arguments for the format string + */ +int snprintf(char * buf, size_t size, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=vsnprintf(buf,size,fmt,args); + va_end(args); + return i; +} + +/** + * vsprintf - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @fmt: The format string to use + * @args: Arguments for the format string + * + * Call this function if you are already dealing with a va_list. + * You probably want sprintf instead. + */ +int vsprintf(char *buf, const char *fmt, va_list args) +{ + return vsnprintf(buf, (~0U)>>1, fmt, args); +} + + +/** + * sprintf - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @fmt: The format string to use + * @...: Arguments for the format string + */ int sprintf(char * buf, const char *fmt, ...) { va_list args;

1 0

r402 - ofw/fs/jffs2
by svn＠openbios.org 19 May '07

19 May '07

Author: wmb Date: 2007-05-19 04:01:40 +0200 (Sat, 19 May 2007) New Revision: 402 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - Reduced the size of the memory dirents somewhat Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-19 00:46:30 UTC (rev 401) +++ ofw/fs/jffs2/jffs2.fth 2007-05-19 02:01:40 UTC (rev 402) @@ -80,18 +80,16 @@ \ 5 /l* constant /mem-inode \ Fields within in-memory directory entry data structure. -\ Based on struct jffs2_sum_dirent_flash, with the -\ "nodetype" and "totlen" fields replaced by the eblock #. +\ Based on struct jffs2_sum_dirent_flash, without the +\ "nodetype", "totlen", and "offset" fields. -: eblock@ ( adr -- eblock# ) 0 j@ ; -: offset@ ( adr -- offset ) 1 j@ ; -: pino@ ( adr -- parent ) 2 j@ ; -: version@ ( adr -- version ) 3 j@ ; -: dirino@ ( adr -- inode ) 4 j@ ; -: ftype@ ( adr -- type ) d# 21 + c@ ; +: pino@ ( adr -- parent ) 0 j@ ; +: version@ ( adr -- version ) 1 j@ ; \ $find-name and insert-dirent +: dirino@ ( adr -- inode ) 2 j@ ; +: ftype@ ( adr -- type ) d# 13 + c@ ; : fname$ ( node-adr -- adr len ) - dup d# 22 + ( node-adr name-adr ) - swap d# 20 + c@ ( name-adr name-len ) + dup d# 14 + ( node-adr name-adr ) + swap d# 12 + c@ ( name-adr name-len ) ; \ Access fields in per-file raw inode structure - based on @@ -454,18 +452,16 @@ \ Summary dirent: w.nodetype l.totlen l.offset l.pino l.version \ l.ino c.nsize c.type name : scan-sum-dirent ( adr -- len ) - the-eblock# next-dirent l! ( adr ) - - 6 + ( offset-adr ) - next-dirent la1+ ( offset-adr dst-adr ) - over d# 16 + c@ d# 18 + ( src dst len ) + d# 10 + ( offset-adr ) + next-dirent ( offset-adr dst-adr ) + over d# 12 + c@ d# 14 + ( src dst len ) dup >r ( src dst len r: len ) move ( ) - r@ la1+ 'next-dirent +! ( offset-adr ) + r@ 'next-dirent +! ( offset-adr ) - \ 6 is the length of the fields that were skipped, not copied - r> 6 + ( len ) + \ 10 is the length of the fields that were skipped, not copied + r> d# 10 + ( len ) ; [ifdef] notdef @@ -560,8 +556,6 @@ \ XXX 2dup next-dirent swap move ( adr len ) \ next-dirent - the-eblock# l+! - over block-buf - l+! over rdpino@ l+! over rdversion@ l+! over rdinode@ l+! ( adr iadr' ) @@ -569,7 +563,7 @@ over rdtype@ c+! ( adr iadr' ) over >rdname swap ( adr str-adr iadr ) 2 pick rdnsize@ move ( adr ) - dup rdnsize@ d# 22 + ( adr dirent-len ) + dup rdnsize@ d# 14 + ( adr dirent-len ) 'next-dirent +! ( adr ) ; @@ -930,7 +924,7 @@ dup fname$ space space type space .ftype ; -: +dirent ( adr -- adr' ) 5 la+ dup c@ + 2+ ; +: +dirent ( adr -- adr' ) 3 la+ dup c@ + 2+ ; : #dirents ( -- n ) 0 @@ -942,8 +936,6 @@ char \ instance value delimiter create root-dirent - 0 , \ block# - 0 , \ offset 0 , \ pino 0 , \ version 1 , \ ino

1 0

r401 - ofw/fs/jffs2
by svn＠openbios.org 19 May '07

19 May '07

Author: wmb Date: 2007-05-19 02:46:30 +0200 (Sat, 19 May 2007) New Revision: 401 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - Got another 2x on well-behaved images with an intermediate encoding. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-18 23:49:47 UTC (rev 400) +++ ofw/fs/jffs2/jffs2.fth 2007-05-19 00:46:30 UTC (rev 401) @@ -271,8 +271,23 @@ then then - di bx mov \ Save DI in bx; we are through with the delta value - 0 [dx] di mov \ Get pointer in di + 2 # bx shr \ Throw away unused 0 bits in delta + h# 10000 # ax mov + ax bx cmp < if \ delta fits in 16 bits? + 0 [sp] ax cmp > if \ inum fits in 16 bits? + 4 [sp] ax cmp > if \ version fits in 16 bits? + 0 [dx] di xchg \ Get pointer in di + al inc al stosb \ encode a 1 byte to indicate the long form + ax pop op: ax stos ax 0 [cx] mov \ Encode the inum as 16 bits + ax pop op: ax stos ax 4 [cx] mov \ Encode the version as 16 bits + bx ax mov op: ax stos \ Encode the version as 16 bits + 0 [dx] di xchg \ Update next-inode pointer in di + next + then + then + then + + 0 [dx] di xchg \ Get pointer in di ax ax xor al stosb \ encode a 0 byte to indicate the long form @@ -287,8 +302,7 @@ 8 [cx] ax mov \ offset (from already-updated curoffs) ax stos \ encode it - di 0 [dx] mov \ Update next-inode - bx di mov \ Restore DI + 0 [dx] di xchg \ Update next-inode c; code amatch-inode ( inum adr endadr 'curinum -- inum false | inum adr' offset version true ) @@ -300,9 +314,17 @@ ax ax xor al lodsb \ ax: byte h# 20 # al cmp u< if - ax lods ax 0 [dx] mov - ax lods ax 4 [dx] mov - ax lods ax 8 [dx] mov + al al or 0= if + \ Long form: 0, inum.32, version.32, offset.32 + ax lods ax 0 [dx] mov + ax lods ax 4 [dx] mov + ax lods ax 8 [dx] mov + else + \ Short form: 0, inum.16, version.16, delta_offset.16 + op: ax lods ax 0 [dx] mov + op: ax lods ax 4 [dx] mov + op: ax lods 2 # ax shl ax 8 [dx] add + then else 1 # al test 0<> if 0 [dx] inc @@ -358,8 +380,10 @@ curinum ! curvers ! ( ) + \ XXX implement short form: 1.byte, inum.16, version.16, delta.16 + \ If we can't use a short form, use the long form: - \ 0.byte, inum.long, version.long, offset.long + \ 0.byte, inum.32, version.32, offset.32 \ At some point we might want to have another form with .short fields

1 0

r400 - ofw/fs/jffs2
by svn＠openbios.org 19 May '07

19 May '07

Author: wmb Date: 2007-05-19 01:49:47 +0200 (Sat, 19 May 2007) New Revision: 400 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - checkpoint of new low-RAM-use version - reduces node map RAM usage by a factor of 8 or more in pathological cases. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-18 02:48:44 UTC (rev 399) +++ ofw/fs/jffs2/jffs2.fth 2007-05-18 23:49:47 UTC (rev 400) @@ -7,7 +7,7 @@ 0 instance value block-buf \ Start address of working buffer 0 instance value eb-end \ End address of working buffer -\ 0 value cleanmark? +0 value cleanmark? \ Magic numbers to identify JFFS2 nodes h# 1985 constant jffs2-magic @@ -24,13 +24,17 @@ 0 ( instance ) value alloc-len \ (Computed) size of inode and dirent buffers 0 ( instance ) value inodes \ Buffer for in-memory inodes -0 ( instance ) value next-inode \ Pointer into inode buffer +variable 'next-inode \ Pointer into inode buffer +: next-inode ( -- val ) 'next-inode @ ; 0 ( instance ) value dirents \ Buffer for dirent nodes -0 ( instance ) value next-dirent \ Pointer into dirent buffer +variable 'next-dirent \ Pointer into dirent buffer +: next-dirent ( -- val ) 'next-dirent @ ; -0 ( instance ) value minodes \ Buffer for per-file inode list -0 ( instance ) value next-minode \ Pointer into per-file inode list +\ 0 ( instance ) value minodes \ Buffer for per-file inode list +variable 'next-minode \ Pointer into per-file inode list +: next-minode 'next-minode @ ; +: minodes next-inode ; \ Start the inode pointer list after the inodes 0 instance value file-buf \ Buffer for constructing file 0 instance value file-size \ Actual size of file @@ -42,6 +46,9 @@ 0 ( instance ) value pages/eblock \ pages per erase block 0 ( instance ) value pages/chip \ total number of pages +0 instance value the-page# +0 instance value the-eblock# + \ In-memory inode structure \ Access a field within a JFFS2 FLASH data structure @@ -57,11 +64,18 @@ \ Storing it in this form saves space and time, because we only have \ to read the full inodes for the few files that we actually access. -: meblock@ ( adr -- eblock# ) 0 j@ ; -: minum@ ( adr -- inode# ) 1 j@ ; -: mversion@ ( adr -- version ) 2 j@ ; -: moffset@ ( adr -- offset ) 3 j@ ; -4 /l* constant /mem-inode +instance variable splices 0 splices ! + +: pack-offset ( offset block -- n ) the-eblock# /eblock * + ; + +: minum@ ( adr -- inode# ) 0 j@ ; +: mversion@ ( adr -- version ) 1 j@ ; +: moffset@ ( adr -- block+offset ) 2 j@ ; +\ : moffset/block@ ( adr -- offset block ) moffset@ /eblock /mod ; +\ : meblock@ ( adr -- eblock# ) 0 j@ ; +\ : moffset@ ( adr -- offset ) 3 j@ ; +\ 4 /l* constant /mem-inode +3 /l* constant /mem-inode \ : mtotlen@ ( adr -- offset ) 4 j@ ; \ 5 /l* constant /mem-inode @@ -126,7 +140,7 @@ : allocate-buffers ( -- ) /eblock dma-alloc to block-buf /page d# 1024 max /eblock min to /empty-scan - max-inodes /n* dma-alloc to minodes \ Arbitrary limit on inodes per file +\ max-inodes /n* dma-alloc to minodes \ Arbitrary limit on inodes per file first-time? if jffs2-dirent-base to dirents @@ -142,7 +156,7 @@ \ inodes alloc-len dma-free \ dirents alloc-len dma-free - minodes max-inodes /n* dma-free +\ minodes max-inodes /n* dma-free block-buf /eblock dma-free @@ -212,22 +226,204 @@ drop false ; +3 /n* instance buffer: curinum \ cur-inum, cur-vers, cur-offset +: curvers curinum na1+ ; +: curoffs curinum 2 na+ ; + +\ 0 instance variable cur-inum +\ 0 instance variable cur-vers +\ 0 instance variable cur-offset + +: init-curvars ( -- ) curinum 3 /n* erase ; + +1 [if] +code aencode-inode ( version inum offset 'curinum 'next-inode -- ) + dx pop \ dx: 'next-inode + cx pop \ cx: 'curinum + bx pop \ bx: offset + \ 0 [sp]: inum 4 [sp]: version + \ 0 [cx]: curinum 4 [cx]: curvers 8 [cx]: curoffs + 8 [cx] ax mov \ ax: Old curoffs + bx 8 [cx] mov \ Update curoffs + ax bx sub \ Delta + + h# 200 # bx cmp < if + \ All 1-byte forms require offset < 200 + + 4 [sp] ax mov ax dec 4 [cx] ax cmp = if \ version == curvers+1 ? + 0 [sp] ax mov 0 [cx] ax cmp = if \ inum == curinum ? + 1 # bx shr \ Shift delta to remove low 0 bit + 0 [dx] ax mov bl 0 [ax] mov 0 [dx] inc \ Store encoded byte at next-inode++ + 4 [cx] inc \ Update curvers + ax pop ax pop \ Remove inum and version from stack + next + then + then + + 1 # 4 [sp] cmp = if \ version == 1 ? + 0 [sp] ax mov ax dec 0 [cx] ax cmp = if \ inum == curinum+1 ? + 1 # bx shr bx inc \ Shift delta and add in the next-inum bit + 0 [dx] ax mov bl 0 [ax] mov 0 [dx] inc \ Store encoded byte at next-inode++ + 0 [cx] inc 1 # 4 [cx] mov \ Update inum and set curvers to p + ax pop ax pop \ Remove inum and version from stack + next + then + then + then + + di bx mov \ Save DI in bx; we are through with the delta value + 0 [dx] di mov \ Get pointer in di + ax ax xor + al stosb \ encode a 0 byte to indicate the long form + + ax pop \ inum + ax stos \ encode it + ax 0 [cx] mov \ Update curinum + + ax pop \ version + ax stos \ encode it + ax 4 [cx] mov \ Update curvers + + 8 [cx] ax mov \ offset (from already-updated curoffs) + ax stos \ encode it + + di 0 [dx] mov \ Update next-inode + bx di mov \ Restore DI +c; + +code amatch-inode ( inum adr endadr 'curinum -- inum false | inum adr' offset version true ) + dx pop cx pop ax pop 0 [sp] bx mov \ dx: 'curinum cx: endadr ax: adr bx: inum + si push + ax si mov \ si: adr + + begin cx si cmp u< while + ax ax xor + al lodsb \ ax: byte + h# 20 # al cmp u< if + ax lods ax 0 [dx] mov + ax lods ax 4 [dx] mov + ax lods ax 8 [dx] mov + else + 1 # al test 0<> if + 0 [dx] inc + 1 # 4 [dx] mov + h# fe # al and + else + 4 [dx] inc + then + ax ax add + ax 8 [dx] add + then + bx 0 [dx] cmp = if + si ax mov si pop ax push 8 [dx] push 4 [dx] push -1 # push next + then + repeat + si pop 0 # push +c; + +[else] + +: short-encode ( version inum lowbit offset -- ) + 2/ or next-inode c! 1 'next-inode +! ( inum version ) + curinum ! curvers ! ( ) +; + +: encode-inode ( version inum offset -- ) + curoffs ( version inum offset &curoffset ) + 2dup @ - >r ( version inum offset &curoffset r: delta ) + ! ( version inum r: delta ) + r@ h# 200 < if ( version inum r: delta ) + \ All 1-byte forms require offset < 200 + + \ 1-byte form 0: nnnnnnn0: inum = cur-inum, vers = cur-vers + 1 + \ This is the next data node in a sequence from one file + + dup curinum @ = if ( version inum ) + over 1- curvers @ = if ( version inum ) + 0 r> short-encode exit + then ( version inum ) + then ( version inum ) + + \ 1-byte form 1: nnnnnnn1: inum = cur-inum + 1, vers = 1 + \ This is the beginning of a new file + \ With: 4,350,592 Without: 4,476,904 + + dup 1- curinum @ = if ( version inum ) + over 1 = if ( version inum ) + 1 r> short-encode exit + then ( version inum ) + then ( version inum ) + then ( version inum r: delta ) + r> drop ( version inum ) + + curinum ! curvers ! ( ) + + \ If we can't use a short form, use the long form: + \ 0.byte, inum.long, version.long, offset.long + + \ At some point we might want to have another form with .short fields + + next-inode + 0 over c! 1+ ( adr' ) + curinum @ over ! na1+ ( adr' ) + curvers @ over ! na1+ ( adr' ) + curoffs @ over ! na1+ ( adr' ) + 'next-inode ! ( ) +; + +: decode-inode ( adr -- len ) + dup c@ h# 20 < if ( adr ) + 1+ + dup @ curinum ! na1+ ( adr' ) \ Inum + dup @ curvers ! na1+ ( adr' ) \ Version + @ curoffs ! ( ) \ Offset + d# 13 ( len ) + else ( adr ) + c@ dup 1 and if ( byte ) + 1 curinum +! ( byte ) \ Inum + 1 curvers ! ( byte ) \ Version + 1 invert and ( byte' ) + else ( byte ) + 1 curvers +! ( byte ) \ Version + then ( byte ) + 2* curoffs +! ( ) \ Offset + 1 ( len ) + then ( len ) +; + +: match-inode ( inum mem-inode -- inum false | inum mem-inode' offset version true ) + next-inode swap ?do ( inum ) + i decode-inode ( inum len ) + over curinum @ = if ( inum len ) \ Inum + i + curoffs @ curvers @ ( inum mem-inode' offset version ) + true unloop exit + then ( inum len ) + +loop ( inum ) + false +; +[then] + \ Tools for copying into memory : c+! ( adr c -- adr' ) over c! ca1+ ; : l+! ( adr l -- adr' ) over l! la1+ ; -0 instance value the-page# -0 instance value the-eblock# +: store-inode ( inum version offset -- ) + -rot swap next-inode ( offset version inum adr ) + tuck l! la1+ ( offset version adr' ) + tuck l! la1+ ( offset adr' ) + tuck l! la1+ ( adr' ) + 'next-inode ! +; \ Copy summary inode from FLASH to memory \ Summary inode: w.nodetype l.inode l.version l.offset l.totlen : scan-sum-inode ( adr -- len ) wa1+ \ Skip the nodetype so we can use j@ - next-inode ( adr iadr ) - the-eblock# l+! ( adr iadr' ) \ eblock@ - 2dup 3 /l* move ( adr iadr ) - 3 la+ to next-inode ( adr ) - drop d# 18 + >r r@ 1 j@ r@ 0 j@ r> 2 j@ pack-offset ( version inum offset ) +\ store-inode +\ encode-inode + curinum 'next-inode aencode-inode + d# 18 ( len ) ; \ Copy summary dirent from FLASH to memory @@ -242,7 +438,7 @@ dup >r ( src dst len r: len ) move ( ) - r@ la1+ next-dirent + to next-dirent ( offset-adr ) + r@ la1+ 'next-dirent +! ( offset-adr ) \ 6 is the length of the fields that were skipped, not copied r> 6 + ( len ) @@ -351,21 +547,18 @@ 2 pick rdnsize@ move ( adr ) dup rdnsize@ d# 22 + ( adr dirent-len ) - next-dirent + to next-dirent ( adr ) + 'next-dirent +! ( adr ) ; \ Copy the raw inode information to memory in summary inode form \ We do this to save space, because we will only need the full \ information for those few inodes that correspond to the files \ we actually access. -: scan-raw-inode ( adr -- adr ) - next-inode ( adr iadr ) - the-eblock# l+! ( adr dadr' ) \ eblock - over riinode@ l+! ( adr dadr' ) \ ino - over riversion@ l+! ( adr dadr' ) \ version - over block-buf - l+! ( adr dadr' ) \ offset -\ over riisize@ l+! ( adr dadr' ) \ node length - to next-inode +: scan-raw-inode ( adr -- ) + >r r@ riversion@ r@ riinode@ r> block-buf - pack-offset ( version inum offset ) +\ store-inode +\ encode-inode + curinum 'next-inode aencode-inode \ false to cleanmark? ; : scan-node ( adr -- adr' ) @@ -382,7 +575,7 @@ inode-type of ( adr ) debug-scan? if ." i" then - scan-raw-inode ( adr ) + dup scan-raw-inode ( adr ) endof ( adr nodetype ) padding-type of ( adr ) @@ -417,8 +610,9 @@ : scan-occupied ( -- ) first-time? 0= if exit then - dirents to next-dirent - inodes to next-inode + init-curvars + dirents 'next-dirent ! + inodes 'next-inode ! pages/chip 0 do i page>eblock to the-eblock# i no-summary? if @@ -501,16 +695,6 @@ ; [then] -: place-node ( node where -- ) - ! - next-minode na1+ to next-minode ( ) -; - -: get-inode ( mem-inode -- adr ) - dup meblock@ read-eblock - moffset@ block-buf + ( inode-adr ) -; - : inode-good? ( inode -- flag ) dup d# 15 /l* crc ( riadr node-crc ) over rincrc@ <> if ( riadr ) @@ -519,95 +703,102 @@ dup >ridata over ricsize@ ( riadr data-adr data-len ) crc swap ridcrc@ = ; -: minode-good? ( minode -- flag ) get-inode inode-good? ; +: get-inode ( offset -- adr ) /eblock /mod read-eblock block-buf + ; + \ This is a brute-force, no tricks, insertion sort. \ Insertion sort is bad for large numbers of elements, but in this \ application, the number of elements is not all that large. The time \ is dominated by the need to scan all the nodes. collect-nodes takes \ about 160 ms for a tiny file (4 nodes), about 200 ms for a very large \ one (573 nodes). -: insert-sort ( node -- ) - dup mversion@ ( node version ) - next-minode minodes ?do ( node version ) - dup i @ mversion@ = if ( node version ) +: insert-node ( offset version adr -- ) + \ XXX check for list overflow here + >r + r@ r@ 2 na+ next-minode r@ - move ( offset version r: adr ) + r> 2! + 2 /n* 'next-minode +! ( ) +; + +: insert-sort ( offset version -- ) + \ If the list is empty, insert at the beginning + next-minode minodes = if ( offset version ) + minodes insert-node ( ) + exit + then + + \ Run the loop backwards because versions are more likely to increase + minodes next-minode 8 - do ( offset version ) + dup i @ > if ( offset version ) + \ Slide everything above up to open a slot + i 2 na+ insert-node ( ) + unloop exit + then ( offset version ) + + dup i @ = if ( offset version ) \ If we have a collision, we check the CRC of the new node, \ and if it is valid, replace the existing one. We will \ end up with only the last good one in the slot. - drop ( node ) - dup minode-good? if ( node ) - i ! ( ) - else ( node ) - drop ( ) - then ( ) + drop ( offset ) + dup get-inode inode-good? if ( offset ) + i na1+ ! ( ) + else ( offset ) + drop ( ) + then ( ) unloop exit then - ( node version ) - dup i @ mversion@ < if ( node version ) - \ Slide everything above up to open a slot - i i na1+ next-minode i - move ( node version ) - drop i place-node ( node version ) - unloop exit - then ( node version ) - /n +loop ( node version ) - drop next-minode place-node ( ) + ( offset version ) + -8 +loop ( offset version ) + + \ If we get here, the new node goes at the beginning of the list + minodes insert-node ( ) ; + +\ Also used by insert-dirent +: place-node ( node where -- ) + ! + /n 'next-minode +! ( ) +; + \ This is used for symlinks and directory inodes where there \ can only be one of them. --1 value max-version \ Local variable for find-node and $find-name --1 value the-inode \ Local variable for find-node -: latest-node ( inum -- true | minode false ) +-1 value max-version \ Local variable for latest-node and $find-name +\ -1 value the-inode \ Local variable for latest-node +-1 value the-offset \ Local variable for latest-node +: latest-node ( inum -- true | offset false ) + init-curvars -1 to max-version - \ Quick hack to shorten the inner loop - start at the minum field - \ Reduces the time for a typical run from 260 ms down to 160 ms - next-inode inodes la1+ ?do ( inum ) - dup i @ = if ( inum ) - i /l - minode-good? if ( inum ) - i /l - mversion@ ( inum version ) - dup max-version > if ( inum version ) - to max-version ( inum ) - i /l - to the-inode ( inum ) - else ( inum version ) - drop ( inum ) - then ( inum ) - then ( inum ) - then ( inum ) - /mem-inode +loop ( inum ) + inodes begin next-inode curinum amatch-inode while ( inum inode' offset version ) +\ inodes begin match-inode while ( inum inode' offset version ) + over get-inode inode-good? if ( inum inode' offset version ) + dup max-version > if ( inum inode' offset version ) + to max-version ( inum inode' offset ) + to the-offset ( inum inode' ) + else ( inum inode' ) + 2drop ( inum inode' ) + then ( inum inode' ) + else ( inum inode' offset version ) + 2drop ( inum inode' ) + then ( inum inode' ) + repeat ( inum ) drop max-version -1 = if true exit then - the-inode false + the-offset false ; -\ This could be optimized out the wazoo, but in this application, -\ it just doesn't matter. We only need to load one or two files. : collect-nodes ( inum -- any? ) - minodes to next-minode \ Empty the list + init-curvars + minodes 'next-minode ! \ Empty the list - \ Quick hack to shorten the inner loop - start at the minum field - \ Reduces the time for a typical run from 260 ms down to 160 ms - next-inode inodes la1+ ?do ( inum ) - dup i @ = if i /l - insert-sort then ( inum ) - /mem-inode +loop ( inum ) - drop + inodes begin next-inode curinum amatch-inode while ( inum inode' offset version ) +\ inodes begin match-inode while ( inum inode' offset version ) + insert-sort ( inum inode' ) + repeat ( inum ) + drop ( ) next-minode minodes <> ; -0 [if] -\ Excessive optimization - this knocks another 70 msecs off the time -\ The next step would be to have a word that scans to find the next one. -code dupi@= ( n -- n flag ) - 0 [sp] cx mov \ N in ax - 0 [bp] bx mov - 4 [bp] bx add \ i in bx - 0 [bx] bx mov \ i @ in bx - ax ax xor - bx cx cmp \ flag - 0= if ax dec then - ax push -c; -[then] - : set-length ( final-size write-extent -- ) 2dup > if \ The final size extends past this segment @@ -675,11 +866,7 @@ ." comp " ricompr@ 3 u.r cr ; -: play-inode ( mem-inode -- ) - debug-scan? if - dup meblock@ 4 u.r dup moffset@ 6 u.r space - then - get-inode ( inode ) +: (play-inode) ( inode -- ) dup inode-good? 0= if ( inode ) debug-scan? if ." Skipping bad inode." cr then drop exit @@ -705,7 +892,7 @@ -1 to the-eblock# -1 to have-eblock# 0 to file-size - next-minode minodes ?do i @ play-inode /n +loop + next-minode minodes ?do i na1+ @ get-inode (play-inode) 8 +loop release-inflater ; @@ -788,18 +975,14 @@ d# 1024 constant /symlink \ Max length of a symbolic link \ The input dirent is for a symlink. Resolve it to a new dirent -: minode>rinode ( minode -- rinode ) - dup meblock@ read-eblock ( minode ) - moffset@ block-buf + ( rinode ) -; : dir-link ( dirent -- true | dirent' false ) delimiter >r [char] / to delimiter /symlink alloc-mem >r - dirino@ latest-node if ( ) + dirino@ latest-node if ( ) true - else ( minode ) - minode>rinode ( rinode ) + else ( offset ) + get-inode ( rinode ) dup >ridata swap ridsize@ ( adr len ) tuck r@ swap move ( len ) r@ swap pwd $resolve-path ( true | dirent false ) @@ -844,7 +1027,7 @@ ; : advance-dirent ( dirent -- false | dirent' true ) - pwd dirino@ swap ( parent-inode dirent ) + pwd dirino@ swap ( parent-inode dirent ) begin dup next-dirent u< while ( par dirent ) 2dup pino@ = if ( par dirent ) nip true exit @@ -877,7 +1060,7 @@ na1+ ( minode' ) else ( minode ) \ Deleted, remove from list - next-minode -1 na+ to next-minode ( minode ) + -1 /n* 'next-minode +! ( minode ) dup na1+ over ( minode src dst ) next-minode over - move ( minode ) then ( minode' ) @@ -885,7 +1068,7 @@ drop ( ) ; : prep-dirents ( -- ) - minodes to next-minode \ Empty the list + minodes 'next-minode ! \ Empty the list dirents begin advance-dirent while dup insert-dirent @@ -894,25 +1077,6 @@ remove-unlinks ; -0 [if] -struct jffs2_raw_dirent -{ -0 jint16_t magic; -0+w jint16_t nodetype; /* == JFFS2_NODETYPE_DIRENT */ -1 jint32_t totlen; -2 jint32_t hdr_crc; -3 jint32_t pino; -4 jint32_t version; -5 jint32_t ino; /* == zero for unlink */ -6 jint32_t mctime; -7 uint8_t nsize; -7+b uint8_t type; -7+w uint8_t unused[2]; -8 jint32_t node_crc; -9 jint32_t name_crc; -10 uint8_t name[0]; -[then] - \ For now, just 0 the modify time, since we only support deleting : now-seconds ( -- secs ) 0 ; @@ -1091,8 +1255,8 @@ 0 0 0 0 0 0 ( id' s m h d m y r: dirent ) 0 ( ... len r: dirent ) 0 ( ... attributes r: dirent ) - else ( id' minode r: dirent ) - minode>rinode >r ( id' r: dirent rinode ) + else ( id' offset r: dirent ) + get-inode >r ( id' r: dirent rinode ) r@ rimtime@ sec>time&date ( id' s m h d m y r: dirent rinode ) r@ riisize@ ( id' s m h d m y len r: dirent rinode ) r> rimode@ ( id' s m h d m y len mode r: dirent ) @@ -1133,8 +1297,7 @@ : .inode ( adr ) dup minum@ 8 u.r \ Inode dup mversion@ 8 u.r \ Version - dup meblock@ 7 u.r \ Eblock# - dup moffset@ 6 u.r \ Offset on eblock + dup moffset@ /eblock /mod 7 u.r 6 u.r \ Eblock#, offset on eblock \ dup mtotlen@ 8 u.r \ Total length mcr /mem-inode + @@ -1183,19 +1346,6 @@ -0 [if] -// Values of type field (byte at offset h# 1d) in directory entry -#define DT_UNKNOWN 0 -#define DT_FIFO 1 -#define DT_CHR 2 -#define DT_DIR 4 -#define DT_BLK 6 -#define DT_REG 8 -#define DT_LNK 10 -#define DT_SOCK 12 -#define DT_WHT 14 -[then] - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r399 - cpu/x86/pc/olpc/sdtools
by svn＠openbios.org 18 May '07

18 May '07

Author: wmb Date: 2007-05-18 04:48:44 +0200 (Fri, 18 May 2007) New Revision: 399 Modified: cpu/x86/pc/olpc/sdtools/maketar Log: Linux-based register access toolkit - added some more cleanup to maketar. Modified: cpu/x86/pc/olpc/sdtools/maketar =================================================================== --- cpu/x86/pc/olpc/sdtools/maketar 2007-05-18 02:39:03 UTC (rev 398) +++ cpu/x86/pc/olpc/sdtools/maketar 2007-05-18 02:48:44 UTC (rev 399) @@ -6,4 +6,4 @@ cp ../../../../../cpu/x86/pc/olpc/mfgdata.fth . cp ../../../../../dev/olpc/dcon/dconsmb.fth . tar cfz sdkit.tgz forth builder.dic sd.fth ioports.fth dconsmb.fth mfgdata.fth dumpgamma.fth sd -rm -f builder.dic forth ioports.fth +rm -f builder.dic forth ioports.fth mfgdata.fth dconsmb.fth

1 0

r398 - cpu/x86/pc/olpc/sdtools
by svn＠openbios.org 18 May '07

18 May '07

Author: wmb Date: 2007-05-18 04:39:03 +0200 (Fri, 18 May 2007) New Revision: 398 Modified: cpu/x86/pc/olpc/sdtools/dumpgamma.fth cpu/x86/pc/olpc/sdtools/maketar cpu/x86/pc/olpc/sdtools/sd.fth Log: Linux-based register access toolkit - access display registers. Modified: cpu/x86/pc/olpc/sdtools/dumpgamma.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/dumpgamma.fth 2007-05-18 02:37:54 UTC (rev 397) +++ cpu/x86/pc/olpc/sdtools/dumpgamma.fth 2007-05-18 02:39:03 UTC (rev 398) @@ -23,6 +23,21 @@ cr exit? if leave then h# 8 +loop ; + +fe00.4000 4000 mmap constant dc-base + +: dc@ ( reg -- l ) dc-base + l@ ; +: dc! ( l reg -- ) dc-base + l! ; + +fe00.0000 4000 mmap constant gp-base + +: gp@ ( reg -- l ) gp-base + l@ ; +: gp! ( l reg -- ) gp-base + l! ; + + + + + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/olpc/sdtools/maketar =================================================================== --- cpu/x86/pc/olpc/sdtools/maketar 2007-05-18 02:37:54 UTC (rev 397) +++ cpu/x86/pc/olpc/sdtools/maketar 2007-05-18 02:39:03 UTC (rev 398) @@ -5,5 +5,5 @@ cp ../../../../../cpu/x86/ioports.fth . cp ../../../../../cpu/x86/pc/olpc/mfgdata.fth . cp ../../../../../dev/olpc/dcon/dconsmb.fth . -tar cfz sdkit.tgz forth builder.dic sd.fth ioports.fth dconsmb.fth mfgdata.fth sd +tar cfz sdkit.tgz forth builder.dic sd.fth ioports.fth dconsmb.fth mfgdata.fth dumpgamma.fth sd rm -f builder.dic forth ioports.fth Modified: cpu/x86/pc/olpc/sdtools/sd.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/sd.fth 2007-05-18 02:37:54 UTC (rev 397) +++ cpu/x86/pc/olpc/sdtools/sd.fth 2007-05-18 02:39:03 UTC (rev 398) @@ -58,6 +58,7 @@ : scanint! ( si -- ) 9 dcon! ; \ def: h# 0000 : bright! ( level -- ) d# 10 dcon! ; \ def: h# xxxF +\needs vp@ fload dumpgamma.fth \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

r397 - cpu/x86/pc/olpc/images
by svn＠openbios.org 18 May '07

18 May '07

Author: wmb Date: 2007-05-18 04:37:54 +0200 (Fri, 18 May 2007) New Revision: 397 Added: cpu/x86/pc/olpc/images/cd.565 cpu/x86/pc/olpc/images/cd.bmp cpu/x86/pc/olpc/images/ethernet.565 cpu/x86/pc/olpc/images/ethernet.bmp cpu/x86/pc/olpc/images/harddrive.565 cpu/x86/pc/olpc/images/harddrive.bmp cpu/x86/pc/olpc/images/sd.565 cpu/x86/pc/olpc/images/sd.bmp Log: Added some more boot-progress icons. Added: cpu/x86/pc/olpc/images/cd.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/cd.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/cd.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/cd.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/ethernet.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/ethernet.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/ethernet.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/ethernet.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/harddrive.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/harddrive.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/harddrive.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/harddrive.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/sd.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/sd.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/sd.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/sd.bmp ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

r396 - cpu/x86/pc/olpc cpu/x86/pc/olpc/images dev/mmc/sdhci dev/usb2/device/storage
by svn＠openbios.org 18 May '07

18 May '07

Author: wmb Date: 2007-05-18 04:33:58 +0200 (Fri, 18 May 2007) New Revision: 396 Modified: cpu/x86/pc/olpc/gui.fth cpu/x86/pc/olpc/images/laptop.565 cpu/x86/pc/olpc/images/laptop.bmp cpu/x86/pc/olpc/images/usbkey.565 cpu/x86/pc/olpc/images/usbkey.bmp cpu/x86/pc/olpc/images/wireless.565 cpu/x86/pc/olpc/images/wireless.bmp cpu/x86/pc/olpc/images/xo.565 cpu/x86/pc/olpc/images/xo.bmp cpu/x86/pc/olpc/loaddropins.fth dev/mmc/sdhci/sdmmc.fth dev/usb2/device/storage/scsidisk.fth Log: Lovely new boot-progress icons. Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2007-05-17 03:58:44 UTC (rev 395) +++ cpu/x86/pc/olpc/gui.fth 2007-05-18 02:33:58 UTC (rev 396) @@ -347,19 +347,31 @@ h# 32 buffer: icon-name +: show-icon-file ( basename$ -- ) + " rom:" icon-name pack $cat ( ) + " .565" icon-name $cat ( ) + icon-name count $show&advance ( ) +; + : ?show-icon ( adr len -- ) - locate-device 0= if ( phandle ) - " icon" 2 pick get-package-property 0= if ( phandle prop$ ) - rot drop ( prop$ ) - $show&advance ( ) - else ( phandle ) - " name" rot get-package-property if exit then ( prop$ ) - get-encoded-string ( name$ ) - " rom:" icon-name pack $cat ( ) - " .565" icon-name $cat ( ) - icon-name count $show&advance ( ) - then ( ) - then ( ) + locate-device if exit then ( phandle ) + + " icon" 2 pick get-package-property 0= if ( phandle prop$ ) + $show&advance ( phandle ) + drop exit + then ( phandle ) + + " iconname" 2 pick get-package-property 0= if ( phandle prop$ ) + get-encoded-string show-icon-file ( phandle ) + drop exit + then ( phandle ) + + " name" 2 pick get-package-property 0= if ( phandle prop$ ) + get-encoded-string show-icon-file ( phandle ) + drop exit + then ( phandle ) + + drop ; : (?show-device) ( adr len -- ihandle ) not-screen? 0= if 2dup ?show-icon then Modified: cpu/x86/pc/olpc/images/laptop.565 =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/images/laptop.bmp =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/images/usbkey.565 =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/images/usbkey.bmp =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/images/wireless.565 =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/images/wireless.bmp =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/images/xo.565 =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/images/xo.bmp =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-05-17 03:58:44 UTC (rev 395) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-05-18 02:33:58 UTC (rev 396) @@ -33,9 +33,10 @@ \ " ${BP}/ofw/linux/logom16c.bmp" " timeout.bmp" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nandflash.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/network.565" " ethernet.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " usbkey.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " sdmmc.565" $add-deflated-dropin " ${BP}/ofw/termemu/gallant.obf" " font" $add-deflated-dropin Modified: dev/mmc/sdhci/sdmmc.fth =================================================================== --- dev/mmc/sdhci/sdmmc.fth 2007-05-17 03:58:44 UTC (rev 395) +++ dev/mmc/sdhci/sdmmc.fth 2007-05-18 02:33:58 UTC (rev 396) @@ -2,6 +2,7 @@ \ See license at end of file " disk" device-name +" sdmmc" " iconname" string-property 0 instance value label-package Modified: dev/usb2/device/storage/scsidisk.fth =================================================================== --- dev/usb2/device/storage/scsidisk.fth 2007-05-17 03:58:44 UTC (rev 395) +++ dev/usb2/device/storage/scsidisk.fth 2007-05-18 02:33:58 UTC (rev 396) @@ -5,6 +5,7 @@ " block" device-type " disk" encode-string " compatible" property +" usbdisk" " iconname" string-property fload ${BP}/dev/usb2/device/storage/scsicom.fth \ Utility routines for SCSI commands

1 0

What happened to recent SVN commit e-mails
by Greg Folkert 17 May '07

17 May '07

Since Fri, 11 May 2007, starting with r371, I no longer get a proper date on the e-mail. Most recently r395 still exhibits this defect. This happened before with r101 thru r109, r112 and r113 on Mon, 30 Oct 2006. Not that I am tragically affected by this, it just would be nice to have them sort by date properly. -- greg, greg(a)gregfolkert.net PGP key: 1024D/B524687C 2003-08-05 Fingerprint: E1D3 E3D7 5850 957E FED0 2B3A ED66 6971 B524 687C Alternate Fingerprint: 09F9 1102 9D74 E35B D841 56C5 6356 88C0

2 2

r147 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 17 May '07

17 May '07

Author: blueswirl Date: 2007-05-17 21:16:06 +0200 (Thu, 17 May 2007) New Revision: 147 Modified: openbios-devel/arch/sparc32/tree.fs openbios-devel/drivers/esp.c openbios-devel/drivers/obio.c openbios-devel/drivers/sbus.c Log: NetBSD and OpenBSD fixes: - Correct timer and interrupt controller mappings - Add ESP clock frequency to avoid division by zero - CS4231 exists only in SS5 - Disable BPP for now, it's not emulated by Qemu anyway With these fixes, one NetBSD kernel even got to root device prompt on SS5. Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2007-05-17 19:07:21 UTC (rev 146) +++ openbios-devel/arch/sparc32/tree.fs 2007-05-17 19:16:06 UTC (rev 147) @@ -56,22 +56,14 @@ : decode-unit decode-unit-sbus ; finish-device +[IFDEF] CONFIG_BPP " /iommu/sbus" find-device new-device - " SUNW,CS4231" device-name - " serial" device-type - 5 encode-int 0 encode-int encode+ " intr" property - 5 encode-int " interrupts" property - h# 3 encode-int h# 0c000000 encode-int encode+ h# 00000040 encode-int encode+ " reg" property - " audio" encode-string " alias" property -finish-device - -" /iommu/sbus" find-device -new-device " SUNW,bpp" device-name h# 4 encode-int h# 0c800000 encode-int encode+ h# 0000001c encode-int encode+ " reg" property h# 33 encode-int 0 encode-int encode+ " intr" property finish-device +[THEN] " /iommu/sbus" find-device new-device Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2007-05-17 19:07:21 UTC (rev 146) +++ openbios-devel/drivers/esp.c 2007-05-17 19:16:06 UTC (rev 147) @@ -491,6 +491,11 @@ push_str("reg"); fword("property"); + PUSH(0x02625a00); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + for (id = 0; id < 8; id++) { if (!esp->sd[id].present) continue; Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-05-17 19:07:21 UTC (rev 146) +++ openbios-devel/drivers/obio.c 2007-05-17 19:16:06 UTC (rev 147) @@ -859,8 +859,15 @@ regs->l10_timer_limit = (((1000000/100) + 1) << 10); regs->cpu_timers[0].l14_timer_limit = 0; - PUSH((unsigned long)regs); + for (i = 0; i < SUN4M_NCPU; i++) { + PUSH((unsigned long)&regs->cpu_timers[i]); + fword("encode-int"); + if (i != 0) + fword("encode+"); + } + PUSH((unsigned long)&regs->l10_timer_limit); fword("encode-int"); + fword("encode+"); push_str("address"); fword("property"); @@ -905,11 +912,14 @@ intregs->set = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; - // Is this correct? It works for NetBSD at least - PUSH((int)intregs); + for (i = 0; i < SUN4M_NCPU; i++) { + PUSH((unsigned long)&intregs->cpu_intregs[i]); + fword("encode-int"); + if (i != 0) + fword("encode+"); + } + PUSH((unsigned long)&intregs->tbt); fword("encode-int"); - PUSH((int)intregs); - fword("encode-int"); fword("encode+"); push_str("address"); fword("property"); Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2007-05-17 19:07:21 UTC (rev 146) +++ openbios-devel/drivers/sbus.c 2007-05-17 19:16:06 UTC (rev 147) @@ -22,6 +22,8 @@ #define SBUS_SLOTS 16 #define POWER_REGS 0x10 #define POWER_OFFSET 0x0a000000 +#define CS4231_REGS 0x40 +#define CS4231_OFFSET 0x0c000000 static void ob_sbus_node_init(unsigned long bus, unsigned long base) @@ -297,6 +299,51 @@ } static void +ob_cs4231_init(unsigned int slot, unsigned long base) +{ + push_str("/iommu/sbus"); + fword("find-device"); + fword("new-device"); + + push_str("SUNW,CS4231"); + fword("device-name"); + + push_str("serial"); + fword("device-type"); + + PUSH(slot); + fword("encode-int"); + PUSH(CS4231_OFFSET); + fword("encode-int"); + fword("encode+"); + PUSH(CS4231_REGS); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + PUSH(5); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + push_str("intr"); + fword("property"); + + PUSH(5); + fword("encode-int"); + push_str("interrupts"); + fword("property"); + + push_str("audio"); + fword("encode-string"); + push_str("alias"); + fword("property"); + + fword("finish-device"); +} + +static void ob_macio_init(unsigned int slot, unsigned long base, unsigned long offset) { // All devices were integrated to NCR89C100, see @@ -327,7 +374,7 @@ ob_tcx_init(slot, base); break; case 4: // SUNW,CS4231 - //ob_cs4231_init(slot, base); + ob_cs4231_init(slot, base); break; case 5: // MACIO: le, esp, bpp, power-management ob_macio_init(slot, base, 0x08000000);

1 0

r146 - openbios-devel/drivers
by svn＠openbios.org 17 May '07

17 May '07

Author: blueswirl Date: 2007-05-17 21:07:21 +0200 (Thu, 17 May 2007) New Revision: 146 Modified: openbios-devel/drivers/iommu.c Log: Fix overallocation Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2007-05-07 20:02:01 UTC (rev 145) +++ openbios-devel/drivers/iommu.c 2007-05-17 19:07:21 UTC (rev 146) @@ -194,7 +194,7 @@ unsigned int mva; off = pa & (PAGE_SIZE - 1); - npages = (off + size + (PAGE_SIZE - 1)) / PAGE_SIZE; + npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; pa &= ~(PAGE_SIZE - 1); va = mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE);

1 0

r395 - cpu/x86/pc/olpc
by svn＠openbios.org 17 May '07

17 May '07

Author: wmb Date: 2007-05-17 05:58:44 +0200 (Thu, 17 May 2007) New Revision: 395 Modified: cpu/x86/pc/olpc/resume.bth Log: OLPC resume - Turn on flat panel drivers in early resume, using newly-discovered fast method. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-05-17 03:57:49 UTC (rev 394) +++ cpu/x86/pc/olpc/resume.bth 2007-05-17 03:58:44 UTC (rev 395) @@ -409,6 +409,12 @@ \ Unfreeze image by setting the DCONLOAD bit (0x800) in the GPIO output register h# 0800 h# 1000 port-wl +[else] + \ Turn on the flat panel power as soon as possible + \ The 400.0000 bit make the panel power-up timers use the 14 MHz clock + \ instead of the 32 kHz clock. That is supposed to be only for simulation, + \ but we have DCON between the CPU and the panel, so we don't need delays. + h# 500.0000 # vp-pa h# 410 + #) mov [then] \ 0 h# 1842 pw! \ Disable power button during early startup

1 0

r394 - dev/geode/ac97
by svn＠openbios.org 17 May '07

17 May '07

Author: wmb Date: 2007-05-17 05:57:49 +0200 (Thu, 17 May 2007) New Revision: 394 Modified: dev/geode/ac97/ac97.bth dev/geode/ac97/ac97.fth dev/geode/ac97/selftest.fth Log: ac97 - cleaned up selftest and added a "tone ( freq -- )" method to generate tones of specific frequencies. Modified: dev/geode/ac97/ac97.bth =================================================================== --- dev/geode/ac97/ac97.bth 2007-05-17 01:16:03 UTC (rev 393) +++ dev/geode/ac97/ac97.bth 2007-05-17 03:57:49 UTC (rev 394) @@ -9,6 +9,7 @@ FCode-version2 fload ${BP}/dev/geode/ac97/ac97.fth +fload ${BP}/forth/lib/isin.fth fload ${BP}/dev/geode/ac97/selftest.fth end0 Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-05-17 01:16:03 UTC (rev 393) +++ dev/geode/ac97/ac97.fth 2007-05-17 03:57:49 UTC (rev 394) @@ -239,8 +239,8 @@ 0 set-master-volume \ 0 set-mono-volume h# 0f0f set-headphone-volume - h# 808 set-pcm-gain \ enable line-out - h# 808 h# 38 codec! \ enable surround out (headphones) + h# 606 set-pcm-gain \ enable line-out + h# 606 h# 38 codec! \ enable surround out (headphones) h# 000 h# 76 codec! \ Route mixer out to headphones ; : close-out ( -- ) Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2007-05-17 01:16:03 UTC (rev 393) +++ dev/geode/ac97/selftest.fth 2007-05-17 03:57:49 UTC (rev 394) @@ -23,7 +23,7 @@ record-base record-len audio-in drop ; -h# 0 value plevel +h# 606 value plevel \ -9 dB, highest gain without digital clipping : set-plevel ( db -- ) dup 0> if drop 0 then negate 1+ 2* 3 / dup bwjoin to plevel @@ -40,77 +40,6 @@ record-base record-len audio-out drop write-done ; -[ifdef] notdef -create sin-half -d# 0 w, -d# 3212 w, -d# 6393 w, -d# 9512 w, -d# 12539 w, -d# 15446 w, -d# 18204 w, -d# 20787 w, -d# 23170 w, -d# 25329 w, -d# 27245 w, -d# 28898 w, -d# 30273 w, -d# 31356 w, -d# 32137 w, -d# 32609 w, -d# 32767 w, -d# 32609 w, -d# 32137 w, -d# 31356 w, -d# 30273 w, -d# 28898 w, -d# 27245 w, -d# 25329 w, -d# 23170 w, -d# 20787 w, -d# 18204 w, -d# 15446 w, -d# 12539 w, -d# 9512 w, -d# 6393 w, -d# 3212 w, - - - -0 value wave -: wave++ ( -- wave ) - wave h# 800 + dup h# 7fff and 0= if negate then dup to wave -; -: cycle ( adr -- adr' ) - d# 32 0 do ( adr ) - sin-half i wa+ w@ over w! ( adr value ) - la1+ ( adr' ) - loop ( adr ) - d# 32 0 do ( adr ) - sin-half i wa+ w@ negate over w! ( adr value ) - la1+ ( adr' ) - loop ( adr' ) -; - -: make-wave ( -- ) - \ Start with everything quiet - record-base record-len erase - - \ Add a sine wave to the left channel for the first half of the time - record-base record-len 2/ bounds ( endadr startadr ) - begin 2dup u> while cycle repeat ( endadr startadr ) - 2drop - - \ Add a sine wave to the right channel for the last half of the time - record-base record-len bounds ( endadr startadr ) - record-len 2/ + wa1+ - begin 2dup u> while cycle repeat ( endadr startadr ) - 2drop -; -[then] - -fload ${BP}/forth/lib/isin.fth - d# 500 value tone-freq : /cycle ( -- #bytes ) #cycle /l* ; @@ -127,13 +56,12 @@ /cycle + ; -: make-tone-wave ( -- ) +: make-tone ( freq -- ) + sample-rate to fs ( freq ) set-freq + \ Start with everything quiet record-base record-len erase - sample-rate to fs - tone-freq set-freq - record-base make-cycle drop \ Copy the wave template into the left channel @@ -147,6 +75,13 @@ /cycle +loop ; +: tone ( freq -- ) + record-len la1+ alloc-mem to record-base + make-tone + d# -9 set-glevel play + record-base record-len la1+ free-mem +; + : copy-cycle ( adr #copies -- adr' ) 1 ?do ( adr ) dup /cycle - over ( adr adr- adr ) @@ -155,7 +90,7 @@ loop ( adr' ) ; -: make-wave ( -- ) +: make-sweep ( -- ) \ Start with everything quiet record-base record-len erase @@ -169,6 +104,7 @@ -1 +loop drop +\ record-base record-base record-len 2/ + wa1+ record-len 2/ /w - move \ Copy the left channel into the right channel in reverse order record-base record-len /w - bounds ( end start ) begin 2dup u> while ( end start ) @@ -181,43 +117,29 @@ : selftest-args ( -- arg$ ) my-args ascii : left-parse-string 2drop ; -: ?play-wav-file ( -- ) +: wav-test ( -- ) selftest-args dup 0= if 2drop exit then " $play-wav-loop" $find 0= if 2drop else catch drop then ; -d# -8 value wav-plevel -d# -12 value wav-glevel -: wav-test ( -- ) - wav-plevel set-plevel wav-glevel set-glevel - ?play-wav-file +: sweep-test ( -- ) + ." Playing sweep" cr + make-sweep + d# -9 set-glevel play ; -d# -8 value tone-plevel -d# -12 value tone-glevel - -: tone-test ( -- ) - ." Playing tone" cr - \ Onset of clipping in the P domain is -7 - tone-plevel set-plevel tone-glevel set-glevel - make-wave play -; - -d# -8 value rec-plevel -d# -3 value rec-glevel : mic-test ( -- ) ." Recording ..." cr - rec-plevel set-plevel rec-glevel set-glevel record ." Playing ..." cr - play + d# -3 set-glevel play ; : selftest ( -- error? ) open 0= if ." Failed to open /audio" cr true exit then wav-test record-len la1+ alloc-mem to record-base - tone-test + sweep-test mic-test record-base record-len la1+ free-mem close false

1 0

r393 - forth/lib
by svn＠openbios.org 17 May '07

17 May '07

Author: wmb Date: 2007-05-17 03:16:03 +0200 (Thu, 17 May 2007) New Revision: 393 Modified: forth/lib/isin.fth Log: isin.fth - changed "max" to "min" because the attempt to prevent numerical overflow was causing sin waves to become square waves. Modified: forth/lib/isin.fth =================================================================== --- forth/lib/isin.fth 2007-05-17 01:04:15 UTC (rev 392) +++ forth/lib/isin.fth 2007-05-17 01:16:03 UTC (rev 393) @@ -47,7 +47,7 @@ : isin ( index -- frac ) fstep * fs 2/ / to x x dup times to xsq - one d# 72 sin-step d# 42 sin-step d# 20 sin-step 6 sin-step x times one max + one d# 72 sin-step d# 42 sin-step d# 20 sin-step 6 sin-step x times one min ; : one-cycle ( adr -- )

1 0

r392 - cpu/x86/pc/olpc
by svn＠openbios.org 17 May '07

17 May '07

Author: wmb Date: 2007-05-17 03:04:15 +0200 (Thu, 17 May 2007) New Revision: 392 Added: cpu/x86/pc/olpc/mfgtree.fth Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/mfgdata.fth Log: OLPC trac 1493 - added all manufacturing data tags to the device tree, as properties of the new "/mfg-data" node. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-16 10:07:06 UTC (rev 391) +++ cpu/x86/pc/olpc/devices.fth 2007-05-17 01:04:15 UTC (rev 392) @@ -280,6 +280,7 @@ ; fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data +fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree fload ${BP}/cpu/x86/pc/olpc/kbdtype.fth \ Export keyboard type fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming Modified: cpu/x86/pc/olpc/mfgdata.fth =================================================================== --- cpu/x86/pc/olpc/mfgdata.fth 2007-05-16 10:07:06 UTC (rev 391) +++ cpu/x86/pc/olpc/mfgdata.fth 2007-05-17 01:04:15 UTC (rev 392) @@ -1,4 +1,5 @@ purpose: Manufacturing data reader +\ See license at end of file \ The manufacturing data format is specified by \ http://wiki.laptop.org/go/Manufacturing_Data @@ -80,3 +81,27 @@ here 4 2r> + write-spi-flash ( ) ; [then] + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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 Added: cpu/x86/pc/olpc/mfgtree.fth =================================================================== --- cpu/x86/pc/olpc/mfgtree.fth (rev 0) +++ cpu/x86/pc/olpc/mfgtree.fth 2007-05-17 01:04:15 UTC (rev 392) @@ -0,0 +1,40 @@ +purpose: Export manufacturing data via the device tree +\ See license at end of file + +0 0 " " " /" begin-package + " mfg-data" device-name +end-package + +stand-init: Manufacturing data + " /mfg-data" find-device + mfg-data-top ( adr ) + begin another-tag? while ( adr' data$ tname-adr ) + >r encode-bytes r> 2 property ( adr ) + repeat ( adr ) + drop + device-end +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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

r391 - cpu/x86/pc/olpc
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 12:07:06 +0200 (Wed, 16 May 2007) New Revision: 391 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/versions.fth Log: Q2C12 - Backed out game key changes again, but kept the other stuff since C11. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-16 09:22:10 UTC (rev 390) +++ cpu/x86/pc/olpc/fw.bth 2007-05-16 10:07:06 UTC (rev 391) @@ -436,6 +436,7 @@ : user-switch? ( -- flag ) [ifdef] lx-devel false exit [then] atest? if true exit then +true exit game-key@ 0<> dup if ." Release the game key to continue" cr begin d# 100 ms game-key@ 0= until Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-05-16 09:22:10 UTC (rev 390) +++ cpu/x86/pc/olpc/versions.fth 2007-05-16 10:07:06 UTC (rev 391) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 11 +macro: FW_MINOR 12 \ The EC microcode macro: EC_VERSION c11 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp ~/pqc10t.bin ec.img +\ macro: GET_EC cp ./c11t-1.bin ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1

1 0

r390 - ofw/fs/jffs2
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 11:22:10 +0200 (Wed, 16 May 2007) New Revision: 390 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - Removed some unnecessary verbosity, and added some commented-out debugging code. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-05-16 09:05:57 UTC (rev 389) +++ ofw/fs/jffs2/jffs2.fth 2007-05-16 09:22:10 UTC (rev 390) @@ -262,8 +262,8 @@ dup w@ case ( len adr case: type ) inode-type of scan-sum-inode endof dirent-type of scan-sum-dirent endof - xattr-type of drop d# 18 ." XA" cr endof - xref-type of drop 6 ." R" cr endof + xattr-type of drop d# 18 ( ." XA" cr ) endof + xref-type of drop 6 ( ." R" cr ) endof h# ffff of drop dup ( find-nonblank ) endof \ Keep scanning to end ." Unrecognized summary node type " dup .x cr abort endcase @@ -427,6 +427,80 @@ pages/eblock +loop ; +0 [if] +/eblock value summary-start + +: .eb ( -- ) + the-eblock# .xxx +; + +: xanother-node? ( adr -- false | adr' true ) + eb-end swap ?do + i w@ jffs2-magic = if + i header-crc? if + i +raw-node eb-end u<= if + i true unloop exit + then + then + then + loop + false +; +: .offset ( adr -- ) ." offset " block-buf - . ." in " .eb ; + +: check-node-data ( adr -- ) +; +Mitch_Bradley: the most common type of 'bad node'will have a mismatching data crc. And the node will end in 0xff 0xff 0xff .... when it wasn't intended to. Because of an interrupted write. +[22:52] <dwmw2_gone> those ones are almost certainly harmless + +> Mitch_Bradley: it should also always be true that there is no range of a file _not_ covered by a data node +[22:54] <dwmw2_gone> even if it's just a "hole" node -- with JFFS2_COMPR_ZERO. +[22:54] <Mitch_Bradley> oh, that's useful +[22:54] <dwmw2_gone> I had to add those 'hole' nodes to deal with truncation and then later writes past the (new) end of the file + +: check-node ( adr -- len ) + dup w@ jffs2-magic = if ( adr ) + dup header-crc? if ( adr ) + dup +raw-node ( adr adr' ) + over - swap ( len adr ) + check-node-data ( len ) + else + ." Bad header CRC at " .offset + /eblock ( len ) + then ( len ) + else ( adr ) + check-em + then +; + +: check-nodes ( -- ) + block-buf summary-start erased? if exit then + block-buf summary-start bounds ?do i check-node +loop +; + +: check-summary ( -- ) + /eblock to summary-start + + \ Check magic number + block-buf /page + -1 j@ h# 02851885 <> if exit then + + block-buf /eblock + -2 j@ to summary-start + + block-buf summary-start + bad-summary? if + ." Bad summary CRC for " .eb exit + then +; + +: check-blocks ( -- ) + pages/chip 0 do + i page>eblock to the-eblock# + the-eblock# read-eblock + check-summary + check-nodes + pages/eblock +loop +; +[then] + : place-node ( node where -- ) ! next-minode na1+ to next-minode ( ) @@ -929,8 +1003,12 @@ 0 to seek-ptr ( ) - set-sizes allocate-buffers scan-occupied ( ) + set-sizes allocate-buffers ( ) +\ my-args " :check" $= if check-blocks true exit then + + scan-occupied ( ) + \ This is the value we will use for file-buf if we use read and seek next-inode to file-buf

1 0

r389 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 11:05:57 +0200 (Wed, 16 May 2007) New Revision: 389 Modified: cpu/x86/pc/olpc/devices.fth dev/olpc/kb3700/ecio.fth Log: OLPC - in the EC, turn off auto-SCI-generation for port 66, thus squelching a flood of SCIs. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-16 08:54:20 UTC (rev 388) +++ cpu/x86/pc/olpc/devices.fth 2007-05-16 09:05:57 UTC (rev 389) @@ -253,6 +253,10 @@ to board-revision ; +stand-init: Quiet SCI + sci-quiet +; + stand-init: Wireless reset [ifdef] lx-devel exit [then] Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-16 08:54:20 UTC (rev 388) +++ dev/olpc/kb3700/ecio.fth 2007-05-16 09:05:57 UTC (rev 389) @@ -149,6 +149,10 @@ : snoop-board-id@ ( -- id ) h# fa20 ec@ ; +\ This makes the EC stop generating a flood of SCIs every time you do +\ the port 66 command sequence. +: sci-quiet ( -- ) h# 50 h# ff03 ec! ; + \ While accessing the SPI FLASH, we have to turn off the keyboard controller, \ because it continuously fetches from the SPI FLASH when it's on. That \ interferes with our accesses.

1 0

r388 - dev/olpc/cafecamera
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 10:54:20 +0200 (Wed, 16 May 2007) New Revision: 388 Modified: dev/olpc/cafecamera/cafecamera.fth Log: OLPC CaFe camera - turn off sensor power when not in use. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-05-16 08:52:09 UTC (rev 387) +++ dev/olpc/cafecamera/cafecamera.fth 2007-05-16 08:54:20 UTC (rev 388) @@ -408,12 +408,18 @@ 40 dup cl@ 1000.0000 invert and swap cl! \ power up 30 b4 cl! \ power up, reset 1 ms - 31 b4 cl! + 31 b4 cl! \ release reset 1 ms ; : power-off ( -- ) - 0 3038 cl! \ Turn off CaFe GPIO3 to disable power + 30 b4 cl! \ assert Cam_Reset + 1 ms + 32 b4 cl! \ assert Cam_Reset and Cam_PWRDN + 1 ms + 0008.0000 315c cl! \ Remove VDD + 5 ms + 40 dup cl@ 1000.0000 or swap cl! \ power off ; : init ( -- ) (init)

1 0

r387 - ofw/core
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 10:52:09 +0200 (Wed, 16 May 2007) New Revision: 387 Modified: ofw/core/banner.fth Log: Cater to the geek affectation du jour by changing MB and GB to MiB and GiB. Modified: ofw/core/banner.fth =================================================================== --- ofw/core/banner.fth 2007-05-16 08:50:49 UTC (rev 386) +++ ofw/core/banner.fth 2007-05-16 08:52:09 UTC (rev 387) @@ -70,9 +70,9 @@ ; : .memory ( -- ) memory-size dup d# 1024 / ?dup if ( mb gb ) - nip " GB" rot ( gb$ gb ) + nip " GiB" rot ( gb$ gb ) else ( mb ) - " MB " rot ( mb$ mb ) + " MiB " rot ( mb$ mb ) then ( m$ m ) .d type ." memory installed" ( ) ;

1 0

r386 - cpu/x86/pc/olpc
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 10:50:49 +0200 (Wed, 16 May 2007) New Revision: 386 Modified: cpu/x86/pc/olpc/linux.fth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/usb.fth Log: OLPC - Fixed some problems with auto-booting from ethernet and wireless network interfaces. Modified: cpu/x86/pc/olpc/linux.fth =================================================================== --- cpu/x86/pc/olpc/linux.fth 2007-05-16 08:37:18 UTC (rev 385) +++ cpu/x86/pc/olpc/linux.fth 2007-05-16 08:50:49 UTC (rev 386) @@ -11,7 +11,7 @@ \needs ramdisk " " d# 128 config-string ramdisk " " ' boot-file set-config-string-default \ Let the olpcboot.fth file set the cmdline -" sd:\boot\olpc.fth disk:\boot\olpc.fth nand:zip,\olpc.fth nand:\boot\olpc.fth" ' boot-device set-config-string-default +" sd:\boot\olpc.fth disk:\boot\olpc.fth nand:\boot\olpc.fth /prober /usb/ethernet /usb/wlan" ' boot-device set-config-string-default 0 value ramdisk-adr 0 value /ramdisk Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-05-16 08:37:18 UTC (rev 385) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-05-16 08:50:49 UTC (rev 386) @@ -33,9 +33,9 @@ \ " ${BP}/ofw/linux/logom16c.bmp" " timeout.bmp" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nandflash.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/network.565" " network.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/network.565" " ethernet.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wireless.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin " ${BP}/ofw/termemu/gallant.obf" " font" $add-deflated-dropin Modified: cpu/x86/pc/olpc/usb.fth =================================================================== --- cpu/x86/pc/olpc/usb.fth 2007-05-16 08:37:18 UTC (rev 385) +++ cpu/x86/pc/olpc/usb.fth 2007-05-16 08:50:49 UTC (rev 386) @@ -3,8 +3,8 @@ devalias usb1 /usb@f,4 devalias usb2 /usb@f,5 -devalias u /usb/disk -devalias net /wlan +devalias u /usb/disk +devalias net /usb/wlan \ If there is a USB ethernet adapter, use it as the default net device. : report-net ( -- ) @@ -89,6 +89,19 @@ ; ' usb-quiet to go-hook +0 0 " " " /" begin-package + " prober" device-name + : open + " /usb@f,5" open-dev ?dup if close-dev then + " /usb@f,4" open-dev ?dup if close-dev then + report-disk + report-net + report-keyboard + false + ; + : close ; +end-package + stand-init: USB setup \ Set up an address routing to the USB Option Controller h# efc00000.efc00001. h# 5100.0029 wrmsr

1 0

r385 - cpu/x86/pc/olpc
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 10:37:18 +0200 (Wed, 16 May 2007) New Revision: 385 Modified: cpu/x86/pc/olpc/gui.fth Log: OLPC graphical boot - suppressed "Can't open file" message for nonexistent icons. Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2007-05-16 08:36:26 UTC (rev 384) +++ cpu/x86/pc/olpc/gui.fth 2007-05-16 08:37:18 UTC (rev 385) @@ -26,10 +26,10 @@ ; : $get-image ( filename$ -- true | adr,len false ) - ['] $read-open catch if 2drop true exit then ( ) - ifd @ fsize dup alloc-mem swap ( bmp-adr,len ) - 2dup ifd @ fgets over <> ( bmp-adr,len error? ) - ifd @ fclose ( bmp-adr,len ) + r/o open-file if drop true exit then >r ( r: fd ) + r@ fsize dup alloc-mem swap ( bmp-adr,len r: fd ) + 2dup r@ fgets over <> ( bmp-adr,len error? r: fd ) + r> fclose ( bmp-adr,len ) if free-mem true else false then ( true | bmp-adr,len false ) ; : $show ( filename$ -- )

1 0

r384 - cpu/x86/pc/olpc
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 10:36:26 +0200 (Wed, 16 May 2007) New Revision: 384 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC - added "serial-number" string property to the device tree root node. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-16 08:34:28 UTC (rev 383) +++ cpu/x86/pc/olpc/fw.bth 2007-05-16 08:36:26 UTC (rev 384) @@ -237,6 +237,9 @@ encode-string " banner-name" property model board-revision " board-revision-int" integer-property + \ The "1-" removes the null byte + " SN" find-tag if 1- else " Unknown" then " serial-number" string-property + [ifndef] lx-devel 8 ec-cmd " ec-version" integer-property

1 0

r383 - in cpu/x86/pc: biosload lxdevel olpc
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 10:34:28 +0200 (Wed, 16 May 2007) New Revision: 383 Modified: cpu/x86/pc/biosload/config.fth cpu/x86/pc/biosload/ofw.bth cpu/x86/pc/lxdevel/config.fth cpu/x86/pc/olpc/config.fth cpu/x86/pc/olpc/devices.fth Log: OLPC - removed some unnecessary configuration options - just cleanup. Modified: cpu/x86/pc/biosload/config.fth =================================================================== --- cpu/x86/pc/biosload/config.fth 2007-05-16 08:32:24 UTC (rev 382) +++ cpu/x86/pc/biosload/config.fth 2007-05-16 08:34:28 UTC (rev 383) @@ -60,7 +60,6 @@ create use-elf create use-ne2000 create use-watch-all -create usb-support create use-null-nvram create no-floppy-node [then] Modified: cpu/x86/pc/biosload/ofw.bth =================================================================== --- cpu/x86/pc/biosload/ofw.bth 2007-05-16 08:32:24 UTC (rev 382) +++ cpu/x86/pc/biosload/ofw.bth 2007-05-16 08:34:28 UTC (rev 383) @@ -72,7 +72,6 @@ " fw.img" " firmware" $add-deflated-dropin " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin -[ifdef] usb-support " ${BP}/dev/usb2/hcd/uhci/build/uhci.fc" " class0c0300" $add-deflated-dropin " ${BP}/dev/usb2/hcd/ohci/build/ohci.fc" " class0c0310" $add-deflated-dropin " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin @@ -82,7 +81,6 @@ \ " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin -[then] " builton.fth" " probe-" $add-dropin [ifndef] resident-packages Modified: cpu/x86/pc/lxdevel/config.fth =================================================================== --- cpu/x86/pc/lxdevel/config.fth 2007-05-16 08:32:24 UTC (rev 382) +++ cpu/x86/pc/lxdevel/config.fth 2007-05-16 08:34:28 UTC (rev 383) @@ -32,9 +32,6 @@ create jffs2-support create use-elf -create cafe-support -create usb-support - \ create use-timestamp-counter \ Use CPU's timestamp counter for timing ... \ ... this is worthwhile if your CPU has one. Modified: cpu/x86/pc/olpc/config.fth =================================================================== --- cpu/x86/pc/olpc/config.fth 2007-05-16 08:32:24 UTC (rev 382) +++ cpu/x86/pc/olpc/config.fth 2007-05-16 08:34:28 UTC (rev 383) @@ -30,10 +30,6 @@ create jffs2-support create use-elf -create cafe-support -create usb-support -create spi-flash-support - \ create use-timestamp-counter \ Use CPU's timestamp counter for timing ... \ ... this is worthwhile if your CPU has one. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-16 08:32:24 UTC (rev 382) +++ cpu/x86/pc/olpc/devices.fth 2007-05-16 08:34:28 UTC (rev 383) @@ -222,7 +222,6 @@ \needs md5init fload ${BP}/ofw/ppp/md5.fth \ MD5 hash -[ifdef] spi-flash-support fload ${BP}/dev/olpc/kb3700/ecspi.fth \ EC chip SPI FLASH access warning @ warning off @@ -286,8 +285,6 @@ fload ${BP}/dev/geode/lpcflash.fth \ Reflasher for PLCC FLASH on A-test -[then] - : +i encode-int encode+ ; : 0+i 0 +i ; fload ${BP}/cpu/x86/fb16-ops.fth

1 0

r382 - cpu/x86/pc/olpc/sdtools dev/olpc/dcon
by svn＠openbios.org 16 May '07

16 May '07

Author: wmb Date: 2007-05-16 10:32:24 +0200 (Wed, 16 May 2007) New Revision: 382 Modified: cpu/x86/pc/olpc/sdtools/maketar cpu/x86/pc/olpc/sdtools/sd.fth dev/olpc/dcon/dconsmb.fth Log: OLPC SD exerciser program - added MSR , DCON, and mfg data support. Modified: cpu/x86/pc/olpc/sdtools/maketar =================================================================== --- cpu/x86/pc/olpc/sdtools/maketar 2007-05-15 00:59:33 UTC (rev 381) +++ cpu/x86/pc/olpc/sdtools/maketar 2007-05-16 08:32:24 UTC (rev 382) @@ -1,6 +1,9 @@ #!/bin/sh -cp ../../../bin/x86/linux/forth . -cp ../../../bin/x86/builder.dic . -cp ../../../cpu/x86/ioports.fth . -tar cfz sdkit.tgz forth builder.dic sd.fth ioports.fth sd +ls ../../../../../cpu/x86/Linux +cp ../../../../../cpu/x86/Linux/forth . +cp ../../../../../cpu/x86/build/builder.dic . +cp ../../../../../cpu/x86/ioports.fth . +cp ../../../../../cpu/x86/pc/olpc/mfgdata.fth . +cp ../../../../../dev/olpc/dcon/dconsmb.fth . +tar cfz sdkit.tgz forth builder.dic sd.fth ioports.fth dconsmb.fth mfgdata.fth sd rm -f builder.dic forth ioports.fth Modified: cpu/x86/pc/olpc/sdtools/sd.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/sd.fth 2007-05-15 00:59:33 UTC (rev 381) +++ cpu/x86/pc/olpc/sdtools/sd.fth 2007-05-16 08:32:24 UTC (rev 382) @@ -33,6 +33,32 @@ : r ( offset -- ) sdl@ u. ; : w ( l offset -- ) sdl! ; + +fff0.0000 10.0000 mmap constant flash-base +\needs cdump : cdump ( adr len -- ) bounds ?do i c@ .x loop ; +\needs .mfg-data fload mfgdata.fth + +: 1ms ( -- ) + h# 10 msr@ drop d# 500,000 + ( limit ) + begin dup h# 10 msr@ drop - 0< until + drop +; +: ms ( #ms -- ) 0 ?do 1ms loop ; + +\needs dcon@ fload dconsmb.fth + +: mode! ( mode -- ) 1 dcon! ; +: hres! ( hres -- ) 2 dcon! ; \ def: h# 458 d# 1200 +: htotal! ( htotal -- ) 3 dcon! ; \ def: h# 4e8 d# 1256 +: hsync! ( sync -- ) 4 dcon! ; \ def: h# 1808 d# 24,8 +: vres! ( vres -- ) 5 dcon! ; \ def: h# 340 d# 900 +: vtotal! ( htotal -- ) 6 dcon! ; \ def: h# 390 d# 912 +: vsync! ( sync -- ) 7 dcon! ; \ def: h# 403 d# 4,3 +: timeout! ( to -- ) 8 dcon! ; \ def: h# ffff +: scanint! ( si -- ) 9 dcon! ; \ def: h# 0000 +: bright! ( level -- ) d# 10 dcon! ; \ def: h# xxxF + + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: dev/olpc/dcon/dconsmb.fth =================================================================== --- dev/olpc/dcon/dconsmb.fth 2007-05-15 00:59:33 UTC (rev 381) +++ dev/olpc/dcon/dconsmb.fth 2007-05-16 08:32:24 UTC (rev 382) @@ -8,7 +8,7 @@ h# 70 value smb-clock \ 8 is the shortest period the controller allows : smb-on ( -- ) - h# 5140000b rdmsr drop to smb-base + h# 5140000b msr@ drop to smb-base \ Empirically, it doesn't work if you set reg 6 before reg 5 \ First set the registers with the enable bit clear smb-clock 1 lshift 5 smb!

1 0

r381 - dev/olpc/cafecamera
by svn＠openbios.org 15 May '07

15 May '07

Author: wmb Date: 2007-05-15 02:59:33 +0200 (Tue, 15 May 2007) New Revision: 381 Modified: dev/olpc/cafecamera/cafecamera.fth Log: OLPC Camera - turn off camera power when not in use. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-05-14 10:50:34 UTC (rev 380) +++ dev/olpc/cafecamera/cafecamera.fth 2007-05-15 00:59:33 UTC (rev 381) @@ -390,7 +390,7 @@ : soft-reset ( -- ) 4 h# 3034 cl! 0 h# 3034 cl! ; : (init) ( -- ) - 0000.0008 3038 cl! \ magic to bringup hardware + 0000.0008 3038 cl! \ Turn on CaFe GPIO3 to enable power 0008.0008 315c cl! 0000.0005 3004 cl! \ wake up device 0000.000a 3004 cl! @@ -412,6 +412,9 @@ 1 ms ; +: power-off ( -- ) + 0 3038 cl! \ Turn off CaFe GPIO3 to disable power +; : init ( -- ) (init) power-up @@ -468,6 +471,7 @@ : close ( -- ) ctlr-stop + power-off free-dma-bufs unmap-regs ;

1 0

r380 - dev/mmc/sdhci
by svn＠openbios.org 14 May '07

14 May '07

Author: wmb Date: 2007-05-14 12:50:34 +0200 (Mon, 14 May 2007) New Revision: 380 Modified: dev/mmc/sdhci/sdhci.fth Log: SDHCI - High-capacity SD memory card support now works - Pierre Ossman tested with one of his SDHC cards. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2007-05-14 09:22:28 UTC (rev 379) +++ dev/mmc/sdhci/sdhci.fth 2007-05-14 10:50:34 UTC (rev 380) @@ -387,7 +387,7 @@ \ Version 2 of the spec add CMD8. Pre-v2 cards will time out on CMD8. : sd2? ( -- flag ) - true to allow-timeout? true to timeout? + true to allow-timeout? false to timeout? send-if-cond false to allow-timeout? @@ -397,16 +397,22 @@ 0 instance value address-shift h# 8010.0000 value oc-mode \ Voltage settings, etc. -: set-operating-conditions ( -- ) - sd2? if h# 4010.0000 else h# 8010.0000 then to oc-mode - - begin +: wait-powered ( -- ocr ) + d# 100 0 do oc-mode set-oc ( ocr ) \ acmd41 dup h# 8000.0000 and ( card-powered-on? ) - 0= while ( ocr ) + if unloop exit then drop d# 10 ms - repeat ( ocr ) + loop ( ) + ." Card didn't power up after 1 second" cr + abort +; +: set-operating-conditions ( -- ) + sd2? if h# 4030.0000 else h# 0030.0000 then to oc-mode + + wait-powered + \ Card Capacity Status bit - High Capacity cards are addressed \ in blocks, so the block number does not have to be shifted. \ Standard capacity cards are addressed in bytes, so the block @@ -471,7 +477,7 @@ reset-card \ Cmd 0 - set-operating-conditions + ['] set-operating-conditions catch if false exit then get-all-cids \ Cmd 2 get-rca \ Cmd 3 - Get relative card address

1 0

r379 - dev/mmc/sdhci
by svn＠openbios.org 14 May '07

14 May '07

Author: wmb Date: 2007-05-14 11:22:28 +0200 (Mon, 14 May 2007) New Revision: 379 Modified: dev/mmc/sdhci/sdhci.fth Log: SDHCI - Added support for high-capacity SD memory cards. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2007-05-14 09:11:19 UTC (rev 378) +++ dev/mmc/sdhci/sdhci.fth 2007-05-14 09:22:28 UTC (rev 379) @@ -210,26 +210,32 @@ drop cr ; +0 instance value allow-timeout? +0 instance value timeout? + : .sderror ( isr -- ) - ." Error: ISR = " dup u. isr! - ." ESR = " esr@ dup u. dup esr! decode-esr + esr@ dup esr! ( isr esr ) + allow-timeout? if ( isr esr ) + dup 1 = if true to timeout? 2drop exit then + then ( isr esr ) + + ." Error: ISR = " swap u. + ." ESR = " dup u. decode-esr ." Stopping" cr abort -\ debug-me + \ debug-me ; : wait ( mask -- ) h# 8000 or ( mask' ) begin ( mask ) - isr@ ( mask isr ) + isr@ dup isr! ( mask isr ) 2dup and 0= while ( mask isr ) \ key? if key drop debug-me then ( mask isr ) - dup isr! ( mask isr ) \ DMA interrupt - the transfer crossed an address boundary 8 and if 0 cl@ 0 cl! then ( mask ) repeat ( mask isr ) nip ( isr ) - dup h# 8000 and if dup .sderror then ( isr ) - isr! ( ) + dup h# 8000 and if .sderror else drop then ( ) ; : wait-ready ( -- ) @@ -267,6 +273,7 @@ \ R3: OCR register \ R6: RCA \ R2: 136 bits (CID (cmd 2 or 9) or CSD (cmd 10)) +\ R7: 136 bits (Interface condition, for CMD8) \ In R2 format, the first 2 bits are start bits, the next 6 are \ reserved. Then there are 128 bits (16 bytes) of data, then the end bit @@ -310,6 +317,8 @@ : deselect-card ( -- ) 0 h# 0700 0 cmd ; \ 7 - with null RCA : select-card ( -- ) rca h# 071b 0 cmd ; \ 7 R1b +: send-if-cond ( -- ) h# 1aa h# 081a 0 cmd ( response h# 1aa <> if ." Error" then ) ; \ 8 R7 + \ Get Card-specific data : get-csd ( -- ) rca h# 0909 0 cmd csd get-response136 ; \ 9 R2 : get-cid ( -- ) rca h# 0a09 0 cmd cid get-response136 ; \ 10 R2 UNTESTED @@ -331,10 +340,10 @@ \ 10.0000 direction: 1 for read, 0 for write \ 20.0000 multi (set for multiple-block transfers) -: read-single ( byte# -- ) h# 113a h# 13 cmd ; \ 17 R1 READ_SINGLE_BLOCK -: read-multiple ( byte# -- ) h# 123a h# 37 cmd ; \ 18 R1 READ_MULTIPLE -: write-single ( byte# -- ) h# 183a h# 03 cmd ; \ 24 R1 WRITE_SINGLE_BLOCK -: write-multiple ( byte# -- ) h# 193a h# 27 cmd ; \ 25 R1 WRITE_MULTIPLE +: read-single ( address -- ) h# 113a h# 13 cmd ; \ 17 R1 READ_SINGLE_BLOCK +: read-multiple ( address -- ) h# 123a h# 37 cmd ; \ 18 R1 READ_MULTIPLE +: write-single ( address -- ) h# 183a h# 03 cmd ; \ 24 R1 WRITE_SINGLE_BLOCK +: write-multiple ( address -- ) h# 193a h# 27 cmd ; \ 25 R1 WRITE_MULTIPLE : program-csd ( -- ) 0 h# 1b1a 0 cmd ; \ R1 27 UNTESTED : protect ( group# -- ) h# 1c1b 0 cmd ; \ R1b 28 UNTESTED @@ -376,17 +385,34 @@ scratch-buf ; -variable ocr +\ Version 2 of the spec add CMD8. Pre-v2 cards will time out on CMD8. +: sd2? ( -- flag ) + true to allow-timeout? true to timeout? + send-if-cond + false to allow-timeout? + + timeout? 0= +; + +0 instance value address-shift h# 8010.0000 value oc-mode \ Voltage settings, etc. + : set-operating-conditions ( -- ) + sd2? if h# 4010.0000 else h# 8010.0000 then to oc-mode + begin oc-mode set-oc ( ocr ) \ acmd41 dup h# 8000.0000 and ( card-powered-on? ) 0= while ( ocr ) drop d# 10 ms repeat ( ocr ) - \ We must save this so we can look at the Card Capacity Status bit - ocr ! ( ) + + \ Card Capacity Status bit - High Capacity cards are addressed + \ in blocks, so the block number does not have to be shifted. + \ Standard capacity cards are addressed in bytes, so the block + \ number must be left-shift by 9 (multiplied by 512). + + h# 4000.0000 and if 0 else 9 then to address-shift ; : configure-transfer ( -- ) @@ -465,7 +491,7 @@ >r ( addr block# #blocks r: in? ) rot dma-setup ( block# r: in? ) wait-write-done - /block * r> if + address-shift lshift r> if read-multiple else write-multiple true to writing?

1 0

r378 - dev/geode/ac97
by svn＠openbios.org 14 May '07

14 May '07

Author: wmb Date: 2007-05-14 11:11:19 +0200 (Mon, 14 May 2007) New Revision: 378 Modified: dev/geode/ac97/selftest.fth Log: OLPC audio selftest - ramp up on one speaker and down on the other Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2007-05-14 09:10:17 UTC (rev 377) +++ dev/geode/ac97/selftest.fth 2007-05-14 09:11:19 UTC (rev 378) @@ -165,13 +165,17 @@ 1 d# 30 do ( adr ) i set-period ( adr ) make-cycle ( adr ) -\ d# 42 copy-cycle ( adr' ) d# 35 copy-cycle ( adr' ) -1 +loop drop - \ Copy the left channel into the right channel - record-base record-base record-len 2/ + wa1+ record-len 2/ /w - move + \ Copy the left channel into the right channel in reverse order + record-base record-len /w - bounds ( end start ) + begin 2dup u> while ( end start ) + 2dup w@ swap w! ( end start ) + swap /w - swap wa1+ ( end' start' ) + repeat ( end start ) + 2drop ;

1 0

r377 - cpu/x86/pc/olpc
by svn＠openbios.org 14 May '07

14 May '07

Author: wmb Date: 2007-05-14 11:10:17 +0200 (Mon, 14 May 2007) New Revision: 377 Modified: cpu/x86/pc/olpc/devices.fth Log: cpu/x86/pc/olpc/devices.fth - minor cleanup; not substantive. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-12 02:13:18 UTC (rev 376) +++ cpu/x86/pc/olpc/devices.fth 2007-05-14 09:10:17 UTC (rev 377) @@ -254,7 +254,6 @@ to board-revision ; -warning @ warning off stand-init: Wireless reset [ifdef] lx-devel exit [then] @@ -264,7 +263,6 @@ \ takes about 200 mS, so we are okay. atest? 0= if wlan-reset then ; -warning ! stand-init: PCI properties " /pci" find-device

1 0

r376 - cpu/x86/pc/olpc
by svn＠openbios.org 12 May '07

12 May '07

Author: wmb Date: 2007-05-12 04:13:18 +0200 (Sat, 12 May 2007) New Revision: 376 Modified: cpu/x86/pc/olpc/gpioinit.fth cpu/x86/pc/olpc/gxmsrs.fth cpu/x86/pc/olpc/lxmsrs.fth Log: OLPC - interrupt routing changes to support SCI power management events Modified: cpu/x86/pc/olpc/gpioinit.fth =================================================================== --- cpu/x86/pc/olpc/gpioinit.fth 2007-05-12 02:05:40 UTC (rev 375) +++ cpu/x86/pc/olpc/gpioinit.fth 2007-05-12 02:13:18 UTC (rev 376) @@ -98,13 +98,15 @@ \ h# 0000 h# 10dc pw! \ GPIO_07_EVENT_COUNT - default \ h# 0000 h# 10de pw! \ GPIO_07_EVENTCOMPARE_VALUE - default - h# 20000001 h# 10e0 pl! \ GPIO_MAPPER_X lx? if - h# 00500000 h# 10e4 pl! \ GPIO_MAPPER_Y + h# 20000001 h# 10e0 pl! \ GPIO_MAPPER_X - GPIO7(DCON) -> group 2 , GPIO0(CPU) -> group 1 + h# 00500000 h# 10e4 pl! \ GPIO_MAPPER_Y - GPIO13(CaFe) -> group 5 +else + h# 20000005 h# 10e0 pl! \ GPIO_MAPPER_X - GPIO7(DCON) -> group 2, GPIO 0(CaFe) -> group 5 then \ h# 00000000 h# 10e4 pl! \ GPIO_MAPPER_Y - default \ h# 00000000 h# 10e8 pl! \ GPIO_MAPPER_Z - default -\ h# 00000000 h# 10ec pl! \ GPIO_MAPPER_W - default + h# 0000fe00 h# 10ec pl! \ GPIO_MAPPER_W - GPIO27 is SCI, PME+group 7, GPIO26 is PWR_BUT_in (lid), PME+group 6 \ h# 00 h# 10f0 pc! \ GPIO_EE_SELECT_0 - default \ h# 00 h# 10f1 pc! \ GPIO_EE_SELECT_1 - default \ h# 00 h# 10f2 pc! \ GPIO_EE_SELECT_2 - default Modified: cpu/x86/pc/olpc/gxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/gxmsrs.fth 2007-05-12 02:05:40 UTC (rev 375) +++ cpu/x86/pc/olpc/gxmsrs.fth 2007-05-12 02:13:18 UTC (rev 376) @@ -281,16 +281,16 @@ msr: 5140.001b 00000000.00100010. \ NANDF_DATA msr: 5140.001c 00000000.00000010. \ NANDF_CTL msr: 5140.001f 00000000.00000011. \ KEL_CTRL -msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW -msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH -msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW -msr: 5140.0023 00000000.600aa5b2. \ IRQM_ZHIGH -msr: 5140.0025 00000000.00001002. \ IRQM_LPC +msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW NAND distract, NAND ready, PM SCI OR, AC97, RTC Alarm, USB, -, SW IRQ +msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH UART1 +msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW MFGPTs +msr: 5140.0023 00000000.33b00600. \ IRQM_ZHIGH SCI-3, LID-3, CaFe-11, DCON-6 +msr: 5140.0025 00000000.00001002. \ IRQM_LPC Enable mouse(12) and kbd (1) \ msr: 5140.0028 00000000.000000ff. \ MFGPT_IRQ Leave this off -msr: 5140.0040 00000000.00000000. \ DMA_MAP +\ msr: 5140.0040 00000000.00000000. \ DMA_MAP - default \ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ \ msr: 5140.004e 00000000.effd0080. \ LPC_SIRQ -msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ +msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ - Active high bit 12 (mouse) and 2 (kbd), Enable, Quiet, 17 frames \ USB host controller msr: 5120.0001 0000000b.00000000. \ USB_GLD_MSR_CONFIG - 5536 page 262 Modified: cpu/x86/pc/olpc/lxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/lxmsrs.fth 2007-05-12 02:05:40 UTC (rev 375) +++ cpu/x86/pc/olpc/lxmsrs.fth 2007-05-12 02:13:18 UTC (rev 376) @@ -231,11 +231,11 @@ \ msr: 5140.001b 00000000.07770777. \ NANDF_DATA - default \ msr: 5140.001c 00000000.00000777. \ NANDF_CTL - default msr: 5140.001f 00000000.00000011. \ KEL_CTRL - msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW NAND distract, NAND ready, PM SCI OR, AC97, RTC Alarm, USB, -, SW IRQ - msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH xUART2, UART1, xKEL, SMB, -, -, -, - - msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW - msr: 5140.0023 00000000.60baa5e2. \ IRQM_ZHIGH - msr: 5140.0025 00000000.00001002. \ IRQM_LPC + msr: 5140.0020 00000000.00350a00. \ IRQM_YLOW PM SCI OR, AC97, RTC Alarm, USB, -, SW IRQ + msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH UART1 + msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW MFGPTs + msr: 5140.0023 00000000.33b006e0. \ IRQM_ZHIGH SCI-3, LID-3, CaFe-11, DCON-6, CPU-14 + msr: 5140.0025 00000000.00001002. \ IRQM_LPC Enable mouse(12) and kbd (1) \ msr: 5140.0028 00000000.00000000. \ MFGPT_IRQ off - default \ msr: 5140.0040 00000000.00000000. \ DMA_MAP - default \ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ

1 0

r375 - cpu/x86/pc/olpc
by svn＠openbios.org 12 May '07

12 May '07

Author: wmb Date: 2007-05-12 04:05:40 +0200 (Sat, 12 May 2007) New Revision: 375 Modified: cpu/x86/pc/olpc/devices.fth Log: OLPC Board ID detection - B1 and B2 were getting interchanged. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-12 01:19:37 UTC (rev 374) +++ cpu/x86/pc/olpc/devices.fth 2007-05-12 02:05:40 UTC (rev 375) @@ -248,7 +248,7 @@ endcase else h# 4c00.0014 rdmsr drop ( RSTPLL-value ) - 4 rshift 7 and 7 = if h# b28 else h# b18 then + 4 rshift 7 and 0= if h# b28 else h# b18 then then then to board-revision

1 0

r374 - dev/geode/ac97
by svn＠openbios.org 12 May '07

12 May '07

Author: wmb Date: 2007-05-12 03:19:37 +0200 (Sat, 12 May 2007) New Revision: 374 Modified: dev/geode/ac97/ac97.fth Log: OPLC Audio driver - better detection of problems communicating with the CODEC. Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-05-12 01:17:47 UTC (rev 373) +++ dev/geode/ac97/ac97.fth 2007-05-12 01:19:37 UTC (rev 374) @@ -111,23 +111,25 @@ : cmd! ( l -- ) cmd-wait au h# c + rl! ; \ : 1us ( -- ) ms-factor d# 1000 / spins ; \ : rst ( -- ) h# 40.0000 stat! 1us 0 stat! ; +: codec-ready? ( -- flag ) stat@ h# 80.0000 and 0<> ; + : codec! ( value reg# -- ) d# 24 << or h# 1.0000 or cmd! begin cmd@ h# 1.0000 and 0= until ; : codec@ ( reg# -- value ) \ 192 is a ~60us delay to wait until the status tag is cleared. - d# 192 0 do - stat@ h# 3.0000 and h# 1.0000 = if leave then - loop + + stat@ drop ( reg# ) \ Clear old status d# 24 << h# 8001.0000 or cmd! - \ wait until status valid and status tag is set. - true d# 192 0 do - stat@ h# 3.0000 and h# 3.0000 = - if drop false leave then + + \ wait until status new + true ( error? ) + d# 192 0 do ( error? ) + stat@ h# 2.0000 and if 0= leave then loop to fatal-error? - stat@ ffff and + stat@ h# ffff and ; : iand ( n1 mask -- n2 ) invert and ; @@ -336,9 +338,10 @@ : default ( -- ) 48khz disable-playback ; : open ( -- ok? ) -\ fatal-error? if false exit then map-regs + codec-ready? 0= if false exit then get-device-id + fatal-error? if false exit then default 1 h# 2a codec-set \ Enable variable rate parse-args 0= if unmap-regs false exit then

1 0

r373 - dev/geode/ac97
by svn＠openbios.org 12 May '07

12 May '07

Author: wmb Date: 2007-05-12 03:17:47 +0200 (Sat, 12 May 2007) New Revision: 373 Modified: dev/geode/ac97/selftest.fth Log: OPLC Audio selftest - lowered distortion by adjusting gains, made the tone frequency programmable, use sweep in selftest. Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2007-05-12 01:15:35 UTC (rev 372) +++ dev/geode/ac97/selftest.fth 2007-05-12 01:17:47 UTC (rev 373) @@ -40,6 +40,7 @@ record-base record-len audio-out drop write-done ; +[ifdef] notdef create sin-half d# 0 w, d# 3212 w, @@ -92,19 +93,88 @@ ; : make-wave ( -- ) + \ Start with everything quiet + record-base record-len erase + + \ Add a sine wave to the left channel for the first half of the time record-base record-len 2/ bounds ( endadr startadr ) begin 2dup u> while cycle repeat ( endadr startadr ) 2drop + \ Add a sine wave to the right channel for the last half of the time record-base record-len bounds ( endadr startadr ) record-len 2/ + wa1+ begin 2dup u> while cycle repeat ( endadr startadr ) 2drop ; +[then] -0 value raw-buf -0 value /raw-buf +fload ${BP}/forth/lib/isin.fth +d# 500 value tone-freq + +: /cycle ( -- #bytes ) #cycle /l* ; + +: make-cycle ( adr -- adr' ) + #quarter-cycle 1+ 0 do ( adr ) + i isin ( adr isin ) + 2dup swap i la+ w! ( adr isin ) + 2dup swap #half-cycle i - la+ w! ( adr isin ) + negate ( adr -isin ) + 2dup swap #half-cycle i + la+ w! ( adr -isin ) + over #cycle i - la+ w! ( adr ) + loop ( adr ) + /cycle + +; + +: make-tone-wave ( -- ) + \ Start with everything quiet + record-base record-len erase + + sample-rate to fs + tone-freq set-freq + + record-base make-cycle drop + + \ Copy the wave template into the left channel + record-base /cycle + record-len 2/ /cycle - bounds ?do + record-base i /cycle move + /cycle +loop + + \ Copy the wave template into the right channel + record-base record-len 2/ + wa1+ record-len 2/ /cycle - bounds ?do + record-base i /cycle move + /cycle +loop +; + +: copy-cycle ( adr #copies -- adr' ) + 1 ?do ( adr ) + dup /cycle - over ( adr adr- adr ) + /cycle move ( adr ) + /cycle + ( adr+ ) + loop ( adr' ) +; + +: make-wave ( -- ) + \ Start with everything quiet + record-base record-len erase + + sample-rate to fs + + record-base + 1 d# 30 do ( adr ) + i set-period ( adr ) + make-cycle ( adr ) +\ d# 42 copy-cycle ( adr' ) + d# 35 copy-cycle ( adr' ) + -1 +loop + drop + + \ Copy the left channel into the right channel + record-base record-base record-len 2/ + wa1+ record-len 2/ /w - move +; + + : selftest-args ( -- arg$ ) my-args ascii : left-parse-string 2drop ; : ?play-wav-file ( -- ) @@ -112,20 +182,40 @@ " $play-wav-loop" $find 0= if 2drop else catch drop then ; -: selftest ( -- error? ) - open 0= if ." Failed to open /audio" cr true exit then - 0 set-plevel 0 set-glevel +d# -8 value wav-plevel +d# -12 value wav-glevel +: wav-test ( -- ) + wav-plevel set-plevel wav-glevel set-glevel ?play-wav-file - record-len alloc-mem to record-base - ." Play tone" cr - 0 set-plevel d# -12 set-glevel +; + +d# -8 value tone-plevel +d# -12 value tone-glevel + +: tone-test ( -- ) + ." Playing tone" cr + \ Onset of clipping in the P domain is -7 + tone-plevel set-plevel tone-glevel set-glevel make-wave play +; + +d# -8 value rec-plevel +d# -3 value rec-glevel +: mic-test ( -- ) ." Recording ..." cr - 0 set-plevel 0 set-glevel + rec-plevel set-plevel rec-glevel set-glevel record ." Playing ..." cr play - record-base record-len free-mem +; + +: selftest ( -- error? ) + open 0= if ." Failed to open /audio" cr true exit then + wav-test + record-len la1+ alloc-mem to record-base + tone-test + mic-test + record-base record-len la1+ free-mem close false ;

1 0

r372 - forth/lib
by svn＠openbios.org 12 May '07

12 May '07

Author: wmb Date: 2007-05-12 03:15:35 +0200 (Sat, 12 May 2007) New Revision: 372 Added: forth/lib/isin.fth Log: New file - Integer sin() calculation. Added: forth/lib/isin.fth =================================================================== --- forth/lib/isin.fth (rev 0) +++ forth/lib/isin.fth 2007-05-12 01:15:35 UTC (rev 372) @@ -0,0 +1,92 @@ +purpose: Compute a fixed-point sin table +\ See license at end of file + +\ Calculate the sin function using fractional integer arithmetic +\ where the scale factor is 2^15. 1.0 is represented by 32767, +\ pi is 102943. The argument to isin ( index -- frac ) is a +\ sample index from 0 to fs/freq/4 . + +d# 16000 value fs +0 value x +0 value xsq + +d# 32767 constant one +d# 102943 constant pi + +0 value freq +0 value fstep +0 value #cycle +0 value #half-cycle +0 value #quarter-cycle + +: set-freq ( freq -- ) + dup to freq + pi * to fstep + fs freq / dup to #cycle + 2/ dup to #half-cycle + 2/ to #quarter-cycle +; +: set-period ( quarter-cycle -- ) + dup to #quarter-cycle ( quarter-cycle ) + 2* dup to #half-cycle ( half-cycle ) + 2* dup to #cycle ( cycle ) + fs over / to freq ( period ) + pi swap / fs * to fstep ( ) +; + +\ Multiply two fractional numbers where the scale factor is 2^15 +\ : times ( n1 n2 -- n3 ) d# 32767 */ ; \ Insignificantly more accurate, but slower +: times ( n1 n2 -- n3 ) * d# 15 rshift ; + +\ Computes (1 - (x^2 / divisor) * last) +: sin-step ( last divisor -- next ) xsq swap / times one min one swap - ; + +\ Taylor series expansion of sin, calculated as +\ x * (1 - (x^2/(2*3)) * (1 - (x^2/(4*5)) * (1 - (x^2/(6*7)) * (1 - (x^2/(8*9)))))) +\ This is good for the first quadrant only, i.e. 0 <= index <= fs / freq / 4 +: isin ( index -- frac ) + fstep * fs 2/ / to x + x dup times to xsq + one d# 72 sin-step d# 42 sin-step d# 20 sin-step 6 sin-step x times one max +; + +: one-cycle ( adr -- ) + #quarter-cycle 1+ 0 do ( adr ) + i isin + 2dup swap i wa+ w! ( adr isin ) + 2dup swap #half-cycle i - wa+ w! ( adr isin ) + negate ( adr -isin ) + 2dup swap #half-cycle i + wa+ w! ( adr -isin ) + over #cycle i - wa+ w! ( adr ) + loop ( adr ) + drop +; + +\ d# 16000 to fs +\ d# 150 set-freq +\ here one-cycle +\ here #cycle 2* wdump + +\ 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

r371 - dev/olpc/kb3700
by svn＠openbios.org 12 May '07

12 May '07

Author: wmb Date: 2007-05-12 03:14:39 +0200 (Sat, 12 May 2007) New Revision: 371 Modified: dev/olpc/kb3700/ecio.fth Log: OLPC EC - Added an additional interlock to the EC Port 6c command protocol, as recommended by David Lin at Quanta. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-12 01:13:43 UTC (rev 370) +++ dev/olpc/kb3700/ecio.fth 2007-05-12 01:14:39 UTC (rev 371) @@ -73,7 +73,7 @@ : 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-dat! ( b -- ) ec-wait-wr h# 68 pc! ec-wait-wr ; : ec-rb ( -- b ) 0 ec-dat! ec-dat@ ; : ec-rw ( -- w ) ec-rb ec-rb swap bwjoin ;

1 0

r370 - cpu/x86/pc/olpc
by svn＠openbios.org 12 May '07

12 May '07

Author: wmb Date: 2007-05-12 03:13:43 +0200 (Sat, 12 May 2007) New Revision: 370 Added: cpu/x86/pc/olpc/gxmsrs.fth cpu/x86/pc/olpc/lxmsrs.fth Modified: cpu/x86/pc/olpc/chipinit.fth Log: OLPC - Split the GX and LX MSR tables out into separate files. Modified: cpu/x86/pc/olpc/chipinit.fth =================================================================== --- cpu/x86/pc/olpc/chipinit.fth 2007-05-09 18:42:59 UTC (rev 369) +++ cpu/x86/pc/olpc/chipinit.fth 2007-05-12 01:13:43 UTC (rev 370) @@ -28,561 +28,9 @@ pop-base ; -create gx-msr-init -\ Memsize-dependent MSRs are set in the early startup code +fload ${BP}/cpu/x86/pc/olpc/gxmsrs.fth +fload ${BP}/cpu/x86/pc/olpc/lxmsrs.fth -\ CPU -msr: 0000.1210 00000000.00000001. \ GX p 121 Suspend on halt -msr: 0000.1900 00000000.00001131. \ GX p 174 Default + SUSP + TSC_SUSP -msr: 0000.1a00 00000000.00000001. \ GX p 178 Imprecise exceptions - -\ northbridgeinit: GLIUS -\ Already mapped in early startup -\ msr: 1000.0020 20000000.000fff80. \ 0 - 7.ffff low RAM -msr: 1000.0022 a00000fe.000ffffc. \ fe00.0000 - fe00.3fff GP -msr: 1000.0023 c00000fe.008ffffc. \ fe00.8000 - fe00.bfff VP -\ msr: 1000.0024 80000000.0a0fffe0. \ 000a.0000 - 000b.ffff DC Don't need EGA frame buffer - -\ msr: 1000.0025 000000ff.fff00000. \ Unmapped - default - -\ SMM memory (fbe) (40. is SMM_OFFSET) -\ msr: 1000.0026 2c7be040.400fffe0. \ 4040.0000 - 405f.ffff relocated to 7fe.0000 - Memsize dependent -\ msr: 1000.0027 000000ff.fff00000. \ Unmapped - default -\ msr: 1000.0028 20000007.7df00100. \ 10.000 - 077d.f000 High RAM - Memsize dependent - -\ Graphics -\ msr: 1000.0029 20a7e0fd.7fffd000. \ fd00.0000 - fd7f.ffff mapped to 77e.0000 Memsize dependent (Frame Buffer) -msr: 1000.002a 801ffcfe.007fe004. \ fe00.4000 - fe00.7fff mapped to 0 in DC space - -\ msr: 1000.002b 00000000.000fffff. \ Unmapped - default -\ msr: 1000.002c 20000000.f0000003. \ f.0000 - f.ffff Read only to expansion ROM XXX - -msr: 1000.0080 00000000.00000003. \ Coherency -msr: 1000.0083 00000000.0000ff00. \ Disable SMIs -msr: 1000.0084 00000000.0000ff00. \ Disable Async errors - -\ msr: 1000.00e0 80000000.3c0ffff0. \ IOD_BM DC - VGA registers -\ msr: 1000.00e1 80000000.3d0ffff0. \ IOD_BM DC - VGA registers -\ msr: 1000.00e3 00000000.f030ac18. \ IOD_SC - Virtual Register - ac1c-ac1f - -msr: 1000.2002 0000001f.0000001f. \ Disables SMIs -msr: 1000.2004 00000000.00000005. \ Clock gating - -\ DMA incoming maps -\ X msr: 4000.0020 20000000.000fff80. \ 0 - 7.ffff low RAM -\ X msr: 4000.0021 20000000.080fffe0. \ 8.0000 - 9.ffff low RAM -msr: 4000.0020 20000000.000fff00. \ 0 - f.ffff low RAM, route to GLIU0 -msr: 4000.0022 200000fe.000ffffc. \ fe00.0000 - fe00.03ff GP, route to GLIU0 -\ msr: 4000.0023 20000040.400fffe0. \ 4040.0000 - 4041.ffff SMM memory, route to GLIU0 -msr: 4000.0024 200000fe.004ffffc. \ fe00.4000 - fe00.7fff DC, route to GLIU0 -msr: 4000.0025 200000fe.008ffffc. \ fe00.8000 - fe00.bfff VP, route to GLIU0 -\ msr: 4000.0026 20000000.0a0fffe0. \ 000a.0000 - 000b.ffff DC in low mem; XXX - no DOS frame buffer -\ msr: 4000.0027 000000ff.fff00000. \ Unmapped - default -\ msr: 4000.0028 000000ff.fff00000. \ Unmapped - default -\ msr: 4000.0029 20000007.7df00100. \ 10.0000 - 0f7d.f000 High RAM - Memsize dependent -msr: 4000.002a 200000fd.7fffd000. \ frame buffer - fd00.0000 .. fd7f.ffff, route to GLIU0 -\ msr: 4000.002d 20000000.f0000003. \ 000f.0000 - 000f.ffff expansion ROM; XXX - no expansion ROM -msr: 4000.0080 00000000.00000001. \ Route coherency snoops from GLIU1 to GLIU0 -msr: 4000.0083 00000000.0000ff00. \ Disable SMIs - -\ msr: 4000.00e0 20000000.3c0fffe0. \ IOD_BM DC - VGA -msr: 4000.00e3 60000000.033000f0. \ GLCP - Ports f0 and f1 incoming (clear FP IRQ13) -msr: 4000.2002 0000001f.0000001f. \ Disables SMIs -msr: 4000.2004 00000000.00000005. \ Clock gating - -\ GeodeLink Priority Table -msr: 0000.2001 00000000.00000220. -msr: 4c00.2001 00000000.00000001. -msr: 5000.2001 00000000.00000027. -msr: 5800.2001 00000000.00000000. -msr: 8000.2001 00000000.00000320. - -msr: 5400.2001 00000000.00000000. \ In GX, 5400.xxxx is FooGlue, in LX it is VIP -msr: c000.2001 00000000.00040f80. -msr: c000.2004 00000000.00000155. \ Clock gating -\ msr: c000.2001 00000000.00040f80. \ DF config. - Already set - -\ Region config -\ msr: 1808 25fff002.1077e000. \ Memsize dependent -\ msr: 180a 00000000.00000000. -msr: 1800 00002000.00000022. \ Data memory - 2 outstanding write ser., - \ INVD => WBINVD, serialize load misses. -msr: 180a 00000000.00000011. \ Disable cache for table walks -msr: 1810 fd7ff000.fd000111. \ Video (write through) -msr: 1811 fe003000.fe000101. \ GP -msr: 1812 fe007000.fe004101. \ DC -msr: 1813 fe00b000.fe008101. \ VP - -\ PCI -\ msr: 50002000 00000000.00105001. \ RO -msr: 5000.2001 00000000.00000027. \ Priority 2, domain 7 -msr: 5000.2002 00000000.003f003f. \ No SMIs, please -msr: 5000.2003 00000000.00370037. \ No ERRs, please -msr: 5000.2004 00000000.00000015. \ Clock gating for 3 clocks -msr: 5000.2005 00000000.00000000. \ Enable some PCI errors -msr: 5000.2010 fff030f8.001a0215. -msr: 5000.2011 00000300.00000100. \ GLPCI_ARB -msr: 5000.2014 00000000.00f000ff. -msr: 5000.2015 35353535.35353535. -msr: 5000.2016 35353535.35353535. -msr: 5000.2017 35353535.35353535. -msr: 5000.2018 0009f000.00000130. -\ msr: 5000.2019 077df000.00100130. \ Memsize dependent -msr: 5000.201a 4041f000.40400120. -msr: 5000.201b 00000000.00000000. -msr: 5000.201c 00000000.00000000. -msr: 5000.201e 00000000.00000f00. -msr: 5000.201f 00000000.0000004b. -\ msr: 5000.201f 00000000.0000006b. \ Set below in bug workaround -\ We don't need posted I/O writes to IDE, as we have no IDE - -\ clockgating -\ msr: 5400.2004 00000000.00000000. \ Clock gating - default -\ msr: 5400.2004 00000000.00000003. \ Clock gating - -\ cpu/amd/model_gx2/cpubug.c - -\ pcideadlock(); - -\ CPU_DM_CONFIG0 - 1800 - already set correctly above -\ Interlock instruction fetches to WS regions with data accesses -msr: 00001700 00000000.00100000. - -\ We set all these to 0 (cacheable) because we -\ don't use them for the traditional DOS legacy devices. -msr: 0000180b 00000000.00000000. \ Regions a0000..bffff -msr: 0000180c 00000000.00000000. \ Regions c0000..dffff -msr: 0000180d 00000000.00000000. \ Regions e0000..fffff - -\ eng1398(); -msr: 2000.2004 00000000.00000003. \ early setup uses 1, eng1398 changes to 3 - -\ eng2900(); -msr: 0000.3003 0080a13d.00000000. \ Disables sysenter/sysexit in CPUID3 - -\ This is the Branch Target Buffer workaround -\ swapsif thing - don't do this stuff for use with FS2 -msr: 4c00.005f 00000000.00000000. \ Disable enable_actions in DIAGCTL while setting up GLCP -msr: 4c00.0016 00000000.00000000. \ Changing DBGCLKCTL register to GeodeLink -msr: 4c00.0016 00000000.00000002. \ Changing DBGCLKCTL register to GeodeLink -msr: 1000.2005 00000000.80338041. \ Send mb0 port 3 requests to upper GeodeLink diag bits -msr: 4c00.0045 5ad68000.00000000. \ set5m watches request ready from mb0 to CPU (snoop) -msr: 4c00.0044 00000000.00000140. \ SET4M will be high when state is idle (XSTATE=11) -msr: 4c00.004d 00002000.00000000. \ SET5n to watch for processor stalled state -\ Writing action number 13: XSTATE=0 to occur when CPU is snooped unless we're stalled -msr: 4c00.0075 00000000.00400000. -msr: 4c00.0073 00000000.00030000. \ Writing action number 11: inc XSTATE every GeodeLink clock unless we're idle -msr: 4c00.006d 00000000.00430000. \ Writing action number 5: STALL_CPU_PIPE when exitting idle state or not in idle state -msr: 4c00.005f 00000000.80004000. \ Writing DIAGCTL Register to enable the stall action and to let set5m watch the upper GeodeLink diag bits. -\ End swapsif thing - -\ bug118339(); -msr: 4c00.005f 00000000.00000000. \ Disable enable_actions in DIAGCTL while setting up GLCP -msr: 4c00.0042 596b8000.00000a00. \ SET2M fires if VG pri is odd (3, not 2) and Ystate=0 -msr: 4c00.0043 596b8040.00000000. \ SET3M fires if MBUS changed and VG pri is odd -msr: 1000.2005 00000000.80338041. \ Put VG request data on lower diag bus -msr: 4c00.0074 00000000.0000c000. \ Increment Y state if SET3M if true -msr: 4c00.0020 0000d863.20002000. \ Set up MBUS action to PRI=3 read of MBIU -msr: 4c00.0071 00000000.00000c00. \ Trigger MBUS action if VG=pri3 and Y=0, this blocks most PCI -msr: 4c00.005f 00000000.80004000. \ Writing DIAGCTL - -\ Already set above, but to wrong value -msr: 4c00.0042 596b8008.00000a00. \ enable FS2 even when BTB and VGTEAR SWAPSiFs are enabled - -\ bug784(); Put "Geode by NSC" in the ID -msr: 0000.3006 646f6547.80000006. -msr: 0000.3007 79622065.43534e20. -msr: 0000.3008 00000000.00000552. \ Supposed to be same as msr 3002 -msr: 0000.3009 c0c0a13d.00000000. - -\ bug118253(); -\ msr: 5000.201f 00000000.0000006b. \ Disable GLPCI PIO Post Control -\ This is irrelevant because we don't use IDE, so posting to IDE ports is a don't care - -\ disablememoryreadorder(); -msr: 2000.0019 18000108.286332a3. - -\ chipsetinit(nb); - -\ set hd IRQ -\ outl (GPIOL_2_SET, GPIOL_INPUT_ENABLE); -\ outl (GPIOL_2_SET, GPIOL_IN_AUX1_SELECT); -\ /* Allow IO read and writes during a ATA DMA operation.*/ -\ /* This could be done in the HD rom but do it here for easier debugging.*/ -\ 100 ATA_SB_GLD_MSR_ERR msr-bitclr -\ GLPCI_CRTL_PPIDE_SET GLPCI_SB_CTRL msr-bitset \ Enable Post Primary IDE - -\ Set the prefetch policy for various devices -msr: 5150.0001 0.00008f000. \ AC97 -msr: 5140.0001 0.00000f000. \ DIVIL - -\ Set up Hardware Clock Gating -msr: 5102.4004 0.000000004. \ GLIU_SB_GLD_MSR_PM -msr: 5100.0004 0.000000005. \ GLPCI_SB_GLD_MSR_PM -msr: 5170.0004 0.000000004. \ GLCP_SB_GLD_MSR_PM -\ SMBus clock gating errata (PBZ 2226 & SiBZ 3977) -msr: 5140.0004 0.050554111. \ DIVIL -msr: 5130.0004 0.000000005. \ ATA -msr: 5150.0004 0.000000005. \ AC97 - -\ setup_gx2(); - -\ Don't need this, RCONF is already set, cache is already on -\ .. size_kb = setup_gx2_cache(); - -\ 1000.0026 is already set - -\ For now we will skip the real mode IDT setup and see if -\ we can get away with it - no real mode interrupts. -\ src/cpu/amd/model_gx2/vsmsetup.c:setup_realmode_idt(); - -\ do_vsmbios(); - -\ Graphics init -msr: a000.2001 00000000.00000010. \ GP config (priority) -msr: a000.2002 00000001.00000001. \ Disable GP SMI -msr: a000.2003 00000003.00000003. \ Disable GP ERR -msr: a000.2004 00000000.00000001. \ Clock gating -msr: 8000.2001 00000000.00000320. \ VG config (priority) -msr: 8000.2002 0000001f.0000001f. \ Disable SMIs -msr: 8000.2003 0000000f.0000000f. \ Disable ERRs -\ msr: 8000.2004 00000000.00000000. \ Clock gating - default -\ msr: 8000.2004 00000000.00000055. \ Clock gating -msr: 8000.2011 00000000.00000001. \ VG SPARE - VG fetch state machine hardware fix off -msr: 8000.2012 00000000.06060202. \ VG DELAY - -\ msr: 4c00.0015 00000037.00000001. \ MCP DOTPLL reset; unnecessary because of later video init - -\ More GLCP stuff -msr: 4c00.0021 00000000.0000001b. \ GLD Action Data Control - undocumented -msr: 4c00.0022 00000000.00001001. \ GLD Action Data -msr: 4c00.2004 00000000.00000005. \ ( 15 GLCP_GLD_MSR_PM ) - -msr: 5000.2014 00000000.00ffffff. \ Enables PCI access to low mem - -\ 5536 region configs -msr: 5100.0002 00000000.007f0000. \ Disable SMIs -msr: 5101.0002 0000000f.0000000f. \ Disable SMIs - -\ msr: 5100.0010 44000020.00020013. \ PCI timings - already set -msr: 5100.0020 018b4001.018b0001. \ Region configs -msr: 5100.0021 010fc001.01000001. -msr: 5100.0022 0183c001.01800001. -msr: 5100.0023 0189c001.01880001. -msr: 5100.0024 0147c001.01400001. -msr: 5100.0025 0187c001.01840001. -msr: 5100.0026 014fc001.01480001. -msr: 5100.0027 fe01a000.fe01a001. \ OHCI -msr: 5100.0028 fe01b000.fe01b001. \ EHCI -msr: 5100.0029 efc00000.efc00001. \ UOC -msr: 5100.002b 018ac001.018a0001. -msr: 5100.002f 00084001.00084009. -msr: 5101.0020 400000ef.c00fffff. \ P2D_BM0 UOC -msr: 5101.0023 500000fe.01afffff. \ P2D_BMK Descriptor 0 OHCI -msr: 5101.0024 400000fe.01bfffff. \ P2D_BMK Descriptor 1 EHCI -msr: 5101.0083 00000000.0000ff00. \ Disable SMIs -msr: 5101.00e0 60000000.1f0ffff8. \ IOD_BM Descriptor 0 ATA IO address -msr: 5101.00e1 a0000001.480fff80. \ IOD_BM Descriptor 1 -msr: 5101.00e2 80000001.400fff80. \ IOD_BM Descriptor 2 -msr: 5101.00e3 80000001.840ffff0. \ IOD_BM Descriptor 3 -msr: 5101.00e4 00000001.858ffff8. \ IOD_BM Descriptor 4 -msr: 5101.00e5 60000001.8a0ffff0. \ IOD_BM Descriptor 5 -msr: 5101.00eb 00000000.f0301850. \ IOD_SC Descriptor 1 - -msr: 5130.0008 00000000.000018a1. \ IDE_IO_BAR - IDE bus master registers - -msr: 5140.0002 0000fbff.00000000. \ Disable SMIs - -msr: 5140.0008 0000f001.00001880. \ LBAR_IRQ -msr: 5140.0009 fffff001.fe01a000. \ LBAR_KEL (USB) -msr: 5140.000b f001.000018b0. \ LBAR_SMB -msr: 5140.000c f001.00001000. \ LBAR_GPIO -msr: 5140.000d f001.00001800. \ LBAR_MFGPT -msr: 5140.000e f001.00001840. \ LBAR_ACPI -msr: 5140.000f f001.00001400. \ LBAR_PMS -msr: 5140.0010 fffff007.20000000. \ LBAR_FLSH0 -\ msr: 5140.0011 \ LBAR_FLSH1 -\ msr: 5140.0012 \ LBAR_FLSH2 -\ msr: 5140.0013 \ LBAR_FLSH3 -\ msr: 5140.0014 00000000.80070003. \ LEG_IO already set in romreset -msr: 5140.0015 00000000.00000f7c. \ BALL_OPTS -msr: 5140.001b 00000000.00100010. \ NANDF_DATA -msr: 5140.001c 00000000.00000010. \ NANDF_CTL -msr: 5140.001f 00000000.00000011. \ KEL_CTRL -msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW -msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH -msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW -msr: 5140.0023 00000000.600aa5b2. \ IRQM_ZHIGH -msr: 5140.0025 00000000.00001002. \ IRQM_LPC -\ msr: 5140.0028 00000000.000000ff. \ MFGPT_IRQ Leave this off -msr: 5140.0040 00000000.00000000. \ DMA_MAP -\ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ -\ msr: 5140.004e 00000000.effd0080. \ LPC_SIRQ -msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ - -\ USB host controller -msr: 5120.0001 0000000b.00000000. \ USB_GLD_MSR_CONFIG - 5536 page 262 -msr: 5120.0008 0000000e.fe01a000. \ USB OHC Base Address - 5536 page 266 -msr: 5120.0009 0000000e.fe01b000. \ USB EHC Base Address - 5536 page 266 -msr: 5120.000b 00000002.efc00000. \ USB UOC Base Address - 5536 page 266 - -\ Clear possible spurious USB Short Serial detect bit per 5536 erratum 57 -msr: 5120.0015 00000010.00000000. \ USB_GLD_MSR_DIAG - -here gx-msr-init - constant /gx-msr-init - -create lx-msr-init -\ Memsize-dependent MSRs are set in the early startup code - -\ CPU - msr: 0000.1100 00000100.00005051. \ Branch tree messaging sync - msr: 0000.1210 00000000.00000003. \ Suspend on halt and pause - msr: 0000.1900 00000000.02001131. \ Pausedly 16 clocks, SUSP + TSC_SUSP - msr: 0000.1920 00000000.0000000f. \ Enable L2 cache - msr: 0000.1930 00000000.00070303. \ MSR_PMODE - msr: 0000.1981 00000000.2814d352. \ MSS_ARRAY_CTL0 - cache timings - value from PRS - msr: 0000.1982 00000000.1068334d. \ MSS_ARRAY_CTL1 - cache timings - value from PRS - msr: 0000.1983 00000106.83104104. \ MSS_ARRAY_CTL2 - cache timings - value from PRS - msr: 0000.1a00 00000000.00000001. \ Imprecise exceptions - -\ northbridgeinit: GLIUS -\ msr: 1000.0020 20000000.000fff80. \ 0 - 7.ffff low RAM Early startup -\ msr: 1000.0024 000000ff.fff00000. \ Unmapped - default - msr: 1000.0022 a00000fe.000ffffc. \ fe00.0000 - fe00.3fff GP - msr: 1000.0023 400000fe.008ffff8. \ fe00.8000 - fe00.bfff VP + VIP in GLIU1 - msr: 1000.0024 400000fe.010ffffc. \ fe01.0000 - fe01.3fff security block in GLIU1 -\ msr: 1000.0025 000000ff.fff00000. \ Unmapped - default -\ msr: 1000.0026 000000ff.fff00000. \ Unmapped - default - -\ Graphics -\ msr: 1000.0029 20a7e0fd.ffffd000. \ fd00.0000 - fdff.ffff mapped to f00.0000 Memsize dependent, fbsize dependent - msr: 1000.002a 801ffcfe.007fe004. \ fe00.4000 - fe00.7fff mapped to 0 in DC space - -\ msr: 1000.002b 00000000.000fffff. \ Unmapped - default -\ msr: 1000.002c 00000000.00000000. \ Unmapped - default (Swiss Cheese) - - msr: 1000.0080 00000000.00000003. \ Coherency - route snoops to CPU - msr: 1000.0082 80000000.00000000. \ Arbitration - msr: 1000.0083 00000000.0000ff00. \ Disable SMIs - msr: 1000.0084 00000000.0000ff00. \ Disable Async errors - -\ msr: 1000.00e0 000000ff.fff00000. \ Unmapped - default -\ msr: 1000.00e1 000000ff.fff00000. \ Unmapped - default -\ msr: 1000.00e2 000000ff.fff00000. \ Unmapped - default -\ msr: 1000.00e3 00000000.00000000. \ Unmapped - default (Swiss Cheese) - - msr: 1000.2002 0000001f.0000001f. \ Disables SMIs - msr: 1000.2004 00000000.00000005. \ Clock gating - -\ DMA incoming maps - msr: 4000.0020 20000000.000fff00. \ 0 - f.ffff low RAM, route to GLIU0 - msr: 4000.0022 200000fe.000ffffc. \ fe00.0000 - fe00.03ff GP, route to GLIU0 -\ msr: 4000.0023 000000ff.fff00000. \ Unmapped - default - msr: 4000.0024 200000fe.004ffffc. \ fe00.4000 - fe00.7fff DC, route to GLIU0 - msr: 4000.0025 400000fe.008ffffc. \ fe00.8000 - fe00.bfff VP, route to VP in GLIU1 - msr: 4000.0026 a00000fe.00cffffc. \ fe00.c000 - fe00.ffff VIP, route to VIP in GLIU1 -\ msr: 4000.0027 000000ff.fff00000. \ Unmapped - default -\ msr: 4000.0028 000000ff.fff00000. \ Unmapped - default -\ msr: 4000.0029 000000ff.fff00000. \ Unmapped - default - msr: 4000.002a 200000fd.ffffd000. \ frame buffer - fd00.0000 .. fdff.ffff, route to GLIU0, fbsize - msr: 4000.002b c00000fe.013fe010. \ Security Block - fe01.0000 .. fe01.3fff -\ msr: 4000.002c 20000007.7ff00100. \ 10.0000 - 0f7f.ffff High RAM - Memsize dependent -\ msr: 4000.002d 00000000.000fffff. \ Unmapped - default - msr: 4000.0080 00000000.00000001. \ Route coherency snoops from GLIU1 to GLIU0 - msr: 4000.0081 00000000.0000c77f. \ Port active enable - msr: 4000.0082 80000000.00000000. \ Arbitration scheduling - msr: 4000.0083 00000000.0000ffff. \ Disable SMIs - msr: 4000.0084 00000000.00000008. \ Disable AERRs -\ msr: 4000.0085 00000000.00000104. \ default -\ msr: 4000.0086 20311030.0100400a. \ default - -\ msr: 4000.00e0 20000000.3c0fffe0. \ IOD_BM DC - VGA -\ msr: 4000.00e1 000000ff.fff00000. \ Unmapped - default - msr: 4000.00e3 60000000.033000f0. \ Map reads and writes of Port F0 to GLCP, I think - msr: 4000.2002 0000001f.0000001f. \ Disables SMIs - msr: 4000.2004 00000000.00000005. \ Clock gating - -\ GeodeLink Priority Table - msr: 0000.2001 00000000.00000220. - msr: 4c00.2001 00000000.00000001. - msr: 5000.2001 00000000.00000027. - msr: 5800.2001 00000000.00000013. - msr: 8000.2001 00000000.00000320. - - msr: 0000.1700 00000000.00000400. \ Evict clean lines - necessary for L2 - -\ Region config -\ msr: 0000.1808 25fff002.1077e000. \ System RAM and ROM region configs - Memsize dependent -\ msr: 0000.180a 00000000.00000000. - msr: 0000.1800 00004000.00004022. \ Data memory - 4 outstanding write ser., evict - \ INVD => WBINVD, serialize load misses. - msr: 0000.180a 00000000.00000011. \ Disable cache for table walks - msr: 0000.180b 00000000.00000000. \ Cache a0000-bffff - msr: 0000.180c 00000000.00000000. \ Cache c0000-dffff - msr: 0000.180d 00000000.00000000. \ Cache e0000-fffff -\ msr: 0000.180e 00000001.00000001. \ SMM off - default -\ msr: 0000.180f 00000001.00000001. \ DMM off - default - msr: 0000.1810 fdfff000.fd000111. \ Video (write through), fbsize - msr: 0000.1811 fe013000.fe000101. \ GP + DC + VP + VIP + AES registers non-cacheable -\ msr: 0000.1812 00000000.00000000. \ Disabled - default -\ msr: 0000.1813 00000000.00000000. \ Disabled - default -\ msr: 0000.1814 00000000.00000000. \ Disabled - default -\ msr: 0000.1815 00000000.00000000. \ Disabled - default -\ msr: 0000.1816 00000000.00000000. \ Disabled - default -\ msr: 0000.1817 00000000.00000000. \ Disabled - default - -\ PCI -\ msr: 5000.2000 00000000.00105400. \ RO - msr: 5000.2001 00000000.00000017. \ Priority 1, domain 7 - msr: 5000.2002 00000000.003f003f. \ No SMIs - msr: 5000.2003 00000000.00370037. \ No ERRs - msr: 5000.2004 00000000.00000015. \ Clock gating for 3 clocks - msr: 5000.2005 00000000.00000000. \ Enable some PCI errors - msr: 5000.2010 fff01120.001a021d. \ PCI timings - LB has the latency timer at max - msr: 5000.2011 04000300.00800f01. \ GLPCI_ARB - LX page 581 - -\ I don't think we need to do anything special for the DOS hole from PCI -\ msr: 5000.2014 00000000.00f000ff. \ Fixed region enables - f, b, and a -\ msr: 5000.2015 30303030.30303030. \ Cache, prefetch, write combine a0000 - bffff -\ msr: 5000.2016 30303030.30303030. \ Cache, prefetch, write combine c0000 - dffff -\ msr: 5000.2017 34343434.30303030. \ Cache, prefetch, write combine e0000 - fffff, write protect f0000 - fffff - - msr: 5000.2018 000ff000.00000130. \ Cache PCI DMA to low memory 0 .. fffff -\ msr: 5000.2019 0f7ff000.00100130. \ Cache PCI DMA to high memory - Memsize dependent -\ msr: 5000.201a 4041f000.40400120. -\ msr: 5000.201a 00000000.00000000. \ Off - default - msr: 5000.201b 00000000.00000000. - msr: 5000.201c 00000000.00000000. - msr: 5000.201e 00000000.00000f00. \ PCI function number for MSR accesses to VP port - msr: 5000.201f 00000000.0000004b. -\ We don't need posted I/O writes to IDE, as we have no IDE - -\ VIP -\ msr: 5400.2004 00000000.00000005. \ Clock gating - default - -\ AES -\ msr: 5800.2002 00000007.00000007. \ SMI mask - default is all off -\ msr: 5800.2004 00000000.00000015. \ Clock gating - default - -\ chipsetinit(nb); - -\ Set the prefetch policy for various devices - msr: 5150.0001 00000000.00008f000. \ AC97 - msr: 5140.0001 00000000.00000f000. \ DIVIL - -\ Set up Hardware Clock Gating - msr: 5102.4004 00000000.000000004. \ GLIU_SB_GLD_MSR_PM - msr: 5100.0004 00000000.000000005. \ GLPCI_SB_GLD_MSR_PM - msr: 5170.0004 00000000.000000004. \ GLCP_SB_GLD_MSR_PM -\ SMBus clock gating errata (PBZ 2226 & SiBZ 3977) - msr: 5140.0004 00000000.050554111. \ DIVIL - msr: 5130.0004 00000000.000000005. \ ATA - msr: 5150.0004 00000000.000000005. \ AC97 - -\ setup_gx2(); - -\ Graphics init - msr: a000.2001 00000000.0fde0000. \ CBASE field is FB addr + 14M, fbsize - msr: a000.2002 00000001.00000001. \ Disable GP SMI - msr: a000.2003 00000003.00000003. \ Disable GP ERR - msr: a000.2004 00000000.00000001. \ Clock gating - msr: 8000.2001 00000000.00000720. \ VG config (priority) - msr: 8000.2002 1001ffff.1001ffff. \ Disable SMIs - msr: 8000.2003 0000003f.0000003f. \ Disable ERRs -\ msr: 8000.2004 00000000.00000000. \ Clock gating - default -\ msr: 8000.2004 00000000.00000055. \ Clock gating - msr: 8000.2011 00000000.00000042. \ VG SPARE - VG fetch state machine hardware fix off - msr: 8000.2012 00000000.00000302. \ VG DELAY - -\ msr: 4c00.0015 00000037.00000001. \ MCP DOTPLL reset; unnecessary because of later video init - -\ More GLCP stuff - msr: 4c00.000f f2f100ff.56960444. \ I/O buffer delay controls - LB uses 82f1.00aa.5696.0444 - \ Our value has lower drive for mem signals and more delay for BA, MA, CKE, CS, RAS, CAS, WE - - msr: 4c00.0016 00000000.00000000. \ Turn off debug clock - LB has 2 (default, GLIU1 to debug logic) -\ msr: 4c00.001e 00000000.0000603c. \ Processor throttle off delay - LB values - msr: 4c00.2004 00000000.00000015. \ Hardware clock gating for everything (Insyde uses 0x14) - - msr: 5000.2014 00000000.00ffffff. \ Enables PCI access to low mem - -[ifdef] lx-devel - msr: 4800.2001 00000000.00040c00. \ Set VP reference clock divider to 0xc, not 0xe, CRT mode -[else] -\ msr: 4800.2001 00000000.00040c08. \ Set VP reference clock divider to 0xc, not 0xe, TFT mode - msr: 4800.2001 00000000.00048c08. \ Set VP reference clock divider to 0xc, not 0xe, TFT + CRT mode -[then] - \ The datasheet says the MSR number is 4800.0011, but that is wrong - msr: 4800.2011 0000003f.dfffffff. \ Set TFT pads to registered - -\ 5536 region configs - msr: 5100.0002 00000000.007f0000. \ Disable SMIs - msr: 5101.0002 0000000f.0000000f. \ Disable SMIs - -\ msr: 5100.0010 44000020.00020013. \ PCI timings - already set - msr: 5100.0020 018b4001.018b0001. \ Region configs - msr: 5100.0021 010fc001.01000001. \ GPIO - msr: 5100.0022 0183c001.01800001. \ MFGPT - msr: 5100.0023 0189c001.01880001. \ IRQ mapper - msr: 5100.0024 0147c001.01400001. \ PMS - msr: 5100.0025 0187c001.01840001. \ ACPI - msr: 5100.0026 014fc001.01480001. \ What?? 128 bytes (0x80) - msr: 5100.0027 fe01a000.fe01a001. \ OHCI - msr: 5100.0028 fe01b000.fe01b001. \ EHCI - msr: 5100.0029 efc00000.efc00001. \ UOC - msr: 5100.002b 018ac001.018a0001. \ IDE bus master - msr: 5100.002f 00084001.00084009. \ Port 84 (what??) - msr: 5101.0020 400000ef.c00fffff. \ P2D_BM0 UOC - msr: 5101.0023 500000fe.01afffff. \ P2D_BMK Descriptor 0 OHCI - msr: 5101.0024 400000fe.01bfffff. \ P2D_BMK Descriptor 1 EHCI - msr: 5101.0083 00000000.0000ff00. \ Disable SMIs - msr: 5101.00e1 a0000001.480fff80. \ IOD_BM Descriptor 1 AC97 - msr: 5101.00e2 80000001.400fff80. \ IOD_BM Descriptor 2 PMS - msr: 5101.00e3 80000001.840fffe0. \ IOD_BM Descriptor 3 ACPI -\ msr: 5101.00e4 00000001.858ffff8. \ IOD_BM Descriptor 4 Don't carve ACPI into partially-emulated ranges - msr: 5101.00e5 60000001.8a0ffff0. \ IOD_BM Descriptor 5 bus master IDE -\ msr: 5101.00eb 00000000.f0301850. \ IOD_SC Descriptor 1 Don't carve ACPI into partially-emulated ranges - - msr: 5140.0002 0000fbff.00000000. \ Disable SMIs - - msr: 5140.0008 0000f001.00001880. \ LBAR_IRQ - msr: 5140.0009 fffff001.fe01a000. \ LBAR_KEL (USB) - msr: 5140.000b f001.000018b0. \ LBAR_SMB - msr: 5140.000c f001.00001000. \ LBAR_GPIO - msr: 5140.000d f001.00001800. \ LBAR_MFGPT - msr: 5140.000e f001.00001840. \ LBAR_ACPI - msr: 5140.000f f001.00001400. \ LBAR_PMS -\ msr: 5140.0010 fffff007.20000000. \ LBAR_FLSH0 no 5536 NAND FLASH on any LX platform -\ msr: 5140.0011 \ LBAR_FLSH1 -\ msr: 5140.0012 \ LBAR_FLSH2 -\ msr: 5140.0013 \ LBAR_FLSH3 -\ msr: 5140.0014 00000000.80070003. \ LEG_IO already set in romreset - msr: 5140.0015 00000000.00000f7d. \ BALL_OPTS - IDE pins are IDE, not NAND -\ msr: 5140.001b 00000000.07770777. \ NANDF_DATA - default -\ msr: 5140.001c 00000000.00000777. \ NANDF_CTL - default - msr: 5140.001f 00000000.00000011. \ KEL_CTRL - msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW - msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH - msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW - msr: 5140.0023 00000000.60baa5e2. \ IRQM_ZHIGH - msr: 5140.0025 00000000.00001002. \ IRQM_LPC -\ msr: 5140.0028 00000000.00000000. \ MFGPT_IRQ off - default -\ msr: 5140.0040 00000000.00000000. \ DMA_MAP - default -\ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ -\ msr: 5140.004e 00000000.effd0080. \ LPC_SIRQ - msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ - -\ USB host controller - msr: 5120.0001 0000000b.00000000. \ USB_GLD_MSR_CONFIG - 5536 page 262 - msr: 5120.0008 0000000e.fe01a000. \ USB OHC Base Address - 5536 page 266 - msr: 5120.0009 0000200e.fe01b000. \ USB EHC Base Address - 5536 page 266 FLADJ set - msr: 5120.000b 00000002.efc00000. \ USB UOC Base Address - 5536 page 266 - -\ Clear possible spurious USB Short Serial detect bit per 5536 erratum 57 - msr: 5120.0015 00000010.00000000. \ USB_GLD_MSR_DIAG - -here lx-msr-init - constant /lx-msr-init - : msr-init-range ( -- adr len ) lx? if lx-msr-init /lx-msr-init Added: cpu/x86/pc/olpc/gxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/gxmsrs.fth (rev 0) +++ cpu/x86/pc/olpc/gxmsrs.fth 2007-05-12 01:13:43 UTC (rev 370) @@ -0,0 +1,304 @@ +purpose: Table of MSR values to setup Geode GX processor on OLPC + +create gx-msr-init +\ Memsize-dependent MSRs are set in the early startup code + +\ CPU +msr: 0000.1210 00000000.00000001. \ GX p 121 Suspend on halt +msr: 0000.1900 00000000.00001131. \ GX p 174 Default + SUSP + TSC_SUSP +msr: 0000.1a00 00000000.00000001. \ GX p 178 Imprecise exceptions + +\ northbridgeinit: GLIUS +\ Already mapped in early startup +\ msr: 1000.0020 20000000.000fff80. \ 0 - 7.ffff low RAM +msr: 1000.0022 a00000fe.000ffffc. \ fe00.0000 - fe00.3fff GP +msr: 1000.0023 c00000fe.008ffffc. \ fe00.8000 - fe00.bfff VP +\ msr: 1000.0024 80000000.0a0fffe0. \ 000a.0000 - 000b.ffff DC Don't need EGA frame buffer + +\ msr: 1000.0025 000000ff.fff00000. \ Unmapped - default + +\ SMM memory (fbe) (40. is SMM_OFFSET) +\ msr: 1000.0026 2c7be040.400fffe0. \ 4040.0000 - 405f.ffff relocated to 7fe.0000 - Memsize dependent +\ msr: 1000.0027 000000ff.fff00000. \ Unmapped - default +\ msr: 1000.0028 20000007.7df00100. \ 10.000 - 077d.f000 High RAM - Memsize dependent + +\ Graphics +\ msr: 1000.0029 20a7e0fd.7fffd000. \ fd00.0000 - fd7f.ffff mapped to 77e.0000 Memsize dependent (Frame Buffer) +msr: 1000.002a 801ffcfe.007fe004. \ fe00.4000 - fe00.7fff mapped to 0 in DC space + +\ msr: 1000.002b 00000000.000fffff. \ Unmapped - default +\ msr: 1000.002c 20000000.f0000003. \ f.0000 - f.ffff Read only to expansion ROM XXX + +msr: 1000.0080 00000000.00000003. \ Coherency +msr: 1000.0083 00000000.0000ff00. \ Disable SMIs +msr: 1000.0084 00000000.0000ff00. \ Disable Async errors + +\ msr: 1000.00e0 80000000.3c0ffff0. \ IOD_BM DC - VGA registers +\ msr: 1000.00e1 80000000.3d0ffff0. \ IOD_BM DC - VGA registers +\ msr: 1000.00e3 00000000.f030ac18. \ IOD_SC - Virtual Register - ac1c-ac1f + +msr: 1000.2002 0000001f.0000001f. \ Disables SMIs +msr: 1000.2004 00000000.00000005. \ Clock gating + +\ DMA incoming maps +\ X msr: 4000.0020 20000000.000fff80. \ 0 - 7.ffff low RAM +\ X msr: 4000.0021 20000000.080fffe0. \ 8.0000 - 9.ffff low RAM +msr: 4000.0020 20000000.000fff00. \ 0 - f.ffff low RAM, route to GLIU0 +msr: 4000.0022 200000fe.000ffffc. \ fe00.0000 - fe00.03ff GP, route to GLIU0 +\ msr: 4000.0023 20000040.400fffe0. \ 4040.0000 - 4041.ffff SMM memory, route to GLIU0 +msr: 4000.0024 200000fe.004ffffc. \ fe00.4000 - fe00.7fff DC, route to GLIU0 +msr: 4000.0025 200000fe.008ffffc. \ fe00.8000 - fe00.bfff VP, route to GLIU0 +\ msr: 4000.0026 20000000.0a0fffe0. \ 000a.0000 - 000b.ffff DC in low mem; XXX - no DOS frame buffer +\ msr: 4000.0027 000000ff.fff00000. \ Unmapped - default +\ msr: 4000.0028 000000ff.fff00000. \ Unmapped - default +\ msr: 4000.0029 20000007.7df00100. \ 10.0000 - 0f7d.f000 High RAM - Memsize dependent +msr: 4000.002a 200000fd.7fffd000. \ frame buffer - fd00.0000 .. fd7f.ffff, route to GLIU0 +\ msr: 4000.002d 20000000.f0000003. \ 000f.0000 - 000f.ffff expansion ROM; XXX - no expansion ROM +msr: 4000.0080 00000000.00000001. \ Route coherency snoops from GLIU1 to GLIU0 +msr: 4000.0083 00000000.0000ff00. \ Disable SMIs + +\ msr: 4000.00e0 20000000.3c0fffe0. \ IOD_BM DC - VGA +msr: 4000.00e3 60000000.033000f0. \ GLCP - Ports f0 and f1 incoming (clear FP IRQ13) +msr: 4000.2002 0000001f.0000001f. \ Disables SMIs +msr: 4000.2004 00000000.00000005. \ Clock gating + +\ GeodeLink Priority Table +msr: 0000.2001 00000000.00000220. +msr: 4c00.2001 00000000.00000001. +msr: 5000.2001 00000000.00000027. +msr: 5800.2001 00000000.00000000. +msr: 8000.2001 00000000.00000320. + +msr: 5400.2001 00000000.00000000. \ In GX, 5400.xxxx is FooGlue, in LX it is VIP +msr: c000.2001 00000000.00040f80. +msr: c000.2004 00000000.00000155. \ Clock gating +\ msr: c000.2001 00000000.00040f80. \ DF config. - Already set + +\ Region config +\ msr: 1808 25fff002.1077e000. \ Memsize dependent +\ msr: 180a 00000000.00000000. +msr: 1800 00002000.00000022. \ Data memory - 2 outstanding write ser., + \ INVD => WBINVD, serialize load misses. +msr: 180a 00000000.00000011. \ Disable cache for table walks +msr: 1810 fd7ff000.fd000111. \ Video (write through) +msr: 1811 fe003000.fe000101. \ GP +msr: 1812 fe007000.fe004101. \ DC +msr: 1813 fe00b000.fe008101. \ VP + +\ PCI +\ msr: 50002000 00000000.00105001. \ RO +msr: 5000.2001 00000000.00000027. \ Priority 2, domain 7 +msr: 5000.2002 00000000.003f003f. \ No SMIs, please +msr: 5000.2003 00000000.00370037. \ No ERRs, please +msr: 5000.2004 00000000.00000015. \ Clock gating for 3 clocks +msr: 5000.2005 00000000.00000000. \ Enable some PCI errors +msr: 5000.2010 fff030f8.001a0215. +msr: 5000.2011 00000300.00000100. \ GLPCI_ARB +msr: 5000.2014 00000000.00f000ff. +msr: 5000.2015 35353535.35353535. +msr: 5000.2016 35353535.35353535. +msr: 5000.2017 35353535.35353535. +msr: 5000.2018 0009f000.00000130. +\ msr: 5000.2019 077df000.00100130. \ Memsize dependent +msr: 5000.201a 4041f000.40400120. +msr: 5000.201b 00000000.00000000. +msr: 5000.201c 00000000.00000000. +msr: 5000.201e 00000000.00000f00. +msr: 5000.201f 00000000.0000004b. +\ msr: 5000.201f 00000000.0000006b. \ Set below in bug workaround +\ We don't need posted I/O writes to IDE, as we have no IDE + +\ clockgating +\ msr: 5400.2004 00000000.00000000. \ Clock gating - default +\ msr: 5400.2004 00000000.00000003. \ Clock gating + +\ cpu/amd/model_gx2/cpubug.c + +\ pcideadlock(); + +\ CPU_DM_CONFIG0 - 1800 - already set correctly above +\ Interlock instruction fetches to WS regions with data accesses +msr: 00001700 00000000.00100000. + +\ We set all these to 0 (cacheable) because we +\ don't use them for the traditional DOS legacy devices. +msr: 0000180b 00000000.00000000. \ Regions a0000..bffff +msr: 0000180c 00000000.00000000. \ Regions c0000..dffff +msr: 0000180d 00000000.00000000. \ Regions e0000..fffff + +\ eng1398(); +msr: 2000.2004 00000000.00000003. \ early setup uses 1, eng1398 changes to 3 + +\ eng2900(); +msr: 0000.3003 0080a13d.00000000. \ Disables sysenter/sysexit in CPUID3 + +\ This is the Branch Target Buffer workaround +\ swapsif thing - don't do this stuff for use with FS2 +msr: 4c00.005f 00000000.00000000. \ Disable enable_actions in DIAGCTL while setting up GLCP +msr: 4c00.0016 00000000.00000000. \ Changing DBGCLKCTL register to GeodeLink +msr: 4c00.0016 00000000.00000002. \ Changing DBGCLKCTL register to GeodeLink +msr: 1000.2005 00000000.80338041. \ Send mb0 port 3 requests to upper GeodeLink diag bits +msr: 4c00.0045 5ad68000.00000000. \ set5m watches request ready from mb0 to CPU (snoop) +msr: 4c00.0044 00000000.00000140. \ SET4M will be high when state is idle (XSTATE=11) +msr: 4c00.004d 00002000.00000000. \ SET5n to watch for processor stalled state +\ Writing action number 13: XSTATE=0 to occur when CPU is snooped unless we're stalled +msr: 4c00.0075 00000000.00400000. +msr: 4c00.0073 00000000.00030000. \ Writing action number 11: inc XSTATE every GeodeLink clock unless we're idle +msr: 4c00.006d 00000000.00430000. \ Writing action number 5: STALL_CPU_PIPE when exitting idle state or not in idle state +msr: 4c00.005f 00000000.80004000. \ Writing DIAGCTL Register to enable the stall action and to let set5m watch the upper GeodeLink diag bits. +\ End swapsif thing + +\ bug118339(); +msr: 4c00.005f 00000000.00000000. \ Disable enable_actions in DIAGCTL while setting up GLCP +msr: 4c00.0042 596b8000.00000a00. \ SET2M fires if VG pri is odd (3, not 2) and Ystate=0 +msr: 4c00.0043 596b8040.00000000. \ SET3M fires if MBUS changed and VG pri is odd +msr: 1000.2005 00000000.80338041. \ Put VG request data on lower diag bus +msr: 4c00.0074 00000000.0000c000. \ Increment Y state if SET3M if true +msr: 4c00.0020 0000d863.20002000. \ Set up MBUS action to PRI=3 read of MBIU +msr: 4c00.0071 00000000.00000c00. \ Trigger MBUS action if VG=pri3 and Y=0, this blocks most PCI +msr: 4c00.005f 00000000.80004000. \ Writing DIAGCTL + +\ Already set above, but to wrong value +msr: 4c00.0042 596b8008.00000a00. \ enable FS2 even when BTB and VGTEAR SWAPSiFs are enabled + +\ bug784(); Put "Geode by NSC" in the ID +msr: 0000.3006 646f6547.80000006. +msr: 0000.3007 79622065.43534e20. +msr: 0000.3008 00000000.00000552. \ Supposed to be same as msr 3002 +msr: 0000.3009 c0c0a13d.00000000. + +\ bug118253(); +\ msr: 5000.201f 00000000.0000006b. \ Disable GLPCI PIO Post Control +\ This is irrelevant because we don't use IDE, so posting to IDE ports is a don't care + +\ disablememoryreadorder(); +msr: 2000.0019 18000108.286332a3. + +\ chipsetinit(nb); + +\ set hd IRQ +\ outl (GPIOL_2_SET, GPIOL_INPUT_ENABLE); +\ outl (GPIOL_2_SET, GPIOL_IN_AUX1_SELECT); +\ /* Allow IO read and writes during a ATA DMA operation.*/ +\ /* This could be done in the HD rom but do it here for easier debugging.*/ +\ 100 ATA_SB_GLD_MSR_ERR msr-bitclr +\ GLPCI_CRTL_PPIDE_SET GLPCI_SB_CTRL msr-bitset \ Enable Post Primary IDE + +\ Set the prefetch policy for various devices +msr: 5150.0001 0.00008f000. \ AC97 +msr: 5140.0001 0.00000f000. \ DIVIL + +\ Set up Hardware Clock Gating +msr: 5102.4004 0.000000004. \ GLIU_SB_GLD_MSR_PM +msr: 5100.0004 0.000000005. \ GLPCI_SB_GLD_MSR_PM +msr: 5170.0004 0.000000004. \ GLCP_SB_GLD_MSR_PM +\ SMBus clock gating errata (PBZ 2226 & SiBZ 3977) +msr: 5140.0004 0.050554111. \ DIVIL +msr: 5130.0004 0.000000005. \ ATA +msr: 5150.0004 0.000000005. \ AC97 + +\ setup_gx2(); + +\ Don't need this, RCONF is already set, cache is already on +\ .. size_kb = setup_gx2_cache(); + +\ 1000.0026 is already set + +\ For now we will skip the real mode IDT setup and see if +\ we can get away with it - no real mode interrupts. +\ src/cpu/amd/model_gx2/vsmsetup.c:setup_realmode_idt(); + +\ do_vsmbios(); + +\ Graphics init +msr: a000.2001 00000000.00000010. \ GP config (priority) +msr: a000.2002 00000001.00000001. \ Disable GP SMI +msr: a000.2003 00000003.00000003. \ Disable GP ERR +msr: a000.2004 00000000.00000001. \ Clock gating +msr: 8000.2001 00000000.00000320. \ VG config (priority) +msr: 8000.2002 0000001f.0000001f. \ Disable SMIs +msr: 8000.2003 0000000f.0000000f. \ Disable ERRs +\ msr: 8000.2004 00000000.00000000. \ Clock gating - default +\ msr: 8000.2004 00000000.00000055. \ Clock gating +msr: 8000.2011 00000000.00000001. \ VG SPARE - VG fetch state machine hardware fix off +msr: 8000.2012 00000000.06060202. \ VG DELAY + +\ msr: 4c00.0015 00000037.00000001. \ MCP DOTPLL reset; unnecessary because of later video init + +\ More GLCP stuff +msr: 4c00.0021 00000000.0000001b. \ GLD Action Data Control - undocumented +msr: 4c00.0022 00000000.00001001. \ GLD Action Data +msr: 4c00.2004 00000000.00000005. \ ( 15 GLCP_GLD_MSR_PM ) + +msr: 5000.2014 00000000.00ffffff. \ Enables PCI access to low mem + +\ 5536 region configs +msr: 5100.0002 00000000.007f0000. \ Disable SMIs +msr: 5101.0002 0000000f.0000000f. \ Disable SMIs + +\ msr: 5100.0010 44000020.00020013. \ PCI timings - already set +msr: 5100.0020 018b4001.018b0001. \ Region configs +msr: 5100.0021 010fc001.01000001. \ GPIO +msr: 5100.0022 0183c001.01800001. \ MFGPT +msr: 5100.0023 0189c001.01880001. \ IRQ mapper +msr: 5100.0024 0147c001.01400001. \ PMS +msr: 5100.0025 0187c001.01840001. \ ACPI +msr: 5100.0026 014fc001.01480001. \ AC97 128 bytes (0x80) +msr: 5100.0027 fe01a000.fe01a001. \ OHCI +msr: 5100.0028 fe01b000.fe01b001. \ EHCI +msr: 5100.0029 efc00000.efc00001. \ UOC +msr: 5100.002b 018ac001.018a0001. \ IDE bus master +msr: 5100.002f 00084001.00084009. \ Port 84 (what??) +msr: 5101.0020 400000ef.c00fffff. \ P2D_BM0 UOC +msr: 5101.0023 500000fe.01afffff. \ P2D_BMK Descriptor 0 OHCI +msr: 5101.0024 400000fe.01bfffff. \ P2D_BMK Descriptor 1 EHCI +msr: 5101.0083 00000000.0000ff00. \ Disable SMIs +msr: 5101.00e0 60000000.1f0ffff8. \ IOD_BM Descriptor 0 ATA IO address +msr: 5101.00e1 a0000001.480fff80. \ IOD_BM Descriptor 1 AC97 +msr: 5101.00e2 80000001.400fff80. \ IOD_BM Descriptor 2 PMS +msr: 5101.00e3 80000001.840fffe0. \ IOD_BM Descriptor 3 ACPI +\ msr: 5101.00e4 00000001.858ffff8. \ IOD_BM Descriptor 4 Don't carve ACPI into partially-emulated ranges +msr: 5101.00e5 60000001.8a0ffff0. \ IOD_BM Descriptor 5 +\ msr: 5101.00eb 00000000.f0301850. \ IOD_SC Descriptor 1 Don't carve ACPI into partially-emulated ranges + +msr: 5130.0008 00000000.000018a1. \ IDE_IO_BAR - IDE bus master registers + +msr: 5140.0002 0000fbff.00000000. \ Disable SMIs + +msr: 5140.0008 0000f001.00001880. \ LBAR_IRQ +msr: 5140.0009 fffff001.fe01a000. \ LBAR_KEL (USB) +msr: 5140.000b f001.000018b0. \ LBAR_SMB +msr: 5140.000c f001.00001000. \ LBAR_GPIO +msr: 5140.000d f001.00001800. \ LBAR_MFGPT +msr: 5140.000e f001.00001840. \ LBAR_ACPI +msr: 5140.000f f001.00001400. \ LBAR_PMS +msr: 5140.0010 fffff007.20000000. \ LBAR_FLSH0 +\ msr: 5140.0011 \ LBAR_FLSH1 +\ msr: 5140.0012 \ LBAR_FLSH2 +\ msr: 5140.0013 \ LBAR_FLSH3 +\ msr: 5140.0014 00000000.80070003. \ LEG_IO already set in romreset +msr: 5140.0015 00000000.00000f7c. \ BALL_OPTS +msr: 5140.001b 00000000.00100010. \ NANDF_DATA +msr: 5140.001c 00000000.00000010. \ NANDF_CTL +msr: 5140.001f 00000000.00000011. \ KEL_CTRL +msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW +msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH +msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW +msr: 5140.0023 00000000.600aa5b2. \ IRQM_ZHIGH +msr: 5140.0025 00000000.00001002. \ IRQM_LPC +\ msr: 5140.0028 00000000.000000ff. \ MFGPT_IRQ Leave this off +msr: 5140.0040 00000000.00000000. \ DMA_MAP +\ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ +\ msr: 5140.004e 00000000.effd0080. \ LPC_SIRQ +msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ + +\ USB host controller +msr: 5120.0001 0000000b.00000000. \ USB_GLD_MSR_CONFIG - 5536 page 262 +msr: 5120.0008 0000000e.fe01a000. \ USB OHC Base Address - 5536 page 266 +msr: 5120.0009 0000000e.fe01b000. \ USB EHC Base Address - 5536 page 266 +msr: 5120.000b 00000002.efc00000. \ USB UOC Base Address - 5536 page 266 + +\ Clear possible spurious USB Short Serial detect bit per 5536 erratum 57 +msr: 5120.0015 00000010.00000000. \ USB_GLD_MSR_DIAG + +here gx-msr-init - constant /gx-msr-init Added: cpu/x86/pc/olpc/lxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/lxmsrs.fth (rev 0) +++ cpu/x86/pc/olpc/lxmsrs.fth 2007-05-12 01:13:43 UTC (rev 370) @@ -0,0 +1,254 @@ +purpose: Table of MSR values to setup Geode LX processor on OLPC + +create lx-msr-init +\ Memsize-dependent MSRs are set in the early startup code + +\ CPU + msr: 0000.1100 00000100.00005051. \ Branch tree messaging sync + msr: 0000.1210 00000000.00000003. \ Suspend on halt and pause + msr: 0000.1900 00000000.02001131. \ Pausedly 16 clocks, SUSP + TSC_SUSP + msr: 0000.1920 00000000.0000000f. \ Enable L2 cache + msr: 0000.1930 00000000.00070303. \ MSR_PMODE + msr: 0000.1981 00000000.2814d352. \ MSS_ARRAY_CTL0 - cache timings - value from PRS + msr: 0000.1982 00000000.1068334d. \ MSS_ARRAY_CTL1 - cache timings - value from PRS + msr: 0000.1983 00000106.83104104. \ MSS_ARRAY_CTL2 - cache timings - value from PRS + msr: 0000.1a00 00000000.00000001. \ Imprecise exceptions + +\ northbridgeinit: GLIUS +\ msr: 1000.0020 20000000.000fff80. \ 0 - 7.ffff low RAM Early startup +\ msr: 1000.0024 000000ff.fff00000. \ Unmapped - default + msr: 1000.0022 a00000fe.000ffffc. \ fe00.0000 - fe00.3fff GP + msr: 1000.0023 400000fe.008ffff8. \ fe00.8000 - fe00.bfff VP + VIP in GLIU1 + msr: 1000.0024 400000fe.010ffffc. \ fe01.0000 - fe01.3fff security block in GLIU1 +\ msr: 1000.0025 000000ff.fff00000. \ Unmapped - default +\ msr: 1000.0026 000000ff.fff00000. \ Unmapped - default + +\ Graphics +\ msr: 1000.0029 20a7e0fd.ffffd000. \ fd00.0000 - fdff.ffff mapped to f00.0000 Memsize dependent, fbsize dependent + msr: 1000.002a 801ffcfe.007fe004. \ fe00.4000 - fe00.7fff mapped to 0 in DC space + +\ msr: 1000.002b 00000000.000fffff. \ Unmapped - default +\ msr: 1000.002c 00000000.00000000. \ Unmapped - default (Swiss Cheese) + + msr: 1000.0080 00000000.00000003. \ Coherency - route snoops to CPU + msr: 1000.0082 80000000.00000000. \ Arbitration + msr: 1000.0083 00000000.0000ff00. \ Disable SMIs + msr: 1000.0084 00000000.0000ff00. \ Disable Async errors + +\ msr: 1000.00e0 000000ff.fff00000. \ Unmapped - default +\ msr: 1000.00e1 000000ff.fff00000. \ Unmapped - default +\ msr: 1000.00e2 000000ff.fff00000. \ Unmapped - default +\ msr: 1000.00e3 00000000.00000000. \ Unmapped - default (Swiss Cheese) + + msr: 1000.2002 0000001f.0000001f. \ Disables SMIs + msr: 1000.2004 00000000.00000005. \ Clock gating + +\ DMA incoming maps + msr: 4000.0020 20000000.000fff00. \ 0 - f.ffff low RAM, route to GLIU0 + msr: 4000.0022 200000fe.000ffffc. \ fe00.0000 - fe00.03ff GP, route to GLIU0 +\ msr: 4000.0023 000000ff.fff00000. \ Unmapped - default + msr: 4000.0024 200000fe.004ffffc. \ fe00.4000 - fe00.7fff DC, route to GLIU0 + msr: 4000.0025 400000fe.008ffffc. \ fe00.8000 - fe00.bfff VP, route to VP in GLIU1 + msr: 4000.0026 a00000fe.00cffffc. \ fe00.c000 - fe00.ffff VIP, route to VIP in GLIU1 +\ msr: 4000.0027 000000ff.fff00000. \ Unmapped - default +\ msr: 4000.0028 000000ff.fff00000. \ Unmapped - default +\ msr: 4000.0029 000000ff.fff00000. \ Unmapped - default + msr: 4000.002a 200000fd.ffffd000. \ frame buffer - fd00.0000 .. fdff.ffff, route to GLIU0, fbsize + msr: 4000.002b c00000fe.013fe010. \ Security Block - fe01.0000 .. fe01.3fff +\ msr: 4000.002c 20000007.7ff00100. \ 10.0000 - 0f7f.ffff High RAM - Memsize dependent +\ msr: 4000.002d 00000000.000fffff. \ Unmapped - default + msr: 4000.0080 00000000.00000001. \ Route coherency snoops from GLIU1 to GLIU0 + msr: 4000.0081 00000000.0000c77f. \ Port active enable + msr: 4000.0082 80000000.00000000. \ Arbitration scheduling + msr: 4000.0083 00000000.0000ffff. \ Disable SMIs + msr: 4000.0084 00000000.00000008. \ Disable AERRs +\ msr: 4000.0085 00000000.00000104. \ default +\ msr: 4000.0086 20311030.0100400a. \ default + +\ msr: 4000.00e0 20000000.3c0fffe0. \ IOD_BM DC - VGA +\ msr: 4000.00e1 000000ff.fff00000. \ Unmapped - default + msr: 4000.00e3 60000000.033000f0. \ Map reads and writes of Port F0 to GLCP, I think + msr: 4000.2002 0000001f.0000001f. \ Disables SMIs + msr: 4000.2004 00000000.00000005. \ Clock gating + +\ GeodeLink Priority Table + msr: 0000.2001 00000000.00000220. + msr: 4c00.2001 00000000.00000001. + msr: 5000.2001 00000000.00000027. + msr: 5800.2001 00000000.00000013. + msr: 8000.2001 00000000.00000320. + + msr: 0000.1700 00000000.00000400. \ Evict clean lines - necessary for L2 + +\ Region config +\ msr: 0000.1808 25fff002.1077e000. \ System RAM and ROM region configs - Memsize dependent +\ msr: 0000.180a 00000000.00000000. + msr: 0000.1800 00004000.00004022. \ Data memory - 4 outstanding write ser., evict + \ INVD => WBINVD, serialize load misses. + msr: 0000.180a 00000000.00000011. \ Disable cache for table walks + msr: 0000.180b 00000000.00000000. \ Cache a0000-bffff + msr: 0000.180c 00000000.00000000. \ Cache c0000-dffff + msr: 0000.180d 00000000.00000000. \ Cache e0000-fffff +\ msr: 0000.180e 00000001.00000001. \ SMM off - default +\ msr: 0000.180f 00000001.00000001. \ DMM off - default + msr: 0000.1810 fdfff000.fd000111. \ Video (write through), fbsize + msr: 0000.1811 fe013000.fe000101. \ GP + DC + VP + VIP + AES registers non-cacheable +\ msr: 0000.1812 00000000.00000000. \ Disabled - default +\ msr: 0000.1813 00000000.00000000. \ Disabled - default +\ msr: 0000.1814 00000000.00000000. \ Disabled - default +\ msr: 0000.1815 00000000.00000000. \ Disabled - default +\ msr: 0000.1816 00000000.00000000. \ Disabled - default +\ msr: 0000.1817 00000000.00000000. \ Disabled - default + +\ PCI +\ msr: 5000.2000 00000000.00105400. \ RO + msr: 5000.2001 00000000.00000017. \ Priority 1, domain 7 + msr: 5000.2002 00000000.003f003f. \ No SMIs + msr: 5000.2003 00000000.00370037. \ No ERRs + msr: 5000.2004 00000000.00000015. \ Clock gating for 3 clocks + msr: 5000.2005 00000000.00000000. \ Enable some PCI errors + msr: 5000.2010 fff01120.001a021d. \ PCI timings - LB has the latency timer at max + msr: 5000.2011 04000300.00800f01. \ GLPCI_ARB - LX page 581 + +\ I don't think we need to do anything special for the DOS hole from PCI +\ msr: 5000.2014 00000000.00f000ff. \ Fixed region enables - f, b, and a +\ msr: 5000.2015 30303030.30303030. \ Cache, prefetch, write combine a0000 - bffff +\ msr: 5000.2016 30303030.30303030. \ Cache, prefetch, write combine c0000 - dffff +\ msr: 5000.2017 34343434.30303030. \ Cache, prefetch, write combine e0000 - fffff, write protect f0000 - fffff + + msr: 5000.2018 000ff000.00000130. \ Cache PCI DMA to low memory 0 .. fffff +\ msr: 5000.2019 0f7ff000.00100130. \ Cache PCI DMA to high memory - Memsize dependent +\ msr: 5000.201a 4041f000.40400120. +\ msr: 5000.201a 00000000.00000000. \ Off - default + msr: 5000.201b 00000000.00000000. + msr: 5000.201c 00000000.00000000. + msr: 5000.201e 00000000.00000f00. \ PCI function number for MSR accesses to VP port + msr: 5000.201f 00000000.0000004b. +\ We don't need posted I/O writes to IDE, as we have no IDE + +\ VIP +\ msr: 5400.2004 00000000.00000005. \ Clock gating - default + +\ AES +\ msr: 5800.2002 00000007.00000007. \ SMI mask - default is all off +\ msr: 5800.2004 00000000.00000015. \ Clock gating - default + +\ chipsetinit(nb); + +\ Set the prefetch policy for various devices + msr: 5150.0001 00000000.00008f000. \ AC97 + msr: 5140.0001 00000000.00000f000. \ DIVIL + +\ Set up Hardware Clock Gating + msr: 5102.4004 00000000.000000004. \ GLIU_SB_GLD_MSR_PM + msr: 5100.0004 00000000.000000005. \ GLPCI_SB_GLD_MSR_PM + msr: 5170.0004 00000000.000000004. \ GLCP_SB_GLD_MSR_PM +\ SMBus clock gating errata (PBZ 2226 & SiBZ 3977) + msr: 5140.0004 00000000.050554111. \ DIVIL + msr: 5130.0004 00000000.000000005. \ ATA + msr: 5150.0004 00000000.000000005. \ AC97 + +\ setup_gx2(); + +\ Graphics init + msr: a000.2001 00000000.0fde0000. \ CBASE field is FB addr + 14M, fbsize + msr: a000.2002 00000001.00000001. \ Disable GP SMI + msr: a000.2003 00000003.00000003. \ Disable GP ERR + msr: a000.2004 00000000.00000001. \ Clock gating + msr: 8000.2001 00000000.00000720. \ VG config (priority) + msr: 8000.2002 1001ffff.1001ffff. \ Disable SMIs + msr: 8000.2003 0000003f.0000003f. \ Disable ERRs +\ msr: 8000.2004 00000000.00000000. \ Clock gating - default +\ msr: 8000.2004 00000000.00000055. \ Clock gating + msr: 8000.2011 00000000.00000042. \ VG SPARE - VG fetch state machine hardware fix off + msr: 8000.2012 00000000.00000302. \ VG DELAY + +\ msr: 4c00.0015 00000037.00000001. \ MCP DOTPLL reset; unnecessary because of later video init + +\ More GLCP stuff + msr: 4c00.000f f2f100ff.56960444. \ I/O buffer delay controls - LB uses 82f1.00aa.5696.0444 + \ Our value has lower drive for mem signals and more delay for BA, MA, CKE, CS, RAS, CAS, WE + + msr: 4c00.0016 00000000.00000000. \ Turn off debug clock - LB has 2 (default, GLIU1 to debug logic) +\ msr: 4c00.001e 00000000.0000603c. \ Processor throttle off delay - LB values + msr: 4c00.2004 00000000.00000015. \ Hardware clock gating for everything (Insyde uses 0x14) + + msr: 5000.2014 00000000.00ffffff. \ Enables PCI access to low mem + +[ifdef] lx-devel + msr: 4800.2001 00000000.00040c00. \ Set VP reference clock divider to 0xc, not 0xe, CRT mode +[else] +\ msr: 4800.2001 00000000.00040c08. \ Set VP reference clock divider to 0xc, not 0xe, TFT mode + msr: 4800.2001 00000000.00048c08. \ Set VP reference clock divider to 0xc, not 0xe, TFT + CRT mode +[then] + \ The datasheet says the MSR number is 4800.0011, but that is wrong + msr: 4800.2011 0000003f.dfffffff. \ Set TFT pads to registered + +\ 5536 region configs + msr: 5100.0002 00000000.007f0000. \ Disable SMIs + msr: 5101.0002 0000000f.0000000f. \ Disable SMIs + +\ msr: 5100.0010 44000020.00020013. \ PCI timings - already set + msr: 5100.0020 018b4001.018b0001. \ Region configs + msr: 5100.0021 010fc001.01000001. \ GPIO + msr: 5100.0022 0183c001.01800001. \ MFGPT + msr: 5100.0023 0189c001.01880001. \ IRQ mapper + msr: 5100.0024 0147c001.01400001. \ PMS + msr: 5100.0025 0187c001.01840001. \ ACPI + msr: 5100.0026 014fc001.01480001. \ AC97 128 bytes (0x80) + msr: 5100.0027 fe01a000.fe01a001. \ OHCI + msr: 5100.0028 fe01b000.fe01b001. \ EHCI + msr: 5100.0029 efc00000.efc00001. \ UOC + msr: 5100.002b 018ac001.018a0001. \ IDE bus master + msr: 5100.002f 00084001.00084009. \ Port 84 (what??) + msr: 5101.0020 400000ef.c00fffff. \ P2D_BM0 UOC + msr: 5101.0023 500000fe.01afffff. \ P2D_BMK Descriptor 0 OHCI + msr: 5101.0024 400000fe.01bfffff. \ P2D_BMK Descriptor 1 EHCI + msr: 5101.0083 00000000.0000ff00. \ Disable SMIs + msr: 5101.00e0 60000000.1f0ffff8. \ IOD_BM Descriptor 0 ATA IO address + msr: 5101.00e1 a0000001.480fff80. \ IOD_BM Descriptor 1 AC97 + msr: 5101.00e2 80000001.400fff80. \ IOD_BM Descriptor 2 PMS + msr: 5101.00e3 80000001.840fffe0. \ IOD_BM Descriptor 3 ACPI +\ msr: 5101.00e4 00000001.858ffff8. \ IOD_BM Descriptor 4 Don't carve ACPI into partially-emulated ranges + msr: 5101.00e5 60000001.8a0ffff0. \ IOD_BM Descriptor 5 bus master IDE +\ msr: 5101.00eb 00000000.f0301850. \ IOD_SC Descriptor 1 Don't carve ACPI into partially-emulated ranges + + msr: 5140.0002 0000fbff.00000000. \ Disable SMIs + + msr: 5140.0008 0000f001.00001880. \ LBAR_IRQ + msr: 5140.0009 fffff001.fe01a000. \ LBAR_KEL (USB) + msr: 5140.000b f001.000018b0. \ LBAR_SMB + msr: 5140.000c f001.00001000. \ LBAR_GPIO + msr: 5140.000d f001.00001800. \ LBAR_MFGPT + msr: 5140.000e f001.00001840. \ LBAR_ACPI + msr: 5140.000f f001.00001400. \ LBAR_PMS +\ msr: 5140.0010 fffff007.20000000. \ LBAR_FLSH0 no 5536 NAND FLASH on any LX platform +\ msr: 5140.0011 \ LBAR_FLSH1 +\ msr: 5140.0012 \ LBAR_FLSH2 +\ msr: 5140.0013 \ LBAR_FLSH3 +\ msr: 5140.0014 00000000.80070003. \ LEG_IO already set in romreset + msr: 5140.0015 00000000.00000f7d. \ BALL_OPTS - IDE pins are IDE, not NAND +\ msr: 5140.001b 00000000.07770777. \ NANDF_DATA - default +\ msr: 5140.001c 00000000.00000777. \ NANDF_CTL - default + msr: 5140.001f 00000000.00000011. \ KEL_CTRL + msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW NAND distract, NAND ready, PM SCI OR, AC97, RTC Alarm, USB, -, SW IRQ + msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH xUART2, UART1, xKEL, SMB, -, -, -, - + msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW + msr: 5140.0023 00000000.60baa5e2. \ IRQM_ZHIGH + msr: 5140.0025 00000000.00001002. \ IRQM_LPC +\ msr: 5140.0028 00000000.00000000. \ MFGPT_IRQ off - default +\ msr: 5140.0040 00000000.00000000. \ DMA_MAP - default +\ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ +\ msr: 5140.004e 00000000.effd0080. \ LPC_SIRQ + msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ - Active high bit 12 (mouse) and 2 (kbd), Enable, Quiet, 17 frames + +\ USB host controller + msr: 5120.0001 0000000b.00000000. \ USB_GLD_MSR_CONFIG - 5536 page 262 + msr: 5120.0008 0000000e.fe01a000. \ USB OHC Base Address - 5536 page 266 + msr: 5120.0009 0000200e.fe01b000. \ USB EHC Base Address - 5536 page 266 FLADJ set + msr: 5120.000b 00000002.efc00000. \ USB UOC Base Address - 5536 page 266 + +\ Clear possible spurious USB Short Serial detect bit per 5536 erratum 57 + msr: 5120.0015 00000010.00000000. \ USB_GLD_MSR_DIAG + +here lx-msr-init - constant /lx-msr-init

1 0

r369 - cpu/x86 dev/geode/ac97
by svn＠openbios.org 09 May '07

09 May '07

Author: wmb Date: 2007-05-09 20:42:59 +0200 (Wed, 09 May 2007) New Revision: 369 Modified: cpu/x86/adpcm.fth dev/geode/ac97/selftest.fth Log: Audio support for non-compressed wav files. Modified: cpu/x86/adpcm.fth =================================================================== --- cpu/x86/adpcm.fth 2007-05-09 18:42:03 UTC (rev 368) +++ cpu/x86/adpcm.fth 2007-05-09 18:42:59 UTC (rev 369) @@ -1,6 +1,13 @@ \ See license at end of file purpose: decode IMA/DVI ADPCM .wav file +2 value #output-ch \ Number of output channels +0 value audio-ih \ /audio ihandle +0 value /pcm-output \ Size of uncompressed buffer +defer (play-pcm) + +: $call-audio ( ... method -- ... ) audio-ih $call-method ; + \ Uncompressed data format: \ 16-bit Left, 16-bit Right, ... \ @@ -107,7 +114,7 @@ ; : adpcm-decode-blk ( in out #sample -- ) - #ch 0 ?do ( in out #sample ) + #ch #output-ch min 0 ?do ( in out #sample ) 2 pick i /l * + ( in out #sample in' ) 2 pick i /w * + ( in out #sample in out' ) init-ch-vars ( in out #sample in' out' ) @@ -121,20 +128,20 @@ stepsize-table to 'stepsize-table dup to blk-size ( in out #sample #ch blk-size ) - over 4 * - 1+ to #sample/blk ( in out #sample #ch ) + over 4 * - 2* over / 1+ to #sample/blk ( in out #sample #ch ) dup to #ch ( in out #sample #ch ) - dup /l * to in-skip ( in out #sample #ch ) - /w * to out-skip ( in out #sample ) + /l * to in-skip ( in out #sample ) + #output-ch /w * to out-skip ( in out #sample ) begin dup 0> while ( in out #sample ) 3dup #sample/blk min adpcm-decode-blk rot blk-size + ( out #sample in' ) - rot #sample/blk #ch * wa+ ( #sample in out' ) + rot #sample/blk #output-ch * wa+ ( #sample in out' ) rot #sample/blk - ( in out #sample' ) repeat 3drop ; -\ Decode an .wav file +\ Decode a .wav file \ \ .wav file format: \ "RIFF" L<len of file> "WAVE" @@ -148,6 +155,26 @@ \ W<sample> B<index> B<0> per channel \ (block size - 1) samples of compressed data +0 value wav-fmt-adr +0 value wav-fact-adr +0 value wav-data-adr + +: .wav-cc ( cc -- ) + case + 0 of ." unknown" endof + 1 of ." PCM" endof + 2 of ." MS ADPCM" endof + 6 of ." ITU G.711 a-law" endof + 7 of ." ITU G.711 au-law" endof + h# 11 of ." IMA ADPCM" endof + h# 16 of ." ITU G.723 ADPCM" endof + h# 31 of ." GSM 6.10" endof + h# 40 of ." ITU G.721 ADPCM" endof + h# 50 of ." MPEG" endof + ( default ) ." unknown code: " dup u. + endcase +; + : find-wav-chunk? ( in chunk$ -- in' true | false ) rot dup 4 + le-l@ over + swap h# c + ( chunk$ in-end in' ) begin 2dup u> while ( chunk$ in-end in ) @@ -163,43 +190,111 @@ dup " RIFF" comp swap 8 + " WAVE" comp or 0= ; -: fmt-ok? ( in -- #ch blk-size true | false ) - " fmt " find-wav-chunk? 0= if false exit then ( in' ) - dup 8 + le-w@ h# 11 = \ compression code: DVI_ADPCM - over h# 16 + le-w@ 4 = and if \ bits/sample - dup h# a + le-w@ ( #ch ) - swap h# 14 + le-w@ true ( #ch blk-size true ) +: parse-wav-ok? ( in -- ok? ) + 0 to wav-fmt-adr 0 to wav-fact-adr 0 to wav-data-adr + dup wav-ok? 0= if drop false exit then + dup " fmt " find-wav-chunk? if to wav-fmt-adr then + dup " fact" find-wav-chunk? if to wav-fact-adr then + " data" find-wav-chunk? if 8 + to wav-data-adr then + wav-fmt-adr 0= wav-data-adr 0= or not +; + +: wav-cc ( -- cc ) wav-fmt-adr dup if 8 + le-w@ then ; +: wav-in-#ch ( -- #ch ) wav-fmt-adr dup if h# a + le-w@ then ; +: wav-#sample ( -- #sample ) wav-fact-adr dup if 8 + le-l@ then ; +: wav-blk-size ( -- blk-size ) wav-fmt-adr dup if h# 14 + le-w@ then ; + +: set-sample-rate ( -- ) + wav-fmt-adr ?dup if h# c + le-l@ " set-sample-rate" $call-audio then +; + +0 value out-move +: condense-pcm ( adr -- ) + wav-in-#ch #output-ch - /w * to in-skip + #output-ch /w * to out-move + dup dup 4 - le-l@ bounds ?do ( out ) + i over out-move move ( out ) + out-move + ( out' ) + in-skip +loop drop ( ) +; +: expand-pcm ( adr -- ) + #output-ch wav-in-#ch - /w * to out-skip + wav-in-#ch /w * to out-move + dup dup 4 - le-l@ bounds swap out-move - ( out in-begin in-end ) + begin 2dup u< while ( out in-begin in ) + dup 3 pick out-move move ( out in-begin in ) + out-move - rot out-move + -rot ( out' in-begin in' ) + 2 pick out-skip erase ( out in-begin in ) + rot out-skip + -rot ( out' in-begin in ) + repeat 3drop ( ) +; + +: play-pcm-once ( adr len -- ) " write" $call-audio drop " write-done" $call-audio ; +: play-pcm-loop ( adr len -- ) + ." Press a key to abort" cr + begin 2dup play-pcm-once key? until key drop 2drop +; +' play-pcm-once to (play-pcm) + +: play-pcm ( adr -- error? ) + wav-in-#ch 0= if drop true exit then + set-sample-rate + wav-data-adr 4 - le-l@ to /pcm-output + wav-in-#ch #output-ch = if + /pcm-output (play-pcm) \ Play straight from the source else - drop false ( false ) - then + /pcm-output wav-in-#ch / #output-ch * to /pcm-output + #output-ch wav-in-#ch < if + dup condense-pcm \ Skip extra channel data + /pcm-output (play-pcm) + else + dup expand-pcm \ Convert mono to stereo + /pcm-output (play-pcm) + then then + false ; -: fact-ok? ( in -- #sample true | false ) - " fact" find-wav-chunk? dup if swap 8 + le-l@ swap then +: play-ima-adpcm ( adr -- error? ) + wav-fact-adr 0= if drop true exit then + set-sample-rate + wav-#sample #output-ch * /w * to /pcm-output + \ Because alloc-mem does not guarantee contiguous physical memory, use load-base area. + loaded + pagesize round-up tuck ( out in out ) + dup /pcm-output erase ( out in out ) + wav-#sample wav-in-#ch wav-blk-size ( out in out #sample #ch blk-size ) + adpcm-decoder ( out ) + /pcm-output (play-pcm) ( ) + false ( error? ) ; -: data-ok? ( in -- in' true | false ) - " data" find-wav-chunk? dup if swap 8 + swap then +: (play-wav) ( adr -- error? ) + parse-wav-ok? not if ." Not a .wav file" cr true exit then + " /audio" open-dev ?dup 0= if ." Cannot open audio device" cr true exit then + to audio-ih + wav-cc case + 1 of wav-data-adr play-pcm endof + h# 11 of wav-data-adr play-ima-adpcm endof + ( default ) ." Cannot play .wav format type: " dup .wav-cc true swap cr + endcase + audio-ih close-dev ; -: adpcm-decode ( in out -- actual ) - over wav-ok? not if 2drop 0 exit then ( in out ) - swap dup data-ok? not if 2drop 0 exit then ( out in in' ) - -rot dup fact-ok? not if 3drop 0 exit then ( in' out in #sample ) - swap fmt-ok? not if 3drop 0 exit then ( in' out #sample #ch blk-size ) - 2 pick 2 pick /w * * >r ( in' out #sample #ch blk-size ) ( R: actual ) - adpcm-decoder r> ( actual ) +: ($play-wav) ( file-str -- ) + boot-read + load-base (play-wav) abort" Error playing wav file" ; -: adpcm-size ( in -- actual ) - dup wav-ok? not if drop 0 exit then ( in ) - dup fact-ok? not if drop 0 exit then ( in #sample ) - swap fmt-ok? not if drop 0 exit then ( #sample #ch blk-size ) - drop /w * * ( actual ) +: $play-wav ( file-str -- ) ['] play-pcm-once to (play-pcm) ($play-wav) ; +: play-wav ( "filename< >" -- ) safe-parse-word $play-wav ; + +: $play-wav-loop ( file-str -- ) + ['] play-pcm-loop to (play-pcm) + ($play-wav) ; +: play-wav-loop ( "filename< >" -- ) safe-parse-word $play-wav-loop ; \ LICENSE_BEGIN -\ Copyright (c) 2007 FirmWorks +\ 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 Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2007-05-09 18:42:03 UTC (rev 368) +++ dev/geode/ac97/selftest.fth 2007-05-09 18:42:59 UTC (rev 369) @@ -109,32 +109,7 @@ : ?play-wav-file ( -- ) selftest-args dup 0= if 2drop exit then - - \ Read the .wav file - 2dup ." Play " type cr - " boot-read" evaluate - - \ Allocate raw audio buffer - " loaded" evaluate 0= if drop exit then \ No data loaded - " adpcm-size" evaluate ( /raw-buf ) - ?dup 0= if exit then \ Not an IMA ADPCM .wav file - dup to /raw-buf alloc-mem to raw-buf ( ) - - \ Decode the .wav file - " load-base" evaluate ( in ) - raw-buf " adpcm-decode" evaluate ( /raw-buf ) ( R: len wav-buf ) - ?dup 0= if exit then \ Not an IMA ADPCM .wav file - - \ Play the raw audio data - ." Press a key to abort" cr - open-out plevel set-pcm-gain glevel h# 38 codec! - begin - raw-buf /raw-buf audio-out drop - key? until write-done - key drop - - \ Release the raw audio buffer - raw-buf /raw-buf free-mem 0 to raw-buf 0 to /raw-buf + " $play-wav-loop" $find 0= if 2drop else catch drop then ; : selftest ( -- error? )

1 0

r368 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 09 May '07

09 May '07

Author: wmb Date: 2007-05-09 20:42:03 +0200 (Wed, 09 May 2007) New Revision: 368 Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/fw.bth dev/olpc/kb3700/ecio.fth Log: OLPC - Fixed a problem with the EC command protocol and reverted to the use of it for board ID and game-key interaction. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-07 21:32:22 UTC (rev 367) +++ cpu/x86/pc/olpc/devices.fth 2007-05-09 18:42:03 UTC (rev 368) @@ -242,8 +242,7 @@ h# a18 else lx? if -\ board-id@ case - snoop-board-id@ case + board-id@ case h# b2 of h# b30 endof \ preB3 ( board-id ) dup h# 10 * 8 + swap \ E.g. b3 -> b38 endcase Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-07 21:32:22 UTC (rev 367) +++ cpu/x86/pc/olpc/fw.bth 2007-05-09 18:42:03 UTC (rev 368) @@ -432,7 +432,7 @@ : user-switch? ( -- flag ) [ifdef] lx-devel false exit [then] -true exit + atest? if true exit then game-key@ 0<> dup if ." Release the game key to continue" cr begin d# 100 ms game-key@ 0= until Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-07 21:32:22 UTC (rev 367) +++ dev/olpc/kb3700/ecio.fth 2007-05-09 18:42:03 UTC (rev 368) @@ -44,18 +44,18 @@ : ec-release ( -- ) h# ff h# 6c pc! 1 ms h# 68 pc@ drop ; : ec-wait-wr ( -- ) - d# 70 0 do + d# 140 0 do ec-cmd@ 2 and 0= if unloop exit then - d# 10 ms + 5 ms loop ." EC write timed out" cr ; \ Empirically, it can take a long time for the EC to sense the game \ keys when several are down at once. 500 mS is not enough. : ec-wait-rd ( -- ) - d# 70 0 do + d# 700 0 do ec-cmd@ 1 and if unloop exit then - d# 10 ms + d# 1 ms loop ." EC read timed out" cr ; @@ -70,7 +70,7 @@ ec-cmd@ ( 6c-val ) repeat ( 6c-val ) ; -: ec-cmd! ( b -- ) ec-wait-wr h# 6c pc! ( ec-wait-wr ) ; +: 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! ; @@ -94,9 +94,9 @@ : ambient-temp@ ( -- w ) h# 14 ec-cmd-w@ ; : bat-status@ ( -- b ) h# 15 ec-cmd-b@ ; : bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; -: bat-gauge-id@ ( -- l.sn4-7 l.sn0-3 ) +: bat-gauge-id@ ( -- sn0 .. sn7 ) h# 17 ec-cmda - ec-rw ec-rw swap wljoin ec-rw ec-rw swap wljoin swap + 8 0 do ec-rb loop ec-release ; : bat-gauge@ ( -- b ) h# 18 ec-cmda h# 31 ec-wb ec-dat@ ec-release ; \ 31 is the EEPROM address

1 0

r367 - dev/usb2/hcd/uhci
by svn＠openbios.org 07 May '07

07 May '07

Author: wmb Date: 2007-05-07 23:32:22 +0200 (Mon, 07 May 2007) New Revision: 367 Modified: dev/usb2/hcd/uhci/probe.fth dev/usb2/hcd/uhci/uhci.fth Log: USB - Added auto-reprobe feature to UHCI host controller driver. Modified: dev/usb2/hcd/uhci/probe.fth =================================================================== --- dev/usb2/hcd/uhci/probe.fth 2007-05-07 02:13:06 UTC (rev 366) +++ dev/usb2/hcd/uhci/probe.fth 2007-05-07 21:32:22 UTC (rev 367) @@ -29,21 +29,12 @@ ; external -: power-usb-ports ( -- ) ; +: power-ports ( -- ) ; -: probe-usb ( -- ) - alloc-pkt-buf - 2 0 do - i reset-root-hub-port - i ['] probe-root-hub-port catch if - drop ." Failed to probe root port " i .d cr - then - i portsc@ i portsc! \ Clear change bits - loop - free-pkt-buf -; +: probe-root-hub ( -- ) + \ Set active-package so device nodes can be added and removed + my-self ihandle>phandle push-package -: reprobe-usb ( -- ) alloc-pkt-buf 2 0 do i portsc@ h# a and if @@ -56,8 +47,35 @@ then loop free-pkt-buf + + pop-package ; +: open ( -- flag ) + parse-my-args + open-count 0= if + map-regs + first-open? if + false to first-open? + reset-usb + init-struct + init-lists + start-usb + then + alloc-dma-buf + + probe-root-hub + then + open-count 1+ to open-count + true +; + +: close ( -- ) + open-count 1- to open-count + end-extra + open-count 0= if free-dma-buf unmap-regs then +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: dev/usb2/hcd/uhci/uhci.fth =================================================================== --- dev/usb2/hcd/uhci/uhci.fth 2007-05-07 02:13:06 UTC (rev 366) +++ dev/usb2/hcd/uhci/uhci.fth 2007-05-07 21:32:22 UTC (rev 367) @@ -53,6 +53,7 @@ : portsc! ( data port -- ) 2* 10 + uhci-w! ; : reset-usb ( -- ) + uhci-reg dup 0= if map-regs then 4 usbcmd! \ Global reset 50 ms 0 usbcmd! @@ -63,6 +64,7 @@ usbcmd@ 2 and 0= ?leave 1 ms loop + 0= if unmap-regs then ; : (process-hc-status) ( -- ) @@ -86,29 +88,6 @@ : stop-usb ( -- ) h# c0 usbcmd! ; : suspend-usb ( -- ) ; -: open ( -- flag ) - parse-my-args - open-count 0= if - map-regs - first-open? if - false to first-open? - reset-usb - init-struct - init-lists - start-usb - then - alloc-dma-buf - then - open-count 1+ to open-count - true -; - -: close ( -- ) - open-count 1- to open-count - end-extra - open-count 0= if free-dma-buf unmap-regs then -; - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r145 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 07 May '07

07 May '07

Author: blueswirl Date: 2007-05-07 22:02:01 +0200 (Mon, 07 May 2007) New Revision: 145 Modified: openbios-devel/arch/sparc32/tree.fs openbios-devel/drivers/sbus.c Log: Fix power-management location for SS-10 Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2007-05-07 17:21:15 UTC (rev 144) +++ openbios-devel/arch/sparc32/tree.fs 2007-05-07 20:02:01 UTC (rev 145) @@ -117,13 +117,6 @@ h# 26 encode-int 0 encode-int encode+ " intr" property finish-device -" /iommu/sbus" find-device -new-device - " power-management" device-name - h# 5 encode-int h# 0a000000 encode-int encode+ h# 00000010 encode-int encode+ " reg" property -finish-device - - \ obio (on-board IO) " /" find-device new-device Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2007-05-07 17:21:15 UTC (rev 144) +++ openbios-devel/drivers/sbus.c 2007-05-07 20:02:01 UTC (rev 145) @@ -20,6 +20,8 @@ #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 +#define POWER_REGS 0x10 +#define POWER_OFFSET 0x0a000000 static void ob_sbus_node_init(unsigned long bus, unsigned long base) @@ -271,6 +273,30 @@ } static void +ob_power_init(unsigned int slot, unsigned long base) +{ + push_str("/iommu/sbus"); + fword("find-device"); + fword("new-device"); + + push_str("power-management"); + fword("device-name"); + + PUSH(slot); + fword("encode-int"); + PUSH(base); + fword("encode-int"); + fword("encode+"); + PUSH(POWER_REGS); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + fword("finish-device"); +} + +static void ob_macio_init(unsigned int slot, unsigned long base, unsigned long offset) { // All devices were integrated to NCR89C100, see @@ -289,7 +315,7 @@ //ob_bpp_init(base); // Power management - //ob_power_init(base); + ob_power_init(slot, POWER_OFFSET); } static void

1 0

r144 - openbios-devel/arch/sparc32
by svn＠openbios.org 07 May '07

07 May '07

Author: blueswirl Date: 2007-05-07 19:21:15 +0200 (Mon, 07 May 2007) New Revision: 144 Modified: openbios-devel/arch/sparc32/tree.fs Log: Fix power-management location Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2007-05-06 17:29:58 UTC (rev 143) +++ openbios-devel/arch/sparc32/tree.fs 2007-05-07 17:21:15 UTC (rev 144) @@ -120,7 +120,7 @@ " /iommu/sbus" find-device new-device " power-management" device-name - h# 4 encode-int h# 0a000000 encode-int encode+ h# 00000010 encode-int encode+ " reg" property + h# 5 encode-int h# 0a000000 encode-int encode+ h# 00000010 encode-int encode+ " reg" property finish-device

1 0

r366 - cpu/x86/pc/olpc
by svn＠openbios.org 07 May '07

07 May '07

Author: wmb Date: 2007-05-07 04:13:06 +0200 (Mon, 07 May 2007) New Revision: 366 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2C11 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-05-06 21:38:30 UTC (rev 365) +++ cpu/x86/pc/olpc/versions.fth 2007-05-07 02:13:06 UTC (rev 366) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 10d +macro: FW_MINOR 11 \ The EC microcode -macro: EC_VERSION c10 +macro: EC_VERSION c11 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r365 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 06 May '07

06 May '07

Author: wmb Date: 2007-05-06 23:38:30 +0200 (Sun, 06 May 2007) New Revision: 365 Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/versions.fth dev/olpc/kb3700/ecio.fth Log: OLPC - Don't use the new EC commands at all, not even for board ID, because they are so flaky that they often prevent startup. Go back to snooping on internal EC variables. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-06 09:34:47 UTC (rev 364) +++ cpu/x86/pc/olpc/devices.fth 2007-05-06 21:38:30 UTC (rev 365) @@ -234,12 +234,31 @@ fload ${BP}/dev/olpc/kb3700/ecio.fth \ I/O space access to EC chip 0 value atest? +0 value board-revision + + stand-init: board revision + kb3920? to atest? + atest? if + h# a18 + else + lx? if +\ board-id@ case + snoop-board-id@ case + h# b2 of h# b30 endof \ preB3 + ( board-id ) dup h# 10 * 8 + swap \ E.g. b3 -> b38 + endcase + else + h# 4c00.0014 rdmsr drop ( RSTPLL-value ) + 4 rshift 7 and 7 = if h# b28 else h# b18 then + then + then + to board-revision +; + warning @ warning off stand-init: Wireless reset [ifdef] lx-devel exit [then] - kb3920? to atest? - \ Hit the reset on the Marvell wireless. It sometimes (infrequently) \ fails to enumerate after a power-cycle, and reset seems to fix it. \ We need > 85 ms between wlan-reset and probe-usb, but console-start @@ -248,19 +267,6 @@ ; warning ! -: board-revision ( -- n ) - atest? if h# a18 exit then - lx? if - board-id@ case - h# b2 of h# b30 endof \ preB3 - ( board-id ) dup h# 10 * 8 + swap \ E.g. b3 -> b38 - endcase - else - h# 4c00.0014 rdmsr drop ( RSTPLL-value ) - 4 rshift 7 and 7 = if h# b28 else h# b18 then - then -; - stand-init: PCI properties " /pci" find-device board-revision h# b18 < if Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-05-06 09:34:47 UTC (rev 364) +++ cpu/x86/pc/olpc/versions.fth 2007-05-06 21:38:30 UTC (rev 365) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 10 +macro: FW_MINOR 10d \ The EC microcode macro: EC_VERSION c10 Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-06 09:34:47 UTC (rev 364) +++ dev/olpc/kb3700/ecio.fth 2007-05-06 21:38:30 UTC (rev 365) @@ -29,14 +29,14 @@ : ec-cmd ( cmd -- response ) - h# 6c pc! begin h# 6c pc@ 3 and 1 = until h# 68 pc@ + h# 6c pc! begin 1 ms h# 6c pc@ 3 and 1 = until 1 ms h# 68 pc@ h# ff h# 6c pc! \ Release ownership ; : ec-cmd66 ( byte -- ) h# 66 pc! \ It typically requires about 200 polls - d# 4000 0 do h# 66 pc@ 2 and 0= if unloop exit then loop + d# 4000 0 do 1 ms h# 66 pc@ 2 and 0= if unloop exit then loop true abort" EC didn't respond to port 66 command" ; @@ -147,6 +147,8 @@ : kb3920? ( -- flag ) h# 6c pc@ h# ff = if true exit then 9 ec-cmd 9 = ; +: snoop-board-id@ ( -- id ) h# fa20 ec@ ; + \ While accessing the SPI FLASH, we have to turn off the keyboard controller, \ because it continuously fetches from the SPI FLASH when it's on. That \ interferes with our accesses.

1 0

r143 - in openbios-devel/arch: sparc32 sparc64
by svn＠openbios.org 06 May '07

06 May '07

Author: blueswirl Date: 2007-05-06 19:29:58 +0200 (Sun, 06 May 2007) New Revision: 143 Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc64/entry.S Log: Fix out of bounds accesses Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-05-05 18:35:34 UTC (rev 142) +++ openbios-devel/arch/sparc32/entry.S 2007-05-06 17:29:58 UTC (rev 143) @@ -267,7 +267,7 @@ /* Zero out our BSS section. */ set _bss - 4, %o0 ! First address of BSS - set _estack, %o1 ! Last address of BSS + set _estack - 4, %o1 ! Last address of BSS ba 2f nop 1: Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2007-05-05 18:35:34 UTC (rev 142) +++ openbios-devel/arch/sparc64/entry.S 2007-05-06 17:29:58 UTC (rev 143) @@ -211,7 +211,7 @@ /* Zero out our BSS section. */ setx _bss - 8, %o7, %o0 ! First address of BSS - setx _end, %o7, %o1 ! Last address of BSS + setx _end - 8, %o7, %o1 ! Last address of BSS ba 2f nop 1:

1 0

r364 - cpu/x86/pc/olpc
by svn＠openbios.org 06 May '07

06 May '07

Author: wmb Date: 2007-05-06 11:34:47 +0200 (Sun, 06 May 2007) New Revision: 364 Added: cpu/x86/pc/olpc/countdwn.fth Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac 1361 - make it harder to interrupt auto-boot from keyboard. Added: cpu/x86/pc/olpc/countdwn.fth =================================================================== --- cpu/x86/pc/olpc/countdwn.fth (rev 0) +++ cpu/x86/pc/olpc/countdwn.fth 2007-05-06 09:34:47 UTC (rev 364) @@ -0,0 +1,66 @@ +\ See license at end of file +purpose: Check for auto-boot interruption + +\ This is similar to the ofw/core/countdwn.fth, except that you +\ have to use a specific key from the main keyboard, because +\ children tend to pound on the keyboard randomly. If you have +\ a serial console, you can still use any key, since only developers +\ have serial consoles. + +headerless +: show-countdown ( #seconds -- interrupted? ) + 1 swap do + i .d (cr + d# 10 0 do + d# 100 ms + + stdin @ if + console-key? if + console-key h# 1b = if + true unloop unloop exit + then + then + then +[ifdef] ukey + ukey? if + ukey drop + true unloop unloop exit + then +[then] + + loop + -1 +loop + space (cr + false +; +: (interrupt-auto-boot?) ( -- flag ) + 3 + ." Type the Esc key to interrupt automatic startup" cr + show-countdown +; +' (interrupt-auto-boot?) to interrupt-auto-boot? + +headers +\ 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 Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-06 03:34:19 UTC (rev 363) +++ cpu/x86/pc/olpc/fw.bth 2007-05-06 09:34:47 UTC (rev 364) @@ -260,8 +260,7 @@ fload ${BP}/cpu/x86/pc/olpc/micin.fth \ Microphone input AC/DC coupling -fload ${BP}/ofw/core/countdwn.fth \ Startup countdown -patch 3 6 get-countdown +fload ${BP}/cpu/x86/pc/olpc/countdwn.fth \ Startup countdown fload ${BP}/dev/scsi/probscsi.fth \ probe-scsi and probe-scsi-all

1 0

r363 - cpu/x86/pc/olpc
by svn＠openbios.org 06 May '07

06 May '07

Author: wmb Date: 2007-05-06 05:34:19 +0200 (Sun, 06 May 2007) New Revision: 363 Modified: cpu/x86/pc/olpc/fw.bth Log: Don't use the game key fastboot path for now; the EC command to access the game key is unreliable. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-05 19:26:08 UTC (rev 362) +++ cpu/x86/pc/olpc/fw.bth 2007-05-06 03:34:19 UTC (rev 363) @@ -433,6 +433,7 @@ : user-switch? ( -- flag ) [ifdef] lx-devel false exit [then] +true exit game-key@ 0<> dup if ." Release the game key to continue" cr begin d# 100 ms game-key@ 0= until

1 0

r362 - dev/olpc/kb3700
by svn＠openbios.org 05 May '07

05 May '07

Author: wmb Date: 2007-05-05 21:26:08 +0200 (Sat, 05 May 2007) New Revision: 362 Modified: dev/olpc/kb3700/ecio.fth Log: OLPC trac #1398 - released the EC command lock after using it, improved the reliability of the EC command interface code. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-04 10:16:02 UTC (rev 361) +++ dev/olpc/kb3700/ecio.fth 2007-05-05 19:26:08 UTC (rev 362) @@ -40,53 +40,86 @@ 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 while key? abort" wait wr" 1 ms repeat ; -: ec-wait-rd ( -- ) begin ec-cmd@ 1 and 0= while key? abort" wait rd" 1 ms repeat ; -: ec-cmd! ( b -- ) ec-wait-wr h# 6c pc! ec-wait-wr ; + +: ec-release ( -- ) h# ff h# 6c pc! 1 ms h# 68 pc@ drop ; +: ec-wait-wr ( -- ) + d# 70 0 do + ec-cmd@ 2 and 0= if unloop exit then + d# 10 ms + loop + ." EC write timed out" cr +; +\ Empirically, it can take a long time for the EC to sense the game +\ keys when several are down at once. 500 mS is not enough. +: ec-wait-rd ( -- ) + d# 70 0 do + ec-cmd@ 1 and if unloop exit then + d# 10 ms + loop + ." EC read timed out" cr +; +: flush-ec ( -- ) + begin ec-cmd@ dup h# 80 and while + drop ." EC release" cr ec-release d# 10 ms + repeat ( 6c-val ) + + begin 1 and while ( ) + h# 68 pc@ drop ( ) + d# 200 us ( ) + ec-cmd@ ( 6c-val ) + repeat ( 6c-val ) +; +: 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 ; +: ec-cmd0 ( -- ) ec-cmda ec-release ; -: 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 ; +: ec-cmd-w@ ( cmd -- w ) ec-cmda ec-rw ec-release ; +: ec-cmd-b@ ( cmd -- w ) ec-cmda ec-rb ec-release ; +: ec-cmd-b! ( b cmd -- ) ec-cmda ec-wb ec-release ; + +: bat-voltage@ ( -- w ) h# 10 ec-cmd-w@ ; +: bat-current@ ( -- w ) h# 11 ec-cmd-w@ ; +: bat-acr@ ( -- w ) h# 12 ec-cmd-w@ ; +: bat-temp@ ( -- w ) h# 13 ec-cmd-w@ ; +: ambient-temp@ ( -- w ) h# 14 ec-cmd-w@ ; +: bat-status@ ( -- b ) h# 15 ec-cmd-b@ ; +: bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; : 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 + ec-release ; -: 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-gauge@ ( -- b ) h# 18 ec-cmda h# 31 ec-wb ec-dat@ ec-release ; \ 31 is the EEPROM address +: board-id@ ( -- b ) h# 19 ec-cmd-b@ ; +: sci-source@ ( -- b ) h# 1a ec-cmd-w@ ; +: sci-mask! ( b -- ) h# 1b ec-cmd-b! ; +: sci-mask@ ( -- b ) h# 1c ec-cmd-b@ ; +: game-key@ ( -- w ) h# 1d ec-cmda ec-rw ec-release ; +: ec-date! ( day month year -- ) h# 1e ec-cmda ec-wb ec-wb ec-wb ec-release ; +: ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; \ 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 ; \ ??? +: bat-init-lifepo4 ( -- ) h# 21 ec-cmd0 ; +: bat-init-nimh ( -- ) h# 22 ec-cmd0 ; +: wlan-off ( -- ) 0 h# 23 ec-cmd-b! ; +: wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; +: wlan-wake ( -- ) h# 24 ec-cmd0 ; +: wlan-rst ( -- ) h# 25 ec-cmd0 ; +: dcon-disable ( -- ) 0 h# 26 ec-cmd-b! ; +: dcon-enable ( -- ) 1 h# 26 ec-cmd-b! ; +: reset-ec-warm ( -- ) h# 27 ec-cmd0 ; +: reset-ec ( -- ) h# 28 ec-cmd0 ; +: write-protect-fw ( -- ) h# 29 ec-cmd0 ; +\ : disable-ec-io ( -- ) h# 2a ec-cmd0 ; \ ??? \ EC mailbox access words @@ -94,10 +127,10 @@ : 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 ; +: ec-mb-b@ ( adr -- b ) h# 8a ec-mb-setup h# 84 ec-cmd-b@ ; +: ec-mb-w@ ( adr -- w ) h# 88 ec-mb-setup h# 82 ec-cmd-w@ ; +: ec-mb-b! ( b adr -- ) h# 85 ec-mb-setup ec-wb h# 8b ec-cmda ec-release ; +: ec-mb-w! ( w adr -- ) h# 83 ec-mb-setup ec-ww h# 89 ec-cmda ec-release ; \ SCI source codes: \ SCI_WAKEUP_EVENT 0x01 // Game button, @@ -112,9 +145,6 @@ : 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

r142 - openbios-devel/arch/sparc32
by svn＠openbios.org 05 May '07

05 May '07

Author: blueswirl Date: 2007-05-05 20:35:34 +0200 (Sat, 05 May 2007) New Revision: 142 Modified: openbios-devel/arch/sparc32/ldscript Log: Increase virtual memory supply to meet NetBSD and OpenBSD demand Modified: openbios-devel/arch/sparc32/ldscript =================================================================== --- openbios-devel/arch/sparc32/ldscript 2007-05-05 18:34:01 UTC (rev 141) +++ openbios-devel/arch/sparc32/ldscript 2007-05-05 18:35:34 UTC (rev 142) @@ -13,7 +13,7 @@ /* 16KB heap and stack */ HEAP_SIZE = 16384; STACK_SIZE = 16384; -VMEM_SIZE = 128 * 1024; +VMEM_SIZE = 256 * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS

1 0

r141 - openbios-devel/drivers
by svn＠openbios.org 05 May '07

05 May '07

Author: blueswirl Date: 2007-05-05 20:34:01 +0200 (Sat, 05 May 2007) New Revision: 141 Modified: openbios-devel/drivers/iommu.c Log: More obviously alarming return values for find_pte Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2007-05-05 18:32:35 UTC (rev 140) +++ openbios-devel/drivers/iommu.c 2007-05-05 18:34:01 UTC (rev 141) @@ -124,12 +124,12 @@ p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PMD * sizeof(int), SRMMU_PTRS_PER_PMD * sizeof(int)); if (p == 0) - return 1; + 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; + return -1; } } @@ -141,11 +141,11 @@ p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PTE * sizeof(void *), SRMMU_PTRS_PER_PTE * sizeof(void *)); if (p == 0) - return 2; + return -2; pte = SRMMU_ET_PTD | ((va2pa((unsigned int)p)) >> 4); *(uint32_t *)pa2va(pa) = pte; } else { - return 2; + return -2; } }

1 0

r140 - openbios-devel/modules
by svn＠openbios.org 05 May '07

05 May '07

Author: blueswirl Date: 2007-05-05 20:32:35 +0200 (Sat, 05 May 2007) New Revision: 140 Modified: openbios-devel/modules/video.c Log: Fix unaligned memory access Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2007-05-05 10:03:56 UTC (rev 139) +++ openbios-devel/modules/video.c 2007-05-05 18:32:35 UTC (rev 140) @@ -259,6 +259,7 @@ static void video_open(void) { + RET(-1); } NODE_METHODS( video ) = {

1 0

r139 - openbios-devel/kernel
by svn＠openbios.org 05 May '07

05 May '07

Author: blueswirl Date: 2007-05-05 12:03:56 +0200 (Sat, 05 May 2007) New Revision: 139 Modified: openbios-devel/kernel/bootstrap.c Log: Fix memory corruption problems reported by glibc Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2007-05-04 20:55:05 UTC (rev 138) +++ openbios-devel/kernel/bootstrap.c 2007-05-05 10:03:56 UTC (rev 139) @@ -106,11 +106,11 @@ int l=(length+(sizeof(cell)-1))/sizeof(ucell), i; /* prepare relocation table */ - relocation_length=(l+BITS-1)/BITS; + relocation_length=(length+BITS-1)/BITS; reloc_table = malloc(relocation_length*sizeof(cell)); memset(reloc_table,0,relocation_length*sizeof(cell)); - for (i=0; i<=l; i++) { + for (i=0; i<l; i++) { pos=i/BITS; bit=i&~(-BITS);

1 0

r138 - in openbios-devel: arch/sparc32 forth/admin
by svn＠openbios.org 04 May '07

04 May '07

Author: blueswirl Date: 2007-05-04 22:55:05 +0200 (Fri, 04 May 2007) New Revision: 138 Modified: openbios-devel/arch/sparc32/boot.c openbios-devel/forth/admin/nvram.fs Log: Fix boot-device use Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2007-05-01 14:14:17 UTC (rev 137) +++ openbios-devel/arch/sparc32/boot.c 2007-05-04 20:55:05 UTC (rev 138) @@ -28,7 +28,7 @@ void boot(void) { - char *path = pop_fstr_copy(), *param, *oldpath; + char *path = pop_fstr_copy(), *param, *oldpath = path; char altpath[256]; int unit; const void *romvec; @@ -41,7 +41,6 @@ fword("get-package-property"); if (!POP()) { path = pop_fstr_copy(); - oldpath = path; unit = 0; } else { switch (boot_device) { Modified: openbios-devel/forth/admin/nvram.fs =================================================================== --- openbios-devel/forth/admin/nvram.fs 2007-05-01 14:14:17 UTC (rev 137) +++ openbios-devel/forth/admin/nvram.fs 2007-05-04 20:55:05 UTC (rev 138) @@ -303,7 +303,6 @@ \ fcode-debug? input-device output-device " true" " auto-boot?" bool-config \ 7.4.3.5 " boot" " boot-command" str-config \ 7.4.3.5 -" disk" " boot-device" str-config \ 7.4.3.5 " " " boot-file" str-config \ 7.4.3.5 " false" " diag-switch?" bool-config \ 7.4.3.5 " net" " diag-device" str-config \ 7.4.3.5 @@ -330,6 +329,7 @@ [IFDEF] CONFIG_PPC \ ---- PPC ---- +" disk" " boot-device" str-config \ 7.4.3.5 " false" " little-endian?" bool-config " false" " real-mode?" bool-config " -1" " real-base" int-config @@ -341,6 +341,7 @@ [IFDEF] CONFIG_X86 \ ---- X86 ---- +" disk" " boot-device" str-config \ 7.4.3.5 " true" " little-endian?" bool-config [THEN]

1 0

r361 - cpu/x86/pc/olpc
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 12:16:02 +0200 (Fri, 04 May 2007) New Revision: 361 Modified: cpu/x86/pc/olpc/disptest.fth Log: OLPC display selftest - consume the key that stopped the test early so it is not pending for some other test. Modified: cpu/x86/pc/olpc/disptest.fth =================================================================== --- cpu/x86/pc/olpc/disptest.fth 2007-05-04 10:02:39 UTC (rev 360) +++ cpu/x86/pc/olpc/disptest.fth 2007-05-04 10:16:02 UTC (rev 361) @@ -61,9 +61,9 @@ get-msecs burnin-time + ( limit ) begin get-msecs over u< ( limit reached? ) - key? 0= and ( limit end? ) while ( limit ) .random-rect ( limit ) + key? if key 2drop exit then repeat ( limit ) drop ; @@ -74,7 +74,7 @@ d# 2000 ms .vertical-bars16 d# 2000 ms - ." Press a key to abort." cr + ." Press a key to stop early." cr d# 1000 ms random-selftest false

1 0

r360 - cpu/x86/pc/olpc
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 12:02:39 +0200 (Fri, 04 May 2007) New Revision: 360 Modified: cpu/x86/pc/olpc/disptest.fth Log: OLPC display selftest - fixed a stack bug that was killing test-all. Modified: cpu/x86/pc/olpc/disptest.fth =================================================================== --- cpu/x86/pc/olpc/disptest.fth 2007-05-04 09:53:10 UTC (rev 359) +++ cpu/x86/pc/olpc/disptest.fth 2007-05-04 10:02:39 UTC (rev 360) @@ -56,12 +56,16 @@ " fill-rectangle" $call-screen ( ) ; -: random-selftest ( -- error? ) +: random-selftest ( -- ) get-msecs rn ! - get-msecs burnin-time + - begin get-msecs over u< key? not and while - .random-rect - repeat + get-msecs burnin-time + ( limit ) + begin + get-msecs over u< ( limit reached? ) + key? 0= and ( limit end? ) + while ( limit ) + .random-rect ( limit ) + repeat ( limit ) + drop ; : selftest ( -- error? )

1 0

r359 - dev/geode/ac97
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 11:53:10 +0200 (Fri, 04 May 2007) New Revision: 359 Modified: dev/geode/ac97/selftest.fth Log: OLPC audio selftest - fixed a stack depth bug that was killing test-all. Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2007-05-04 09:52:31 UTC (rev 358) +++ dev/geode/ac97/selftest.fth 2007-05-04 09:53:10 UTC (rev 359) @@ -108,7 +108,7 @@ : selftest-args ( -- arg$ ) my-args ascii : left-parse-string 2drop ; : ?play-wav-file ( -- ) - selftest-args dup 0= if drop exit then + selftest-args dup 0= if 2drop exit then \ Read the .wav file 2dup ." Play " type cr

1 0

r358 - cpu/x86/pc/olpc
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 11:52:31 +0200 (Fri, 04 May 2007) New Revision: 358 Modified: cpu/x86/pc/olpc/chipinit.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/usb.fth Log: OLPC - claim virtual address space that is mapped V=P so it doesn't get reused. Modified: cpu/x86/pc/olpc/chipinit.fth =================================================================== --- cpu/x86/pc/olpc/chipinit.fth 2007-05-04 09:06:46 UTC (rev 357) +++ cpu/x86/pc/olpc/chipinit.fth 2007-05-04 09:52:31 UTC (rev 358) @@ -628,6 +628,7 @@ : video-map [ifdef] virtual-mode + gp-base h# c000 0 mmu-claim drop gp-base dup h# c000 -1 mmu-map [then] Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-04 09:06:46 UTC (rev 357) +++ cpu/x86/pc/olpc/fw.bth 2007-05-04 09:52:31 UTC (rev 358) @@ -204,6 +204,13 @@ [ifdef] virtual-mode fload ${BP}/cpu/x86/pc/mmusetup.fth \ Initial values for MMU lists +dev /mmu +: claim-rom ( -- ) + (initial-claim) + rom-pa h# ffff.0000 over - claim-virtual drop \ ROM 1-1 map +; +' claim-rom to initial-claim +dend [then] fload ${BP}/cpu/x86/pc/olpc/devices.fth Modified: cpu/x86/pc/olpc/usb.fth =================================================================== --- cpu/x86/pc/olpc/usb.fth 2007-05-04 09:06:46 UTC (rev 357) +++ cpu/x86/pc/olpc/usb.fth 2007-05-04 09:52:31 UTC (rev 358) @@ -95,8 +95,10 @@ h# 400000ef.c00fffff. h# 5101.0020 wrmsr h# 00000002.efc00000. h# 5120.000b wrmsr [ifdef] virtual-mode - h# efc00000 dup h# 1000 -1 mmu-map \ UOC - h# fe01a000 dup h# 1000 -1 mmu-map \ OHCI + h# efc00000 h# 1000 0 mmu-claim drop \ UOC + h# efc00000 dup h# 1000 -1 mmu-map \ UOC + h# fe01a000 h# 1000 0 mmu-claim drop \ OHCI + h# fe01a000 dup h# 1000 -1 mmu-map \ OHCI [then] \ Configure the assignment of 2 USB Power Enable pins to USB ports \ to correspond to the way they are wired on the board.

1 0

r357 - cpu/x86/pc/olpc
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 11:06:46 +0200 (Fri, 04 May 2007) New Revision: 357 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2C10 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-05-04 09:03:14 UTC (rev 356) +++ cpu/x86/pc/olpc/versions.fth 2007-05-04 09:06:46 UTC (rev 357) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 09 +macro: FW_MINOR 10 \ The EC microcode -macro: EC_VERSION c09 +macro: EC_VERSION c10 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp ~/ec-c05t.bin ec.img +\ macro: GET_EC cp ~/pqc10t.bin ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1

1 0

r356 - cpu/x86/pc/olpc/images
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 11:03:14 +0200 (Fri, 04 May 2007) New Revision: 356 Added: cpu/x86/pc/olpc/images/olpc-t0.wav Log: OLPC - Added a .wav file as grist for the audio selftest. Added: cpu/x86/pc/olpc/images/olpc-t0.wav =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/olpc-t0.wav ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

1 0

r355 - cpu/x86 cpu/x86/pc/olpc dev/geode/ac97 dev/olpc/cafenand
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 11:00:05 +0200 (Fri, 04 May 2007) New Revision: 355 Added: cpu/x86/adpcm.fth cpu/x86/k6cputest.fth Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/disptest.fth cpu/x86/pc/olpc/olpc.bth dev/geode/ac97/ac97.fth dev/geode/ac97/selftest.fth dev/olpc/cafenand/methods.fth dev/olpc/cafenand/selftest.fth Log: OLPC - Added a bunch of selftests from Lilian. Added: cpu/x86/adpcm.fth =================================================================== --- cpu/x86/adpcm.fth (rev 0) +++ cpu/x86/adpcm.fth 2007-05-04 09:00:05 UTC (rev 355) @@ -0,0 +1,223 @@ +\ See license at end of file +purpose: decode IMA/DVI ADPCM .wav file + +\ Uncompressed data format: +\ 16-bit Left, 16-bit Right, ... +\ +\ Compressed data format: +\ nibbles 0.hi 0.lo 1.hi 1.lo 2.hi 2.lo 3.hi 3.lo 4.hi 4.lo 5.hi 5.lo ... +\ L1 L0 L3 L2 L5 L4 L7 L6 R1 R0 R3 R2 ... + +\ Work on one channel at a time. + +0 value val-pred \ predicted value +0 value index \ current step change index +0 value in-val \ place to keep (encoded) input value +0 value in-skip \ # bytes to skip on channel input +0 value out-skip \ # bytes to skip on channel output +0 value buf-skip \ toggle flag for writing values + +0 value #ch \ # channels +0 value blk-size \ # bytes per compressed block +0 value #sample/blk \ (blk-size-(#ch*4)) + 1 + +decimal +create index-table -1 , -1 , -1 , -1 , 2 , 4 , 6 , 8 , + -1 , -1 , -1 , -1 , 2 , 4 , 6 , 8 , + +create stepsize-table \ 89 entries + 7 , 8 , 9 , 10 , 11 , 12 , 13 , 14 , 16 , 17 , + 19 , 21 , 23 , 25 , 28 , 31 , 34 , 37 , 41 , 45 , + 50 , 55 , 60 , 66 , 73 , 80 , 88 , 97 , 107 , 118 , + 130 , 143 , 157 , 173 , 190 , 209 , 230 , 253 , 279 , 307 , + 337 , 371 , 408 , 449 , 494 , 544 , 598 , 658 , 724 , 796 , + 876 , 963 , 1060 , 1166 , 1282 , 1411 , 1552 , 1707 , 1878 , 2066 , + 2272 , 2499 , 2749 , 3024 , 3327 , 3660 , 4026 , 4428 , 4871 , 5358 , + 5894 , 6484 , 7132 , 7845 , 8630 , 9493 , 10442 , 11487 , 12635 , 13899 , + 15289 , 16818 , 18500 , 20350 , 22385 , 24623 , 27086 , 29794 , 32767 , +hex + +0 value 'index-table +0 value 'stepsize-table + +: init-ch-vars ( in out -- in' out' ) + over <w@ dup to val-pred \ The first entry is the initial value + over w! + over 2 + c@ to index \ And the initial index + out-skip + + swap in-skip + swap +; + +code adpcm-decode-sample ( in out sample# -- in' out' ) + \ Get the delta value + eax pop ( in out ) + 7 # eax and 0= if + 4 [esp] ecx mov \ Read the next 4 bytes + 0 [ecx] ebx mov + 'user in-skip ecx mov \ Increment in to the next data for the channel + ecx 4 [esp] add + else + 'user in-val ebx mov + ebx 4 # shr + then + ebx 'user in-val mov \ Save the input data + h# f # ebx and \ delta + + \ Compute difference and new predicated value + \ Computes 'vpdiff = (delta+0.5)*step/4', but see comment in adpcm-coder. + 'user index eax mov \ index + 'user 'stepsize-table ecx mov \ address of stepsize-table + 0 [ecx] [eax] *4 ecx mov \ step = stepsize-table[index] + + ecx eax mov eax 3 # shr \ vpdiff + + 4 # bl test 0<> if ecx eax add then + 2 # bl test 0<> if ecx edx mov edx 1 # shr edx eax add then + 1 # bl test 0<> if ecx edx mov edx 2 # shr edx eax add then + + \ Clamp down output value + 'user val-pred edx mov + 8 # ebx test 0= if + eax edx add + else + eax edx sub + then + d# 32767 # edx cmp > if d# 32767 # edx mov then + d# -32768 # edx cmp < if d# -32768 # edx mov then + edx 'user val-pred mov \ Update valpred + 0 [esp] eax mov \ out + op: dx 0 [eax] mov \ [out] = valpred + 'user out-skip eax mov + eax 0 [esp] add \ Advance out pointer + + \ Update index value + 'user 'index-table eax mov \ address of index-table + 0 [eax] [ebx] *4 eax mov \ index-table[delta] + + 'user index eax add \ index+index-table[delta] + 0 # eax cmp < if eax eax xor then + d# 88 # eax cmp > if d# 88 # eax mov then + eax 'user index mov \ Update index +c; + +: adpcm-decode-ch ( in out #sample -- ) + 0 ?do + i adpcm-decode-sample ( in' out' ) + loop 2drop +; + +: adpcm-decode-blk ( in out #sample -- ) + #ch 0 ?do ( in out #sample ) + 2 pick i /l * + ( in out #sample in' ) + 2 pick i /w * + ( in out #sample in out' ) + init-ch-vars ( in out #sample in' out' ) + 2 pick 1- ( in out #sample in out #sample-1 ) + adpcm-decode-ch ( in out #sample ) + loop 3drop ( ) +; + +: adpcm-decoder ( in out #sample #ch blk-size -- ) + index-table to 'index-table + stepsize-table to 'stepsize-table + + dup to blk-size ( in out #sample #ch blk-size ) + over 4 * - 1+ to #sample/blk ( in out #sample #ch ) + dup to #ch ( in out #sample #ch ) + dup /l * to in-skip ( in out #sample #ch ) + /w * to out-skip ( in out #sample ) + + begin dup 0> while ( in out #sample ) + 3dup #sample/blk min adpcm-decode-blk + rot blk-size + ( out #sample in' ) + rot #sample/blk #ch * wa+ ( #sample in out' ) + rot #sample/blk - ( in out #sample' ) + repeat 3drop +; + +\ Decode an .wav file +\ +\ .wav file format: +\ "RIFF" L<len of file> "WAVE" +\ "fmt " L<len of fmt data> W<compression code> W<#channels> L<sample rate> +\ L<bytes/second>] W<block align> W<bits/sample> W<extra bytes> +\ W<#samples/block>] +\ "fact" L<len of fact> L<#samples> +\ "data" L<len of data> <blocks of data> +\ +\ Each <block of data> contains: +\ W<sample> B<index> B<0> per channel +\ (block size - 1) samples of compressed data + +: find-wav-chunk? ( in chunk$ -- in' true | false ) + rot dup 4 + le-l@ over + swap h# c + ( chunk$ in-end in' ) + begin 2dup u> while ( chunk$ in-end in ) + dup 4 pick 4 pick comp 0= if ( chunk$ in-end in ) + nip nip nip true exit ( in true ) + then + 4 + dup le-l@ + 4 + ( chunk$ in-end in' ) + repeat 4drop + false +; + +: wav-ok? ( in -- ok? ) + dup " RIFF" comp swap 8 + " WAVE" comp or 0= +; + +: fmt-ok? ( in -- #ch blk-size true | false ) + " fmt " find-wav-chunk? 0= if false exit then ( in' ) + dup 8 + le-w@ h# 11 = \ compression code: DVI_ADPCM + over h# 16 + le-w@ 4 = and if \ bits/sample + dup h# a + le-w@ ( #ch ) + swap h# 14 + le-w@ true ( #ch blk-size true ) + else + drop false ( false ) + then +; + +: fact-ok? ( in -- #sample true | false ) + " fact" find-wav-chunk? dup if swap 8 + le-l@ swap then +; + +: data-ok? ( in -- in' true | false ) + " data" find-wav-chunk? dup if swap 8 + swap then +; + +: adpcm-decode ( in out -- actual ) + over wav-ok? not if 2drop 0 exit then ( in out ) + swap dup data-ok? not if 2drop 0 exit then ( out in in' ) + -rot dup fact-ok? not if 3drop 0 exit then ( in' out in #sample ) + swap fmt-ok? not if 3drop 0 exit then ( in' out #sample #ch blk-size ) + 2 pick 2 pick /w * * >r ( in' out #sample #ch blk-size ) ( R: actual ) + adpcm-decoder r> ( actual ) +; + +: adpcm-size ( in -- actual ) + dup wav-ok? not if drop 0 exit then ( in ) + dup fact-ok? not if drop 0 exit then ( in #sample ) + swap fmt-ok? not if drop 0 exit then ( #sample #ch blk-size ) + drop /w * * ( actual ) +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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 Property changes on: cpu/x86/adpcm.fth ___________________________________________________________________ Name: svn:executable + * Added: cpu/x86/k6cputest.fth =================================================================== --- cpu/x86/k6cputest.fth (rev 0) +++ cpu/x86/k6cputest.fth 2007-05-04 09:00:05 UTC (rev 355) @@ -0,0 +1,116 @@ +purpose: Burnin diagnostic for AMD K6 and similar CPUs +\ See license at end of file + +hex + +also assembler definitions +: finit ( -- ) 9b asm8, db asm8, e3 asm8, ; +: fldpi ( -- ) d9 asm8, eb asm8, ; +: fldl ( disp mr rmid -- ) dd asm8, 0 mem, ; +: fmull ( disp mr rmid -- ) dc asm8, 1 mem, ; +: faddp ( -- ) de asm8, c1 asm8, ; +: fsubp ( -- ) de asm8, e1 asm8, ; +: fcompp ( -- ) de asm8, d9 asm8, ; +: fstswax ( -- ) 9b asm8, df asm8, e0 asm8, ; + +\ Returns an addressing mode that refers to the end of the datum +: 'user+8 ( -- offset reg ) 'user swap 8 + swap ; + +previous definitions + + +dev /cpu + +d# 60 constant default#passes +d# 10,000,000 constant spins/pass +0 value #cnt +7fff.ffff value #half +0000.0000 value #half2 +ffff.ffff 3fdf.ffff 2value #e +ffff.ffff 3fef.ffff 2value #rt + +code burnK6 ( count -- error? ) + ecx pop \ Loop count + + finit + esi push + + 'user #half edx mov \ DX: '#half + eax eax xor \ AX: 0 + eax ebx mov \ BX: 0 + -1 [eax] esi lea \ Index = -1 + fldpi + nop nop + + begin + 'user+8 #rt [esi] *8 fldl \ Account for -1 index + 'user+8 #e [esi] *8 fmull + 'user+8 #half [esi] *8 edx add + 75 c, 0 c, \ jnz .+2 + faddp + 'user+8 #rt [esi] *8 fldl + ebx dec + 'user+8 #half [esi] *8 edx sub + eb c, 0 c, \ jmp .+2 + 'user+8 #e [esi] *8 fmull + ebx inc + 'user+8 #cnt [esi] *8 dec + fsubp + loopa + + esi pop + + ebx ebx test 0<> if 1 # ebx mov then + 'user #half edx cmp <> if 2 # ebx or then + fldpi + fcompp \ compare ST(0) and ST(1) and pop them + fstswax + sahf 0<> if 4 # ebx or then + + ebx push +c; + +: selftest ( -- error? ) + my-args dup if + push-decimal + $number abort" Argument to /cpu selftest must be a decimal number" + pop-base + else + 2drop + default#passes + then + + dup .d ." passes of CPU Burnin. Press a key to abort." cr + 0 ?do + (cr ." Pass " i .d + spins/pass burnk6 if true exit then + key? if key drop cr leave then + loop + false +; + +device-end + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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 Property changes on: cpu/x86/k6cputest.fth ___________________________________________________________________ Name: svn:executable + * Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-04 07:29:47 UTC (rev 354) +++ cpu/x86/pc/olpc/devices.fth 2007-05-04 09:00:05 UTC (rev 355) @@ -123,6 +123,7 @@ ; fload ${BP}/cpu/x86/pc/cpunode.fth +fload ${BP}/cpu/x86/k6cputest.fth \ Burnin test for K6 CPU 0 [if] fload ${BP}/ofw/console/bailout.fth @@ -306,6 +307,8 @@ fload ${BP}/dev/geode/acpi.fth \ Power management +fload ${BP}/cpu/x86/adpcm.fth \ ADPCM decoding + [ifdef] notdef-olpc \ fload ${BP}/dev/olpc/plccflash.fth \ PLCC LPC debug FLASH Modified: cpu/x86/pc/olpc/disptest.fth =================================================================== --- cpu/x86/pc/olpc/disptest.fth 2007-05-04 07:29:47 UTC (rev 354) +++ cpu/x86/pc/olpc/disptest.fth 2007-05-04 09:00:05 UTC (rev 355) @@ -1,3 +1,6 @@ +purpose: Display test +\ See license at end of file + dev /display d# 100 constant bar-int @@ -21,14 +24,80 @@ i test-color16 i 0 bar-int 4 pick " fill-rectangle" $call-screen bar-int +loop drop ; + +instance variable rn \ Random number +d# 60,000 constant burnin-time \ 1 minute + +: random ( -- n ) + rn @ d# 1103515245 * d# 12345 + h# 7FFFFFFF and dup rn ! +; + +: randomize-color ( -- c ) + random h# 1f and d# 11 << + random h# 3f and d# 5 << or + random h# 1f and or +; +: randomize-xy ( -- x y ) + dimensions ( width height ) + random 3ff and min swap ( y width ) + random 7ff and min swap ( x y ) +; +: randomize-wh ( x y -- w h ) + dimensions ( x y width height ) + rot - -rot ( max-h x width ) + swap - swap ( max-w max-h ) + randomize-xy ( max-w max-h w h ) + rot min -rot min swap ( w' h' ) +; +: .random-rect ( -- ) + randomize-color ( c ) + randomize-xy ( c x y ) + 2dup randomize-wh ( c x y w h ) + " fill-rectangle" $call-screen ( ) +; + +: random-selftest ( -- error? ) + get-msecs rn ! + get-msecs burnin-time + + begin get-msecs over u< key? not and while + .random-rect + repeat +; + : selftest ( -- error? ) bytes/pixel 2 <> if false exit then .horizontal-bars16 d# 2000 ms .vertical-bars16 d# 2000 ms + ." Press a key to abort." cr + d# 1000 ms + random-selftest false ; device-end +\ LICENSE_BEGIN +\ Copyright (c) 2007 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 Modified: cpu/x86/pc/olpc/olpc.bth =================================================================== --- cpu/x86/pc/olpc/olpc.bth 2007-05-04 07:29:47 UTC (rev 354) +++ cpu/x86/pc/olpc/olpc.bth 2007-05-04 09:00:05 UTC (rev 355) @@ -72,7 +72,8 @@ " sourceurl" " sourceurl" $add-dropin [ifndef] lx-devel - " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin + " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/olpc-t0.wav" " splash" $add-deflated-dropin [then] [ifdef] lx-devel " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-05-04 07:29:47 UTC (rev 354) +++ dev/geode/ac97/ac97.fth 2007-05-04 09:00:05 UTC (rev 355) @@ -295,8 +295,9 @@ prd-out-phys false out-channel start-dma ( len ) ; +: open-args ( -- arg$ ) my-args ascii : left-parse-string 2swap 2drop ; : parse-args ( -- flag ) - my-args begin dup while \ Execute mode modifiers + open-args begin dup while \ Execute mode modifiers ascii , left-parse-string ( rem$ first$ ) my-self ['] $call-method catch if ( rem$ x x x ) ." Unknown argument" cr Modified: dev/geode/ac97/selftest.fth =================================================================== --- dev/geode/ac97/selftest.fth 2007-05-04 07:29:47 UTC (rev 354) +++ dev/geode/ac97/selftest.fth 2007-05-04 09:00:05 UTC (rev 355) @@ -35,7 +35,6 @@ negate 1+ 2* 3 / dup bwjoin to glevel ; - : play ( -- ) open-out plevel set-pcm-gain glevel h# 38 codec! record-base record-len audio-out drop write-done @@ -93,30 +92,70 @@ ; : make-wave ( -- ) - record-base record-len 2/ bounds ( endadr startadr ) - begin 2dup u> while cycle repeat ( endadr startadr ) - 2drop + record-base record-len 2/ bounds ( endadr startadr ) + begin 2dup u> while cycle repeat ( endadr startadr ) + 2drop - record-base record-len bounds ( endadr startadr ) - record-len 2/ + wa1+ - begin 2dup u> while cycle repeat ( endadr startadr ) - 2drop + record-base record-len bounds ( endadr startadr ) + record-len 2/ + wa1+ + begin 2dup u> while cycle repeat ( endadr startadr ) + 2drop ; + +0 value raw-buf +0 value /raw-buf + +: selftest-args ( -- arg$ ) my-args ascii : left-parse-string 2drop ; + +: ?play-wav-file ( -- ) + selftest-args dup 0= if drop exit then + + \ Read the .wav file + 2dup ." Play " type cr + " boot-read" evaluate + + \ Allocate raw audio buffer + " loaded" evaluate 0= if drop exit then \ No data loaded + " adpcm-size" evaluate ( /raw-buf ) + ?dup 0= if exit then \ Not an IMA ADPCM .wav file + dup to /raw-buf alloc-mem to raw-buf ( ) + + \ Decode the .wav file + " load-base" evaluate ( in ) + raw-buf " adpcm-decode" evaluate ( /raw-buf ) ( R: len wav-buf ) + ?dup 0= if exit then \ Not an IMA ADPCM .wav file + + \ Play the raw audio data + ." Press a key to abort" cr + open-out plevel set-pcm-gain glevel h# 38 codec! + begin + raw-buf /raw-buf audio-out drop + key? until write-done + key drop + + \ Release the raw audio buffer + raw-buf /raw-buf free-mem 0 to raw-buf 0 to /raw-buf +; + : selftest ( -- error? ) open 0= if ." Failed to open /audio" cr true exit then + 0 set-plevel 0 set-glevel + ?play-wav-file record-len alloc-mem to record-base ." Play tone" cr 0 set-plevel d# -12 set-glevel make-wave play - ." Record and playback" cr + ." Recording ..." cr 0 set-plevel 0 set-glevel - record play + record + ." Playing ..." cr + play record-base record-len free-mem close false ; \ LICENSE_BEGIN -\ Copyright (c) 2006 FirmWorks +\ Copyright (c) 2007 FirmWorks \ \ Permission is hereby granted, free of charge, to any person obtaining \ a copy of this software and associated documentation files (the Modified: dev/olpc/cafenand/methods.fth =================================================================== --- dev/olpc/cafenand/methods.fth 2007-05-04 07:29:47 UTC (rev 354) +++ dev/olpc/cafenand/methods.fth 2007-05-04 09:00:05 UTC (rev 355) @@ -24,6 +24,8 @@ total-pages 0= \ Error if there are no chips ; +: open-args ( -- arg$ ) my-args ascii : left-parse-string 2swap 2drop ; + external : dma-alloc ( len -- adr ) " dma-alloc" $call-parent ; @@ -62,7 +64,7 @@ get-bbt - my-args dup if ( arg$ ) + open-args dup if ( arg$ ) ascii , left-parse-string ( arg2$ arg1$ ) 2dup " zip" $= if ( arg2$ arg1$ ) 2drop ( arg2$ ) Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2007-05-04 07:29:47 UTC (rev 354) +++ dev/olpc/cafenand/selftest.fth 2007-05-04 09:00:05 UTC (rev 355) @@ -1,11 +1,18 @@ \ See license at end of file purpose: Selftest for NAND FLASH section of the OLPC CaFe chip -0 value test-block# -0 value sbuf \ Original content of block -0 value obuf \ Block data written -0 value ibuf \ Block data read -: test-page# ( -- n ) test-block# pages/eblock * ; +instance variable rn \ Random number + +: random ( -- n ) + rn @ d# 1103515245 * d# 12345 + h# 7FFFFFFF and dup rn ! +; + +false value selftest-err? +: record-err ( error? -- ) if true to selftest-err? then ; + +0 value sbuf \ Original content of block +0 value obuf \ Block data written +0 value ibuf \ Block data read : alloc-test-bufs ( -- ) sbuf 0= if erase-size alloc-mem to sbuf @@ -20,40 +27,164 @@ ibuf erase-size free-mem 0 to ibuf then ; -: determine-test-block# ( -- error? ) - -1 to test-block# - size erase-size um/mod nip 1- ( block# ) - begin dup 0> test-block# -1 = and while - dup pages/eblock * block-bad? not if dup to test-block# then - 1- ( block#' ) - repeat drop - test-block# -1 = +: read-eblock ( adr page# -- error? ) + pages/eblock read-blocks pages/eblock <> ; -: read-eblock ( adr -- error? ) - test-page# pages/eblock read-blocks pages/eblock <> +: write-eblock ( adr page# -- error? ) + dup erase-block + pages/eblock write-blocks pages/eblock <> ; -: write-eblock ( adr -- error? ) - test-page# erase-block - test-page# pages/eblock write-blocks pages/eblock <> -; -: test-eblock ( pattern -- error? ) - obuf erase-size 2 pick fill obuf write-eblock if true exit then - ibuf erase-size rot invert fill ibuf read-eblock if true exit then +: test-eblock ( page# pattern -- error? ) + obuf erase-size 2 pick fill + ibuf erase-size rot invert fill + obuf over write-eblock if true exit then + ibuf swap read-eblock if true exit then ibuf obuf erase-size comp ; -: write-test ( -- error? ) - determine-test-block# if true exit then + +\ Destroy content of flash. No argument. +: erase ( subarg$ -- ) 2drop ." Erasing..." cr wipe ; + +\ Destroy content of flash. Argument is hex byte pattern value. +: .skip-bad ( page# -- ) cr ." Skipping bad block" .page-byte cr ; +: fill ( subarg$ -- ) + $number if 0 else 0 max h# ff min then + ." Fill nandflash with h# " dup u. cr + + usable-page-limit 0 ?do + i block-bad? if + i .skip-bad + else + (cr i . i over test-eblock record-err + then + pages/eblock +loop drop +; + +\ Non-destructive. Argument is number of blocks to test. +: random-page ( -- n ) random total-pages 1- and usable-page-limit min ; +: fast ( subarg$ -- ) + $number if d# 10 else 0 max usable-page-limit pages/eblock / min then + ." Fill " dup .d ." random blocks with h# 55, h# aa and h# ff" cr + + 0 ?do + i 1 > if random-page else i 0<> if usable-page-limit 1- else 0 then then + pages/eblock 1- invert and + + dup block-bad? not if + (cr dup . + sbuf over read-eblock dup record-err 0= if + dup h# 55 test-eblock record-err + dup h# aa test-eblock record-err + dup h# ff test-eblock record-err + then + sbuf swap write-eblock record-err + then + loop +; + +\ Non-destructive. Argument is <#blk>,<blk#> +\ <#blk>+1 is number of blocks as a test unit +\ If <#blk> is absent, all blocks are tested. +\ <blk#> is the block to test in the test unit, in range of 0..<#blk> +\ If <blk#> is absent, 0 is assumed. +\ For example: test /nandflash::full test all blocks +\ test /nandflash::full,1,0 test even blocks +\ test /nandflash::full,1,1 test odd blocks +\ test /nandflash::full,2,<0-2> test 33% +\ test /nandflash::full,3,<0-3> test 25% +\ test /nandflash::full,4,<0-4> test 20% +\ test /nandflash::full,9,<0-9> test 10% +: parse-full-args ( subarg$ -- #blk blk# ) + ?dup 0= if drop 0 0 exit then + ascii , left-parse-string ( blk#$ #blk$ ) + $number if 2drop 0 0 exit then ( blk#$ #blk ) + 0 max usable-page-limit pages/eblock 1- / min + -rot $number if 0 else 0 max over min then ( #blk blk# ) +; +: .full-arg ( #blk blk# -- ) + ." Test " + over 0= if 2drop ." every block" cr exit then + ." block " u. ." every " 1+ u. ." blocks" cr +; +: full ( subarg$ -- ) + parse-full-args ( #blk blk# ) + 2dup .full-arg ( #blk blk# ) + + pages/eblock * swap 1+ pages/eblock * ( page# #page ) + usable-page-limit rot ?do ( #blk+1 ) + i block-bad? not if + (cr i . + sbuf i read-eblock dup record-err 0= if + i h# 55 test-eblock record-err + i h# aa test-eblock record-err + then + sbuf i write-eblock record-err + then + dup +loop drop +; + +: none ( subarg$ -- ) 2drop exit ; + +: help ( subarg$ -- ) + 2drop + ." Usage:" cr + ." test /nandflash[::<arg>[;<arg>[;<arg>...]]]" cr + cr + ." If no <arg> is present, the fast test is performed." cr + cr + ." <arg> can be one of the following:" cr + ." none to do nothing" cr + ." help to get this usage guide" cr + ." erase to erase the flash (destructive)" cr + ." fill[,<data>] to fill the flash with hex byte pattern <data> (destructive)" cr + ." Default <data> is 00" cr + ." fast[,<#blk>] to non-destructively test the specified <#blk> of flash" cr + ." Default <#blk> is decimal 10" cr + ." full[,<#blk>[,<blk#>]" cr + ." to non-destructively test the specified <blk#> every" cr + ." <#blk>+1 number of blocks" cr + ." Default <#blk> and <blk#> are 0" cr + ." E.g., full,1,0 test even blocks" cr + ." full,1,1 test odd blocks" cr + ." full,2,0 test 33% of the flash" cr + cr +; + +: parse-selftest-args ( arg$ -- ) + begin ( arg$ ) + ascii ; left-parse-string ?dup if ( rem$ arg$' ) + ascii , left-parse-string ( rem$ subarg$ method$ ) + my-self ['] $call-method catch if ( rem$ x x x x x ) + ." Unknown argument" cr + 3drop 2drop 2drop + true to selftest-err? + exit + then ( rem$ ) + else + drop ( rem$ ) + then + ?dup 0= until drop ( ) +; +: selftest-args ( -- arg$ ) my-args ascii : left-parse-string 2drop ; + +: (selftest) ( -- error? ) + false to selftest-err? alloc-test-bufs - sbuf read-eblock if free-test-bufs true exit then - h# 5a test-eblock if free-test-bufs true exit then - h# a5 test-eblock if free-test-bufs true exit then - sbuf write-eblock \ Restore original content + selftest-args ?dup if + parse-selftest-args + else + drop " " fast + then free-test-bufs + selftest-err? ; + : selftest ( -- error? ) open 0= if true exit then - show-bbt - write-test + get-msecs rn ! + read-id 1+ c@ h# dc <> if close true exit then + show-bbt cr + (selftest) close ;

1 0

r354 - cpu/x86
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 09:29:47 +0200 (Fri, 04 May 2007) New Revision: 354 Modified: cpu/x86/ioports.fth Log: Added MSR support to Linux-hosted I/O port access wordset. Modified: cpu/x86/ioports.fth =================================================================== --- cpu/x86/ioports.fth 2007-05-04 07:28:03 UTC (rev 353) +++ cpu/x86/ioports.fth 2007-05-04 07:29:47 UTC (rev 354) @@ -64,6 +64,34 @@ dup -1 = abort" mmap failed" ; : munmap ( virt len -- ) mem-fd d# 384 syscall 2drop ; + +-1 value msr-fd +: ?open-msr ( -- ) + msr-fd 0< if + 2 " /dev/cpu/0/msr" $cstr 8 syscall 2drop retval to msr-fd + then + msr-fd 0< abort" Can't open /dev/cpu/0/msr" +; +8 buffer: msr-data +: msr-seek ( msr# -- ) ?open-msr msr-fd _fseek ; + +: msr@ ( msr# -- d ) + msr-seek + msr-data 8 msr-fd _fread 8 <> abort" Can't read MSR" + msr-data d@ +; +: msr! ( d msr# -- ) + msr-seek + msr-data d! + msr-data 8 msr-fd _fwrite 8 <> abort" Can't write MSR" +; +: .msr ( msr# -- ) + msr@ ( d ) + push-hex ( d ) + <# [char] . hold # # # # # # # # [char] . hold # # # # # # # # #> type ( ) + pop-base +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r353 - cpu/x86 cpu/x86/pc/olpc ofw/termemu
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 09:28:03 +0200 (Fri, 04 May 2007) New Revision: 353 Added: ofw/termemu/difont.fth Modified: cpu/x86/basefw.bth cpu/x86/pc/olpc/loaddropins.fth ofw/termemu/font.fth Log: Load the screen font from a dropin module so it's easy to change, and also support .psf font format. Modified: cpu/x86/basefw.bth =================================================================== --- cpu/x86/basefw.bth 2007-05-04 07:01:20 UTC (rev 352) +++ cpu/x86/basefw.bth 2007-05-04 07:28:03 UTC (rev 353) @@ -59,7 +59,7 @@ fload ${BP}/ofw/termemu/loadfb.fth \ S Frame buffer support \ fload ${BP}/ofw/termemu/cp881-16.fth \ ISO-Latin1 Font -fload ${BP}/ofw/termemu/gallant2.fth \ Sun font, tip o' the hat to Vaughn Pratt +fload ${BP}/ofw/termemu/difont.fth \ Get font from a dropin module fload ${BP}/ofw/gui/alert.fth \ Basic dialogs and alerts fload ${BP}/dev/stringio.fth \ Output diversion Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-05-04 07:01:20 UTC (rev 352) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-05-04 07:28:03 UTC (rev 353) @@ -37,3 +37,5 @@ " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wireless.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin + + " ${BP}/ofw/termemu/gallant.obf" " font" $add-deflated-dropin Added: ofw/termemu/difont.fth =================================================================== --- ofw/termemu/difont.fth (rev 0) +++ ofw/termemu/difont.fth 2007-05-04 07:28:03 UTC (rev 353) @@ -0,0 +1,10 @@ +purpose: Incorporate font into dictionary from dropin module + +0 value 'di-font + +: di-font ( -- adr ) + 'di-font ?dup if exit then + " font" find-drop-in if drop to 'di-font 'di-font exit then + 0 +; +' di-font to romfont Modified: ofw/termemu/font.fth =================================================================== --- ofw/termemu/font.fth 2007-05-04 07:01:20 UTC (rev 352) +++ ofw/termemu/font.fth 2007-05-04 07:28:03 UTC (rev 353) @@ -61,11 +61,28 @@ headerless : decode-font ( hdr-adr -- bits-adr width height advance min-char #glyphs ) - dup d# 24 + swap ( bits-adr hdr-adr ) - d# 24 ( bits-adr hdr-adr hdr-len ) - 4 decode-bytes " font" $= 0= abort" Not a font" ( bits-adr str ) - 5 0 do decode-int -rot loop ( bits-adr width height advance min #gl str ) - 2drop ( bits-adr width height advance min-char #glyphs ) + dup " font" comp 0= if ( hdr-adr ) \ OBF font format + dup d# 24 + swap ( bit-adr hdr-adr ) + 4 + d# 20 ( bit-adr hdr-adr' hdr-len ) + 5 0 do decode-int -rot loop ( bits-adr width height advance min #gl str ) + 2drop ( bits-adr width height advance min-char #glyphs ) + exit + then ( hdr-adr ) + + \ http://www.win.tue.nl/~aeb/linux/kbd/font-formats-1.html + dup le-l@ h# 864ab572 = if ( hdr-adr ) \ PSF2 format, little endian + >r ( r: hdr-adr ) + r@ r@ 8 + le-l@ + ( bits-adr r: hdr-adr ) + r@ h# 1c + le-l@ ( bits-adr width r: hdr-adr ) + r@ h# 18 + le-l@ negate ( bits-adr width height r: hdr-adr ) + over 7 + 8 / ( bits-adr width height advance r: hdr-adr ) + 0 ( bits-adr width height advance min r: hdr-adr ) + r@ h# 10 + le-l@ ( bits-adr width height advance #glyphs r: hdr-adr ) + r> drop ( bits-adr width height advance #glyphs ) + exit + then ( hdr-adr ) + + true abort" Not a font" ; headers also forth definitions

1 0

r352 - cpu/x86/pc/olpc
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 09:01:20 +0200 (Fri, 04 May 2007) New Revision: 352 Modified: cpu/x86/pc/olpc/olpc.bth Log: OLPC - don't include memtest in the ROM for the LX devel board. Modified: cpu/x86/pc/olpc/olpc.bth =================================================================== --- cpu/x86/pc/olpc/olpc.bth 2007-05-04 07:00:17 UTC (rev 351) +++ cpu/x86/pc/olpc/olpc.bth 2007-05-04 07:01:20 UTC (rev 352) @@ -71,7 +71,9 @@ fload ${BP}/cpu/x86/pc/olpc/loaddropins.fth " sourceurl" " sourceurl" $add-dropin +[ifndef] lx-devel " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin +[then] [ifdef] lx-devel " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin [then]

1 0

r351 - cpu/x86/pc/olpc
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 09:00:17 +0200 (Fri, 04 May 2007) New Revision: 351 Modified: cpu/x86/pc/olpc/chipinit.fth cpu/x86/pc/olpc/romreset.bth cpu/x86/pc/olpc/vsapci.fth Log: OLPC - (a) Changed frame buffer size to 16M (b) fixed some MSR and PCI header values based on a comparison with LinuxBIOS for LX. Modified: cpu/x86/pc/olpc/chipinit.fth =================================================================== --- cpu/x86/pc/olpc/chipinit.fth 2007-05-04 06:56:57 UTC (rev 350) +++ cpu/x86/pc/olpc/chipinit.fth 2007-05-04 07:00:17 UTC (rev 351) @@ -339,7 +339,11 @@ msr: 0000.1210 00000000.00000003. \ Suspend on halt and pause msr: 0000.1900 00000000.02001131. \ Pausedly 16 clocks, SUSP + TSC_SUSP msr: 0000.1920 00000000.0000000f. \ Enable L2 cache - msr: 0000.1a00 00000000.00000001. \ GX p 178 Imprecise exceptions + msr: 0000.1930 00000000.00070303. \ MSR_PMODE + msr: 0000.1981 00000000.2814d352. \ MSS_ARRAY_CTL0 - cache timings - value from PRS + msr: 0000.1982 00000000.1068334d. \ MSS_ARRAY_CTL1 - cache timings - value from PRS + msr: 0000.1983 00000106.83104104. \ MSS_ARRAY_CTL2 - cache timings - value from PRS + msr: 0000.1a00 00000000.00000001. \ Imprecise exceptions \ northbridgeinit: GLIUS \ msr: 1000.0020 20000000.000fff80. \ 0 - 7.ffff low RAM Early startup @@ -351,13 +355,13 @@ \ msr: 1000.0026 000000ff.fff00000. \ Unmapped - default \ Graphics -\ msr: 1000.0029 20a7e0fd.7fffd000. \ fd00.0000 - fd7f.ffff mapped to 77e.0000 Memsize dependent (Frame Buffer) +\ msr: 1000.0029 20a7e0fd.ffffd000. \ fd00.0000 - fdff.ffff mapped to f00.0000 Memsize dependent, fbsize dependent msr: 1000.002a 801ffcfe.007fe004. \ fe00.4000 - fe00.7fff mapped to 0 in DC space \ msr: 1000.002b 00000000.000fffff. \ Unmapped - default \ msr: 1000.002c 00000000.00000000. \ Unmapped - default (Swiss Cheese) - msr: 1000.0080 00000000.00000003. \ Coherency + msr: 1000.0080 00000000.00000003. \ Coherency - route snoops to CPU msr: 1000.0082 80000000.00000000. \ Arbitration msr: 1000.0083 00000000.0000ff00. \ Disable SMIs msr: 1000.0084 00000000.0000ff00. \ Disable Async errors @@ -376,11 +380,11 @@ \ msr: 4000.0023 000000ff.fff00000. \ Unmapped - default msr: 4000.0024 200000fe.004ffffc. \ fe00.4000 - fe00.7fff DC, route to GLIU0 msr: 4000.0025 400000fe.008ffffc. \ fe00.8000 - fe00.bfff VP, route to VP in GLIU1 - msr: 4000.0026 a00000fe.00cffffc. \ fe00.c000 - fe00.ffff VIP, route to VP in GLIU1 + msr: 4000.0026 a00000fe.00cffffc. \ fe00.c000 - fe00.ffff VIP, route to VIP in GLIU1 \ msr: 4000.0027 000000ff.fff00000. \ Unmapped - default \ msr: 4000.0028 000000ff.fff00000. \ Unmapped - default \ msr: 4000.0029 000000ff.fff00000. \ Unmapped - default - msr: 4000.002a 200000fd.7fffd000. \ frame buffer - fd00.0000 .. fd7f.ffff, route to GLIU0 + msr: 4000.002a 200000fd.ffffd000. \ frame buffer - fd00.0000 .. fdff.ffff, route to GLIU0, fbsize msr: 4000.002b c00000fe.013fe010. \ Security Block - fe01.0000 .. fe01.3fff \ msr: 4000.002c 20000007.7ff00100. \ 10.0000 - 0f7f.ffff High RAM - Memsize dependent \ msr: 4000.002d 00000000.000fffff. \ Unmapped - default @@ -402,7 +406,7 @@ msr: 0000.2001 00000000.00000220. msr: 4c00.2001 00000000.00000001. msr: 5000.2001 00000000.00000027. - msr: 5800.2001 00000000.00000000. + msr: 5800.2001 00000000.00000013. msr: 8000.2001 00000000.00000320. msr: 0000.1700 00000000.00000400. \ Evict clean lines - necessary for L2 @@ -418,8 +422,8 @@ msr: 0000.180d 00000000.00000000. \ Cache e0000-fffff \ msr: 0000.180e 00000001.00000001. \ SMM off - default \ msr: 0000.180f 00000001.00000001. \ DMM off - default - msr: 0000.1810 fd7ff000.fd000111. \ Video (write through) - msr: 0000.1811 fe00f000.fe000101. \ GP + DC + VP + VIP registers non-cacheable + msr: 0000.1810 fdfff000.fd000111. \ Video (write through), fbsize + msr: 0000.1811 fe013000.fe000101. \ GP + DC + VP + VIP + AES registers non-cacheable \ msr: 0000.1812 00000000.00000000. \ Disabled - default \ msr: 0000.1813 00000000.00000000. \ Disabled - default \ msr: 0000.1814 00000000.00000000. \ Disabled - default @@ -428,32 +432,38 @@ \ msr: 0000.1817 00000000.00000000. \ Disabled - default \ PCI -\ msr: 5000.2000 00000000.00105001. \ RO +\ msr: 5000.2000 00000000.00105400. \ RO msr: 5000.2001 00000000.00000017. \ Priority 1, domain 7 msr: 5000.2002 00000000.003f003f. \ No SMIs msr: 5000.2003 00000000.00370037. \ No ERRs msr: 5000.2004 00000000.00000015. \ Clock gating for 3 clocks msr: 5000.2005 00000000.00000000. \ Enable some PCI errors - msr: 5000.2010 fff01120.001a021d. \ PCI timings + msr: 5000.2010 fff01120.001a021d. \ PCI timings - LB has the latency timer at max msr: 5000.2011 04000300.00800f01. \ GLPCI_ARB - LX page 581 - msr: 5000.2014 00000000.00f000ff. - msr: 5000.2015 30303030.30303030. \ Cache, prefetch, write combine a0000 - bffff - msr: 5000.2016 30303030.30303030. \ Cache, prefetch, write combine c0000 - dffff - msr: 5000.2017 34343434.30303030. \ Cache, prefetch, write combine e0000 - fffff, write protect f0000 - fffff + +\ I don't think we need to do anything special for the DOS hole from PCI +\ msr: 5000.2014 00000000.00f000ff. \ Fixed region enables - f, b, and a +\ msr: 5000.2015 30303030.30303030. \ Cache, prefetch, write combine a0000 - bffff +\ msr: 5000.2016 30303030.30303030. \ Cache, prefetch, write combine c0000 - dffff +\ msr: 5000.2017 34343434.30303030. \ Cache, prefetch, write combine e0000 - fffff, write protect f0000 - fffff + msr: 5000.2018 000ff000.00000130. \ Cache PCI DMA to low memory 0 .. fffff \ msr: 5000.2019 0f7ff000.00100130. \ Cache PCI DMA to high memory - Memsize dependent \ msr: 5000.201a 4041f000.40400120. \ msr: 5000.201a 00000000.00000000. \ Off - default msr: 5000.201b 00000000.00000000. msr: 5000.201c 00000000.00000000. - msr: 5000.201e 00000000.00000f00. + msr: 5000.201e 00000000.00000f00. \ PCI function number for MSR accesses to VP port msr: 5000.201f 00000000.0000004b. \ We don't need posted I/O writes to IDE, as we have no IDE -\ clockgating -\ msr: 5400.2004 00000000.00000000. \ Clock gating - default -\ msr: 5400.2004 00000000.00000003. \ Clock gating +\ VIP +\ msr: 5400.2004 00000000.00000005. \ Clock gating - default +\ AES +\ msr: 5800.2002 00000007.00000007. \ SMI mask - default is all off +\ msr: 5800.2004 00000000.00000015. \ Clock gating - default + \ chipsetinit(nb); \ Set the prefetch policy for various devices @@ -472,23 +482,26 @@ \ setup_gx2(); \ Graphics init - msr: a000.2001 00000000.0fd60000. \ CBASE field is FB addr + 6M + msr: a000.2001 00000000.0fde0000. \ CBASE field is FB addr + 14M, fbsize msr: a000.2002 00000001.00000001. \ Disable GP SMI msr: a000.2003 00000003.00000003. \ Disable GP ERR msr: a000.2004 00000000.00000001. \ Clock gating msr: 8000.2001 00000000.00000720. \ VG config (priority) - msr: 8000.2002 00001fff.00001fff. \ Disable SMIs + msr: 8000.2002 1001ffff.1001ffff. \ Disable SMIs msr: 8000.2003 0000003f.0000003f. \ Disable ERRs \ msr: 8000.2004 00000000.00000000. \ Clock gating - default \ msr: 8000.2004 00000000.00000055. \ Clock gating - msr: 8000.2011 00000000.00000001. \ VG SPARE - VG fetch state machine hardware fix off - msr: 8000.2012 00000000.06060202. \ VG DELAY + msr: 8000.2011 00000000.00000042. \ VG SPARE - VG fetch state machine hardware fix off + msr: 8000.2012 00000000.00000302. \ VG DELAY \ msr: 4c00.0015 00000037.00000001. \ MCP DOTPLL reset; unnecessary because of later video init \ More GLCP stuff - msr: 4c00.000f f2f100ff.56960444. \ I/O buffer delay controls - msr: 4c00.0016 00000000.00000000. \ Turn off debug clock + msr: 4c00.000f f2f100ff.56960444. \ I/O buffer delay controls - LB uses 82f1.00aa.5696.0444 + \ Our value has lower drive for mem signals and more delay for BA, MA, CKE, CS, RAS, CAS, WE + + msr: 4c00.0016 00000000.00000000. \ Turn off debug clock - LB has 2 (default, GLIU1 to debug logic) +\ msr: 4c00.001e 00000000.0000603c. \ Processor throttle off delay - LB values msr: 4c00.2004 00000000.00000015. \ Hardware clock gating for everything (Insyde uses 0x14) msr: 5000.2014 00000000.00ffffff. \ Enables PCI access to low mem @@ -642,7 +655,7 @@ h# fd00.0000 h# 84 dc-base + l! \ GLIU0 Memory offset h# fd00.0000 h# 4c gp-base + l! \ GP base - h# fd80.0000 h# 460 vp-base + l! \ Flat panel base + h# fd80.0000 h# 460 vp-base + l! \ Flat panel base (reserved on LX) \ VGdata.hw_vga_base = h# fd7.c000 \ VGdata.hw_cursor_base = h# fd7.bc00 Modified: cpu/x86/pc/olpc/romreset.bth =================================================================== --- cpu/x86/pc/olpc/romreset.bth 2007-05-04 06:56:57 UTC (rev 350) +++ cpu/x86/pc/olpc/romreset.bth 2007-05-04 07:00:17 UTC (rev 351) @@ -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.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 + 25fff002.10f00000. 1808 set-msr \ 1M ROM at fff0.0000, system RAM limit at 0f00.0000, fbsize + 2000000e.fff00100. 10000028 set-msr \ Top of memory at 0eff.ffff, fbsize + 212000fd.ffffd000. 10000029 set-msr \ Frame buffer at PA fd00.0000 maps to RAM at 0f00.0000, fbsize 10076013.00005040. 20000018 set-msr \ DIMM1 empty, DIMM0 256 MB, 1 module bank, 8K pages 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 + 0efff000.00100130. 50002019 set-msr \ PCI DMA to memory from 1M to RAM limit at 0f00.0000, fbsize \ 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-05-04 06:56:57 UTC (rev 350) +++ cpu/x86/pc/olpc/vsapci.fth 2007-05-04 07:00:17 UTC (rev 351) @@ -34,7 +34,7 @@ ff800000 , fffff000 , fffff000 , fffff000 , 0 , 0 , 0 , 0 , - 30100b , 2200003 , 3000000 , 0 , + 30100b , 2200002 , 3000000 , 8 , fd000000 , fe000000 , fe004000 , fe008000 , \ FB, GP, VG, DF 0 , 0 , 0 , 30100b , \ VIP (LX only) 0 , 0 , 0 , 0 , @@ -58,13 +58,13 @@ ffffc000 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 20281022 , 2a00006 , 10100000 , 8 , + 20821022 , 2a00006 , 10100000 , 8 , fe010000 , 0 , 0 , 0 , \ I/O BAR - base of virtual registers 0 , 0 , 0 , 20821022 , + 0 , 0 , 0 , 10e , \ INTA, IRQ 14 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , 0 [if] \ Turned off create nand-hdr \ Doesn't appear as a PCI device, and kernel doesn't care @@ -197,12 +197,14 @@ lx? if \ Amend the fake PCI headers for the LX settings - h# 281022 nb-hdr h# 20 + l! \ Vendor/device ID - AMD + h# 20801022 nb-hdr h# 20 + l! \ Vendor/device ID - AMD + h# 20801022 nb-hdr h# 4c + l! \ Vendor/device ID - AMD - h# ff000000 gxfb-hdr h# 0 + l! \ BAR0 MASK - FB + h# ff000008 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 + h# 20811022 gxfb-hdr h# 4c + l! \ Vendor/device ID - AMD h# 10e gxfb-hdr h# 5c + w! \ Interrupt pin and line - INTA, IRQ 14 then

1 0

r350 - cpu/x86/pc/olpc
by svn＠openbios.org 04 May '07

04 May '07

Author: wmb Date: 2007-05-04 08:56:57 +0200 (Fri, 04 May 2007) New Revision: 350 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC - Removed debug message from game key sending code. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-03 08:30:22 UTC (rev 349) +++ cpu/x86/pc/olpc/fw.bth 2007-05-04 06:56:57 UTC (rev 350) @@ -426,8 +426,7 @@ : user-switch? ( -- flag ) [ifdef] lx-devel false exit [then] -." Game key value is " - game-key@ dup . cr 0<> dup if + game-key@ 0<> dup if ." Release the game key to continue" cr begin d# 100 ms game-key@ 0= until then

1 0

openbios compile issue, goal = solaris 8/9 (sparc64) under qemu
by Kristian Hermansen 03 May '07

03 May '07

Hello! I am interested in running Solaris 8/9 under qemu. According to the thread below, it may be possible with more recent versions of OpenBIOS: http://qemu-forum.ipi.fi/viewtopic.php?p=10243 So I attempt to investigate. However, I am unable to build the alpha release of OpenBIOS from 20070427. I currently have qemu (20070501-svn-snapshot) Here are the details of my machine setup, and other variables, along with the output of the errors. administrator@ubuntu-khermans-desk:/tmp/openbios-devel$ uname -a Linux ubuntu-khermans-desk 2.6.20-15-generic #2 SMP Sun Apr 15 07:36:31 UTC 2007 i686 GNU/Linux administrator@ubuntu-khermans-desk:/tmp/openbios-devel$ cat /etc/lsb-release DISTRIB_ID=Ubuntu DISTRIB_RELEASE=7.04 DISTRIB_CODENAME=feisty DISTRIB_DESCRIPTION="Ubuntu 7.04" administrator@ubuntu-khermans-desk:/tmp/openbios-devel$ cat /proc/cpuinfo processor : 0 vendor_id : GenuineIntel cpu family : 15 model : 2 model name : Intel(R) Pentium(R) 4 CPU 3.00GHz stepping : 9 cpu MHz : 2992.671 cache size : 512 KB physical id : 0 siblings : 2 core id : 0 cpu cores : 1 fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 2 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid xtpr bogomips : 5989.50 clflush size : 64 processor : 1 vendor_id : GenuineIntel cpu family : 15 model : 2 model name : Intel(R) Pentium(R) 4 CPU 3.00GHz stepping : 9 cpu MHz : 2992.671 cache size : 512 KB physical id : 0 siblings : 2 core id : 0 cpu cores : 1 fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 2 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe cid xtpr bogomips : 5985.43 clflush size : 64 administrator@ubuntu-khermans-desk:/tmp/openbios-devel$ ls -l /usr/bin/gcc* lrwxrwxrwx 1 root root 7 2007-04-05 21:37 /usr/bin/gcc -> gcc-4.1 -rwxr-xr-x 1 root root 80916 2007-01-03 15:22 /usr/bin/gcc-3.3 -rwxr-xr-x 1 root root 85044 2007-01-02 12:03 /usr/bin/gcc-3.4 -rwxr-xr-x 1 root root 183904 2007-03-02 21:52 /usr/bin/gcc-4.1 lrwxrwxrwx 1 root root 10 2007-04-05 21:37 /usr/bin/gccbug -> gccbug-4.1 -rwxr-xr-x 1 root root 15970 2007-01-03 15:17 /usr/bin/gccbug-3.3 -rwxr-xr-x 1 root root 16090 2007-01-02 11:57 /usr/bin/gccbug-3.4 -rwxr-xr-x 1 root root 16266 2007-03-02 21:47 /usr/bin/gccbug-4.1 -rwxr-xr-x 1 root root 2018 2006-12-20 09:41 /usr/bin/gccmakedep administrator@ubuntu-khermans-desk:/tmp/openbios-devel$ config/scripts/switch-arch cross-sparc64 administrator@ubuntu-khermans-desk:/tmp/openbios-devel$ make /usr/bin/xsltproc Building OpenBIOS on x86 for sparc64 Cleaning up... ok Initializing build tree...ok. Creating target Makefile...ok. Creating config files...ok. Building...error: Compiling dictionary 1/2 Compiling dictionary 2/2 OpenBIOS dictionary: version: 2 cellsize: 8 endianess: big compression: no relocation: yes checksum: ad683c47 length: 00000000 last: 0 sparc64-linux-gcc $EXTRACFLAGS -Wa,-xarch=v9 -Wa,-64 -g -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -g -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany -fno-builtin -nostdlib -ffreestanding -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels -Wstrict-aliasing -Iinclude -Ikernel/include -Iobj-sparc64/target/include -c -o obj-sparc64/target/arch/sparc64/entry.o arch/sparc64/entry.S /bin/sh: sparc64-linux-gcc: not found make[1]: *** [obj-sparc64/target/arch/sparc64/entry.o] Error 127 make[1]: Leaving directory `/tmp/openbios-devel' So, I notice that the package egcs64 may provide sparc64-linux-gcc, but I am unable to find such a package in debian/ubuntu or the sources to compile it myself. However, the google searches I made turned up only people on SPARC platforms running egcs64, so I am unsure what the requirements are to get to my intended goal -- Solaris 8/9 under qemu. Any help is greatly appreciated! Thanks :-) -- Kristian Hermansen

2 3

r349 - dev/olpc/cafecamera
by svn＠openbios.org 03 May '07

03 May '07

Author: wmb Date: 2007-05-03 10:30:22 +0200 (Thu, 03 May 2007) New Revision: 349 Modified: dev/olpc/cafecamera/cafecamera.fth Log: CaFe camera driver - Minor change in the ordering of the open routine, so the first-time? flag doesn't get cleared if the open failed. This makes it easier to debug failed opens because you can retry and the init process will be redone. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-05-03 08:28:56 UTC (rev 348) +++ dev/olpc/cafecamera/cafecamera.fth 2007-05-03 08:30:22 UTC (rev 349) @@ -458,8 +458,9 @@ : open ( -- flag ) map-regs - first-open? if init false to first-open? then + first-open? if init then ov7670-detected? 0= if unmap-regs false exit then + false to first-open? alloc-dma-bufs read-setup true

1 0

r348 - dev/mmc/sdhci
by svn＠openbios.org 03 May '07

03 May '07

Author: wmb Date: 2007-05-03 10:28:56 +0200 (Thu, 03 May 2007) New Revision: 348 Modified: dev/mmc/sdhci/sdmmc.fth Log: SDMMC driver - Removed the "No SD card" message, which is too verbose in the usual case of booting the system with no card in the SD slot. Modified: dev/mmc/sdhci/sdmmc.fth =================================================================== --- dev/mmc/sdhci/sdmmc.fth 2007-05-03 08:25:39 UTC (rev 347) +++ dev/mmc/sdhci/sdmmc.fth 2007-05-03 08:28:56 UTC (rev 348) @@ -33,10 +33,7 @@ : dma-free ( vadr size -- ) " dma-free" $call-parent ; : open ( -- ) - " attach-card" $call-parent 0= if - ." No SD card" cr - false exit - then + " attach-card" $call-parent 0= if false exit then " " " deblocker" $open-package ?dup if to deblocker

1 0

r347 - dev/olpc/kb3700
by svn＠openbios.org 03 May '07

03 May '07

Author: wmb Date: 2007-05-03 10:25:39 +0200 (Thu, 03 May 2007) New Revision: 347 Modified: dev/olpc/kb3700/ecio.fth Log: OLPC EC commands - Added a time delay to the polling loop for EC command response data, so the system doesn't hang because the EC is being polled too fast for it to make any progress. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-05-03 08:23:33 UTC (rev 346) +++ dev/olpc/kb3700/ecio.fth 2007-05-03 08:25:39 UTC (rev 347) @@ -42,8 +42,8 @@ : 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-wait-wr ( -- ) begin ec-cmd@ 2 and while key? abort" wait wr" 1 ms repeat ; +: ec-wait-rd ( -- ) begin ec-cmd@ 1 and 0= while key? abort" wait rd" 1 ms repeat ; : 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! ;

1 0

r346 - cpu/x86/pc/olpc dev/olpc/touchpad
by svn＠openbios.org 03 May '07

03 May '07

Author: wmb Date: 2007-05-03 10:23:33 +0200 (Thu, 03 May 2007) New Revision: 346 Added: cpu/x86/pc/olpc/suspend.fth Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/micin.fth dev/olpc/touchpad/touchpad.fth Log: OLPC trac #1371 - Get board revision from EC. I revamped the board revision sensing code, moving some distributed logic into one place. The word "board-revision" now returns a number that has 3 digits when represented in hex. The first 2 digits are the "conventional" board revision number, e.g. "B3", and the third digit indicates build stages. Pre-B3 is h# B30 , first production B3 will be B38, and subsequent variations might be B39, B3A, etc. In general, the pre- version will have third digit 0 and the first production version will have third digit 8. I did it this way so the numbers increase monotonically, to make it easy to test for "a certain revision or later". This checkin also adds a suspend/resume test to the touchpad tracking test. If you type 's' while in the middle of the touchpad test, the system will suspend, and when you resume it with the power button, the touchpad test continues. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-05-03 07:54:13 UTC (rev 345) +++ cpu/x86/pc/olpc/devices.fth 2007-05-03 08:23:33 UTC (rev 346) @@ -4,21 +4,6 @@ : gx? ( -- flag ) h# 4c000017 msr@ drop 4 rshift 2 = ; : lx? ( -- flag ) h# 4c000017 msr@ drop 4 rshift 3 = ; -: board-revision ( -- n ) - lx? if - 1 -[ifdef] notyet - h# fa20 ec@ case - h# b2 of 0 endof - h# b3 of 1 endof - h# c1 of 2 endof - endcase -[then] - else - h# 4c00.0014 rdmsr drop 4 rshift 7 and - then -; - fload ${BP}/cpu/x86/pc/isaio.fth [ifdef] rom-loaded @@ -262,16 +247,26 @@ ; warning ! +: board-revision ( -- n ) + atest? if h# a18 exit then + lx? if + board-id@ case + h# b2 of h# b30 endof \ preB3 + ( board-id ) dup h# 10 * 8 + swap \ E.g. b3 -> b38 + endcase + else + h# 4c00.0014 rdmsr drop ( RSTPLL-value ) + 4 rshift 7 and 7 = if h# b28 else h# b18 then + then +; + stand-init: PCI properties " /pci" find-device - atest? if + board-revision h# b18 < if d# 33,333,333 else - board-revision 7 = if - d# 33,333,333 - else - d# 66,666,667 - then + \ We switched to 66 MHz at B2 + d# 66,666,667 then " clock-frequency" integer-property dend Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-05-03 07:54:13 UTC (rev 345) +++ cpu/x86/pc/olpc/fw.bth 2007-05-03 08:23:33 UTC (rev 346) @@ -217,16 +217,19 @@ : stand-init stand-init root-device - atest? if " A1" " OLPC A-test" else - board-revision case - 0 of " B2" " OLPC B2" endof - 1 of " B3" " OLPC B3" endof - 7 of " B1" " OLPC B1" endof - ( default ) >r " ??" " OLPC ??" r> - endcase - then + board-revision case + h# a18 of " A1" " OLPC A-test" endof + h# b18 of " B1" " OLPC B1" endof + h# b28 of " B2" " OLPC B2" endof + h# b30 of " preB3" " OLPC preB3" endof + h# b38 of " B3" " OLPC B3" endof + h# b40 of " preB4" " OLPC preB4" endof + h# b48 of " B4" " OLPC B4" endof + ( default ) >r " ??" " OLPC ??" r> + endcase encode-string " banner-name" property model + board-revision " board-revision-int" integer-property [ifndef] lx-devel 8 ec-cmd " ec-version" integer-property @@ -270,13 +273,13 @@ [ifdef] lx-devel h# 3ea exit \ USB4:PWR2 USB3:PWR1 USB2:PWR1 USB1:PWR1 [then] - board-revision case - 0 of h# 3ab endof \ B2 \ USB4:PWR1 USB3:PWR1 USB2:PWR1 USB1:PWR2 - 1 of h# 3aa endof \ B3 \ USB4:PWR1 USB3:PWR1 USB2:PWR1 USB1:PWR1 - 2 of h# 3aa endof \ C1 \ USB4:PWR1 USB3:PWR1 USB2:PWR1 USB1:PWR1 (guess) - 7 of h# 3ab endof \ B1 - ( default ) h# 3ab swap \ A - and early B1 (actually not switched, but no harm) - endcase + board-revision h# b10 h# b2f between if \ B1 and B2 + h# 3ab \ USB4:PWR1 USB3:PWR1 USB2:PWR1 USB1:PWR2 + else + \ A-test doesn't switch USB power, so the value doesn't matter. + \ preB3 and presumably later use this value + h# 3aa \ USB4:PWR1 USB3:PWR1 USB2:PWR1 USB1:PWR1 + then ; fload ${BP}/cpu/x86/pc/olpc/usb.fth @@ -361,6 +364,7 @@ [ifdef] olpc fload ${BP}/cpu/x86/pc/olpc/gui.fth +fload ${BP}/cpu/x86/pc/olpc/suspend.fth \ Suspend/resume setup fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports @@ -422,27 +426,14 @@ : user-switch? ( -- flag ) [ifdef] lx-devel false exit [then] - atest? if - h# fc3f ec@ h# ff <> - else - \ The EC can tristate the KEY_OUT lines behind our back, so we - \ try several times to observe a key press. Empirically, the EC - \ takes about 1.5 mS to finish an (infrequent) scan. - d# 5 0 do - \ Output enable the KEY_OUT matrix lines - h# fc12 ec@ dup h# e0 or h# fc12 ec! ( old ) - h# fc34 ec@ h# 70 and ( old keys ) - \ Output disable the KEY_OUT matrix lines - swap h# e0 invert and h# fc12 ec! ( keys ) - h# 70 <> if true unloop exit then - 2 ms - loop - false +." Game key value is " + game-key@ dup . cr 0<> dup if + ." Release the game key to continue" cr + begin d# 100 ms game-key@ 0= until then ; : fast-boot? ( -- flag ) [ifdef] rom-loaded -false exit user-switch? 0= [else] false @@ -504,36 +495,6 @@ " keyboard" open-dev ?dup if set-stdin then ; -stand-init: Suspend/resume - " resume" find-drop-in if - suspend-base swap move - msr-init-range ( adr len ) - resume-data h# 34 + ! ( adr ) - >physical resume-data h# 30 + ! ( ) - then -; - -\ Useful for debugging suspend/resume problems -\ : sum-forth ( -- ) 0 here origin do i c@ + loop . cr ; - -code ax-call ( ax-value dst -- ) bx pop ax pop bx call c; - -: s3 - \ Enable wakeup from power button, also clearing - \ any status bits in the low half of the register. - h# 1840 pl@ h# 100.0000 or h# 1840 pl! - -\ sum-forth - [ also dev /mmu ] pdir-va h# f0000 ax-call [ previous definitions ] -\ sum-forth -; -: suspend - " video-save" stdout @ $call-method \ Freeze display - s3 - " video-restore" stdout @ $call-method \ Unfreeze display -; -alias s suspend - : startup ( -- ) standalone? 0= if exit then Modified: cpu/x86/pc/olpc/micin.fth =================================================================== --- cpu/x86/pc/olpc/micin.fth 2007-05-03 07:54:13 UTC (rev 345) +++ cpu/x86/pc/olpc/micin.fth 2007-05-03 08:23:33 UTC (rev 346) @@ -4,10 +4,7 @@ \ This uses an undocumented register in the AD1888 codec. \ It turns off the DC offset compensator. -: post-b1? ( -- flag ) - atest? if false exit then \ atest is detected via EC type - board-revision 0 6 between \ b1 is board revision 7 -; +: post-b1? ( -- flag ) board-revision h# b10 >= ; : ac-mode ( -- ) post-b1? if Added: cpu/x86/pc/olpc/suspend.fth =================================================================== --- cpu/x86/pc/olpc/suspend.fth (rev 0) +++ cpu/x86/pc/olpc/suspend.fth 2007-05-03 08:23:33 UTC (rev 346) @@ -0,0 +1,56 @@ +purpose: Setup and tests for suspend/resume to RAM +\ See license at end of file + +stand-init: Suspend/resume + " resume" find-drop-in if + suspend-base swap move + msr-init-range ( adr len ) + resume-data h# 34 + ! ( adr ) + >physical resume-data h# 30 + ! ( ) + then +; + +\ Useful for debugging suspend/resume problems +\ : sum-forth ( -- ) 0 here origin do i c@ + loop . cr ; + +code ax-call ( ax-value dst -- ) bx pop ax pop bx call c; + +: s3 + \ Enable wakeup from power button, also clearing + \ any status bits in the low half of the register. + h# 1840 pl@ h# 100.0000 or h# 1840 pl! + +\ sum-forth + [ also dev /mmu ] pdir-va h# f0000 ax-call [ previous definitions ] +\ sum-forth +; +: suspend + " video-save" stdout @ $call-method \ Freeze display + s3 + " video-restore" stdout @ $call-method \ Unfreeze display +; +alias s suspend + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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 Modified: dev/olpc/touchpad/touchpad.fth =================================================================== --- dev/olpc/touchpad/touchpad.fth 2007-05-03 07:54:13 UTC (rev 345) +++ dev/olpc/touchpad/touchpad.fth 2007-05-03 08:23:33 UTC (rev 346) @@ -380,14 +380,21 @@ gs-only begin begin pad? if track then key? until - key upc [char] P = dup if - cursor-on - cr last-10 - key drop - background - then - 0= until + key upc case + [char] P of + cursor-on + cr last-10 + key drop + background + false + endof + [char] S of suspend stream-on false endof + + ( key ) true swap + endcase + until + close 0 ;

1 0

r345 - dev/olpc/cafenand
by svn＠openbios.org 03 May '07

03 May '07

Author: wmb Date: 2007-05-03 09:54:13 +0200 (Thu, 03 May 2007) New Revision: 345 Modified: dev/olpc/cafenand/selftest.fth Log: OLPC trac #1391 - NAND selftest was failing on Samsung and ST 1G NAND FLASH parts because the selftest was checking for the 512 MB size code. Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2007-05-03 07:51:00 UTC (rev 344) +++ dev/olpc/cafenand/selftest.fth 2007-05-03 07:54:13 UTC (rev 345) @@ -52,7 +52,6 @@ ; : selftest ( -- error? ) open 0= if true exit then - read-id 1+ c@ h# dc <> if close true exit then show-bbt write-test close

1 0

r344 - cpu/x86/pc/olpc
by svn＠openbios.org 03 May '07

03 May '07

Author: wmb Date: 2007-05-03 09:51:00 +0200 (Thu, 03 May 2007) New Revision: 344 Modified: cpu/x86/pc/olpc/chipinit.fth cpu/x86/pc/olpc/vsapci.fth Log: OLPC B3 - Added interrupt line and interrupt pin reporting for the LX display, and changed the display interrupt to IRQ14 so it doesn't share with the CaFe interrupt. Modified: cpu/x86/pc/olpc/chipinit.fth =================================================================== --- cpu/x86/pc/olpc/chipinit.fth 2007-05-01 16:45:44 UTC (rev 343) +++ cpu/x86/pc/olpc/chipinit.fth 2007-05-03 07:51:00 UTC (rev 344) @@ -551,7 +551,7 @@ msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW - msr: 5140.0023 00000000.60baa5b2. \ IRQM_ZHIGH + msr: 5140.0023 00000000.60baa5e2. \ IRQM_ZHIGH msr: 5140.0025 00000000.00001002. \ IRQM_LPC \ msr: 5140.0028 00000000.00000000. \ MFGPT_IRQ off - default \ msr: 5140.0040 00000000.00000000. \ DMA_MAP - default Modified: cpu/x86/pc/olpc/vsapci.fth =================================================================== --- cpu/x86/pc/olpc/vsapci.fth 2007-05-01 16:45:44 UTC (rev 343) +++ cpu/x86/pc/olpc/vsapci.fth 2007-05-03 07:51:00 UTC (rev 344) @@ -38,7 +38,7 @@ fd000000 , fe000000 , fe004000 , fe008000 , \ FB, GP, VG, DF 0 , 0 , 0 , 30100b , \ VIP (LX only) 0 , 0 , 0 , 0 , - 0 , 0 , 0 , 0 , + 0 , 0 , 0 , 0 , \ Interrupt goes at 5c for LX 3d0 , 3c0 , a0000 , 0 , \ VG IO, VG IO, EGA FB, MONO FB 0 , 0 , 0 , 0 , @@ -203,6 +203,7 @@ 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 + h# 10e gxfb-hdr h# 5c + w! \ Interrupt pin and line - INTA, IRQ 14 then [ifdef] lx-devel exit [then]

1 0

r343 - ofw/core
by svn＠openbios.org 01 May '07

01 May '07

Author: wmb Date: 2007-05-01 18:45:44 +0200 (Tue, 01 May 2007) New Revision: 343 Modified: ofw/core/ofwcore.fth Log: Changed "test" to allow passing command line arguments to the selftest method. Modified: ofw/core/ofwcore.fth =================================================================== --- ofw/core/ofwcore.fth 2007-05-01 01:39:51 UTC (rev 342) +++ ofw/core/ofwcore.fth 2007-05-01 16:45:44 UTC (rev 343) @@ -2509,7 +2509,7 @@ : test \ device-specifier ( -- ) \ Get device specifier string - optional-arg$ ( adr len ) + parse-word ( adr len ) dup 0= if ??cr ." No device name specified." else

1 0

r137 - openbios-devel/arch/sparc32
by svn＠openbios.org 01 May '07

01 May '07

Author: blueswirl Date: 2007-05-01 16:14:17 +0200 (Tue, 01 May 2007) New Revision: 137 Modified: openbios-devel/arch/sparc32/boot.c Log: Use nvram boot-args and boot-device variables Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2007-05-01 14:12:34 UTC (rev 136) +++ openbios-devel/arch/sparc32/boot.c 2007-05-01 14:14:17 UTC (rev 137) @@ -34,31 +34,42 @@ const void *romvec; if(!path) { - switch(boot_device) { - case 'a': - path = "/obio/SUNW,fdtwo"; - oldpath = "fd()"; + push_str("boot-device"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + if (!POP()) { + path = pop_fstr_copy(); + oldpath = path; unit = 0; - break; - case 'c': - path = "disk"; - oldpath = "sd(0,0,0):d"; - unit = 0; - break; - default: - case 'd': - path = "cdrom"; - // FIXME: hardcoding this looks almost definitely wrong. - // With sd(0,2,0):b we get to see the solaris kernel though - //oldpath = "sd(0,2,0):d"; - oldpath = "sd(0,2,0):b"; - unit = 2; - break; - case 'n': - path = "net"; - oldpath = "le()"; - unit = 0; - break; + } else { + switch (boot_device) { + case 'a': + path = "/obio/SUNW,fdtwo"; + oldpath = "fd()"; + unit = 0; + break; + case 'c': + path = "disk"; + oldpath = "sd(0,0,0):d"; + unit = 0; + break; + default: + case 'd': + path = "cdrom"; + // FIXME: hardcoding this looks almost definitely wrong. + // With sd(0,2,0):b we get to see the solaris kernel though + //oldpath = "sd(0,2,0):d"; + oldpath = "sd(0,2,0):b"; + unit = 2; + break; + case 'n': + path = "net"; + oldpath = "le()"; + unit = 0; + break; + } } } @@ -76,8 +87,17 @@ param++; } else if (cmdline_size) { param = (char *)cmdline; + } else { + push_str("boot-args"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + POP(); + param = pop_fstr_copy(); + obp_arg.argv[1] = param; } - + romvec = init_openprom(qemu_mem_size); if (kernel_size) {

1 0

r136 - openbios-devel/arch/sparc32
by svn＠openbios.org 01 May '07

01 May '07

Author: blueswirl Date: 2007-05-01 16:12:34 +0200 (Tue, 01 May 2007) New Revision: 136 Modified: openbios-devel/arch/sparc32/init.fs Log: Set variable defaults before nvram_init Modified: openbios-devel/arch/sparc32/init.fs =================================================================== --- openbios-devel/arch/sparc32/init.fs 2007-04-30 19:08:37 UTC (rev 135) +++ openbios-devel/arch/sparc32/init.fs 2007-05-01 14:12:34 UTC (rev 136) @@ -27,7 +27,7 @@ :noname set-defaults -; SYSTEM-initializer +; PREPOST-initializer \ preopen device nodes (and store the ihandles under /chosen) :noname

1 0

r342 - clients/memtest86
by svn＠openbios.org 01 May '07

01 May '07

Author: rsmith Date: 2007-05-01 03:39:51 +0200 (Tue, 01 May 2007) New Revision: 342 Modified: clients/memtest86/Makefile Log: Adjust the -fno-stack-protector option such that you can comment/uncommnet easily for compiling on dists that the compile breaks. Modified: clients/memtest86/Makefile =================================================================== --- clients/memtest86/Makefile 2007-05-01 01:35:29 UTC (rev 341) +++ clients/memtest86/Makefile 2007-05-01 01:39:51 UTC (rev 342) @@ -12,7 +12,8 @@ # # gcc compiler options, these settings should suffice # -CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector +CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding +#CCFLAGS += -fno-stack-protector AS=as -32

1 0

r341 - clients/memtest86 cpu/x86/pc/olpc
by svn＠openbios.org 01 May '07

01 May '07

Author: rsmith Date: 2007-05-01 03:35:29 +0200 (Tue, 01 May 2007) New Revision: 341 Modified: clients/memtest86/Makefile cpu/x86/pc/olpc/usb8388.bth cpu/x86/pc/olpc/versions.fth Log: OLPC: Change the libertas firmware pull scheme such that it pulls from the rpm rather than the teamwiki. teamwiki has versions that are uploaded by cozybit and may or may not be the official released version. Modified: clients/memtest86/Makefile =================================================================== --- clients/memtest86/Makefile 2007-04-30 21:08:52 UTC (rev 340) +++ clients/memtest86/Makefile 2007-05-01 01:35:29 UTC (rev 341) @@ -12,7 +12,7 @@ # # gcc compiler options, these settings should suffice # -CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding +CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector AS=as -32 Modified: cpu/x86/pc/olpc/usb8388.bth =================================================================== --- cpu/x86/pc/olpc/usb8388.bth 2007-04-30 21:08:52 UTC (rev 340) +++ cpu/x86/pc/olpc/usb8388.bth 2007-05-01 01:35:29 UTC (rev 341) @@ -5,21 +5,17 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth -" wget -O - http://www.laptop.org/teamwiki/images/6/60/Libertas-firmware.tgz | tar xfz -" $sh -" grep version: libertas-fw-${WLAN_DATE}/RELEASE_NOTES | cut -d ' ' -f 3 | tr -d \\n >libertas.version" expand$ $sh +" rm -rf ./lib" $sh +" wget -O - http://download.fedora.redhat.com/pub/fedora/projects/olpc/development/i386… | rpm2cpio - | cpio -i -u --make-directories --no-absolute-filenames" expand$ $sh -reading libertas.version -here dup d# 50 ifd @ fgets ( adr len ) -ifd @ fclose ( adr len ) -" ${WLAN_VERSION}" expand$ $= 0= [if] -.( Wrong Libertas version ) cr -error-exit -[then] +\ reading libertas.version +\ here dup d# 50 ifd @ fgets ( adr len ) +\ ifd @ fclose ( adr len ) -" cp libertas-fw-${WLAN_DATE}/usb8388.bin ." expand$ $sh +" cp ./lib/firmware/usb8388.bin ." $sh -\ This forces the creation of an .log file, so we don't re-fetch +\ This forces the creation of a .log file, so we don't re-fetch writing usb8388.version " ${WLAN_VERSION}"n" expand$ ofd @ fputs ofd @ fclose Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-04-30 21:08:52 UTC (rev 340) +++ cpu/x86/pc/olpc/versions.fth 2007-05-01 01:35:29 UTC (rev 341) @@ -12,6 +12,5 @@ \ macro: GET_EC cp ~/ec-c05t.bin ec.img \ The wireless LAN module firmware -macro: WLAN_RPM 5.220.10.p5-1.olpc1 +macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 macro: WLAN_VERSION 5.220.10.p5 -macro: WLAN_DATE 2007-03-30

1 0

r340 - cpu/x86/pc/olpc
by svn＠openbios.org 30 Apr '07

30 Apr '07

Author: wmb Date: 2007-04-30 23:08:52 +0200 (Mon, 30 Apr 2007) New Revision: 340 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2C09 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-04-30 21:08:30 UTC (rev 339) +++ cpu/x86/pc/olpc/versions.fth 2007-04-30 21:08:52 UTC (rev 340) @@ -2,11 +2,15 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 08j +macro: FW_MINOR 09 \ The EC microcode -macro: EC_VERSION c03 +macro: EC_VERSION c09 +\ Alternate command for getting EC microcode, for testing new versions. +\ Temporarily uncomment the line and modify the path as necessary +\ macro: GET_EC cp ~/ec-c05t.bin ec.img + \ The wireless LAN module firmware macro: WLAN_RPM 5.220.10.p5-1.olpc1 macro: WLAN_VERSION 5.220.10.p5

1 0

r339 - dev/olpc/cafenand
by svn＠openbios.org 30 Apr '07

30 Apr '07

Author: wmb Date: 2007-04-30 23:08:30 +0200 (Mon, 30 Apr 2007) New Revision: 339 Modified: dev/olpc/cafenand/configure.fth Log: OLPC CaFe- removed an innocuous but annoying message that happens when probing a nonexistent second chip. Modified: dev/olpc/cafenand/configure.fth =================================================================== --- dev/olpc/cafenand/configure.fth 2007-04-30 16:42:32 UTC (rev 338) +++ dev/olpc/cafenand/configure.fth 2007-04-30 21:08:30 UTC (rev 339) @@ -38,6 +38,8 @@ : configure-size ( adr -- adr ) \ These are all 2K-page devices dup 1+ c@ case ( adr device-code ) + h# 0 of abort endof \ This is the result for nonexistent chips + h# ff of abort endof \ Another likely result for nonexistent chips h# f2 of h# 01.0000 endof \ 128 MB, 1 Gbit, 64K pages h# f1 of h# 02.0000 endof \ 256 MB, 2 Gbit, 128K pages h# dc of h# 04.0000 endof \ 512 MB, 4 Gbit, 256K pages

1 0

r135 - openbios-devel/modules
by svn＠openbios.org 30 Apr '07

30 Apr '07

Author: blueswirl Date: 2007-04-30 21:08:37 +0200 (Mon, 30 Apr 2007) New Revision: 135 Modified: openbios-devel/modules/console.c Log: Improve escape sequence handling Modified: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2007-04-29 19:57:01 UTC (rev 134) +++ openbios-devel/modules/console.c 2007-04-30 19:08:37 UTC (rev 135) @@ -21,6 +21,13 @@ #define NCOLS 80 #define NROWS 48 +typedef enum { + ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey, + EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd, + ESpalette +} vc_state_t; + +#define NPAR 16 static struct { int inited; int physw, physh; @@ -30,6 +37,9 @@ char *buf; int cursor_on; + vc_state_t vc_state; + unsigned int vc_npar,vc_par[NPAR]; /* Parameters of current + escape sequence */ } cons; static int @@ -115,6 +125,7 @@ cons.buf = malloc( cons.w * cons.h ); cons.inited = 1; cons.x = cons.y = 0; + cons.vc_state = ESnormal; return 0; } @@ -162,22 +173,148 @@ draw_line(cons.h-1); } +static void +do_con_trol(int ch) +{ + unsigned int i, j; + + switch (ch) { + case 8: + if (cons.x) + cons.x--; + return; + case 10 ... 12: + cons.x = 0; + cons.y++; + return; + case 13: + cons.x = 0; + return; + case 24: + case 26: + cons.vc_state = ESnormal; + return; + case 27: + cons.vc_state = ESesc; + return; + } + + switch (cons.vc_state) { + case ESesc: + cons.vc_state = ESnormal; + switch (ch) { + case '[': + cons.vc_state = ESsquare; + return; + case 'M': + scroll1(); + return; + default: + printk("Unhandled escape code '%c'\n", ch); + return; + } + return; + case ESsquare: + for(cons.vc_npar = 0; cons.vc_npar < NPAR ; cons.vc_npar++) + cons.vc_par[cons.vc_npar] = 0; + cons.vc_npar = 0; + cons.vc_state = ESgetpars; + // Fall through + case ESgetpars: + if (ch == ';' && cons.vc_npar < NPAR - 1) { + cons.vc_npar++; + return; + } else if (ch >= '0' && ch <= '9') { + cons.vc_par[cons.vc_npar] *= 10; + cons.vc_par[cons.vc_npar] += ch - '0'; + return; + } else + cons.vc_state=ESgotpars; + // Fall through + case ESgotpars: + cons.vc_state = ESnormal; + switch(ch) { + case 'H': + case 'f': + if (cons.vc_par[0]) + cons.vc_par[0]--; + + if (cons.vc_par[1]) + cons.vc_par[1]--; + + cons.x = cons.vc_par[1]; + cons.y = cons.vc_par[0]; + return; + case 'J': + if (cons.vc_par[0] == 0 && (uint)cons.y < (uint)cons.h && + (uint)cons.x < (uint)cons.w) { + // erase from cursor to end of display + for (i = cons.x; i < cons.w; i++) + cons.buf[cons.y * cons.w + i] = ' '; + draw_line(cons.y); + for (j = cons.y + 1; j < cons.h; j++) { + for (i = 0; i < cons.w; i++) + cons.buf[j * cons.w + i] = ' '; + draw_line(j); + } + } + return; + case 'K': + switch (cons.vc_par[0]) { + case 0: /* erase from cursor to end of line */ + for (i = cons.x; i < cons.w; i++) + cons.buf[cons.y * cons.w + i] = ' '; + draw_line(cons.y); + return; + case 1: /* erase from start of line to cursor */ + for (i = 0; i <= cons.x; i++) + cons.buf[cons.y * cons.w + i] = ' '; + draw_line(cons.y); + return; + case 2: /* erase whole line */ + for (i = 0; i <= cons.w; i++) + cons.buf[cons.y * cons.w + i] = ' '; + draw_line(cons.y); + return; + default: + return; + } + return; + case 'M': + scroll1(); + return; + case 'm': + return; + case '@': + return; + default: + printk("Unhandled escape code '%c', par[%d, %d, %d, %d, %d]\n", + ch, cons.vc_par[0], cons.vc_par[1], cons.vc_par[2], + cons.vc_par[3], cons.vc_par[4]); + return; + } + return; + default: + cons.vc_state = ESnormal; + rec_char(ch, cons.x++, cons.y); + return; + } +} + int console_draw_str( const char *str ) { - static const char *ignore[] = { "[1;37m", "[2;40m", NULL }; - int ch, y, x, i; + int ch, y, x; if( !cons.inited && console_init() ) return -1; show_cursor(0); while( (ch=*str++) ) { - if( ch == 12 ) - continue; - if( ch == '\n' || cons.x >= cons.w ) { + do_con_trol(ch); + + if( cons.x >= cons.w ) { cons.x=0, cons.y++; - continue; } if( cons.y >= cons.h ) { for( y=0; y<cons.h-1; y++ ) @@ -187,21 +324,6 @@ cons.x = 0; scroll1(); } - if( ch == '\r' ) - continue; - if( ch == '\e' ) { - for( i=0; ignore[i] && strncmp(ignore[i], str, strlen(ignore[i])); i++ ) - ; - if( ignore[i] ) - str += strlen(ignore[i]); - continue; - } - if( ch == 8 ) { - if( cons.x ) - cons.x--; - continue; - } - rec_char( ch, cons.x++, cons.y ); } show_cursor(1); return 0;

1 0

r338 - cpu/x86/pc/olpc
by svn＠openbios.org 30 Apr '07

30 Apr '07

Author: wmb Date: 2007-04-30 18:42:32 +0200 (Mon, 30 Apr 2007) New Revision: 338 Modified: cpu/x86/pc/olpc/chipinit.fth cpu/x86/pc/olpc/gpioinit.fth Log: OLPC - fixed interrupt routing for B3. Modified: cpu/x86/pc/olpc/chipinit.fth =================================================================== --- cpu/x86/pc/olpc/chipinit.fth 2007-04-30 16:41:48 UTC (rev 337) +++ cpu/x86/pc/olpc/chipinit.fth 2007-04-30 16:42:32 UTC (rev 338) @@ -551,7 +551,7 @@ msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW - msr: 5140.0023 00000000.600aa5b2. \ IRQM_ZHIGH + msr: 5140.0023 00000000.60baa5b2. \ IRQM_ZHIGH msr: 5140.0025 00000000.00001002. \ IRQM_LPC \ msr: 5140.0028 00000000.00000000. \ MFGPT_IRQ off - default \ msr: 5140.0040 00000000.00000000. \ DMA_MAP - default Modified: cpu/x86/pc/olpc/gpioinit.fth =================================================================== --- cpu/x86/pc/olpc/gpioinit.fth 2007-04-30 16:41:48 UTC (rev 337) +++ cpu/x86/pc/olpc/gpioinit.fth 2007-04-30 16:42:32 UTC (rev 338) @@ -1,22 +1,40 @@ : olpc-gpio-init \ h# f7ff0800 h# 1000 pl! \ GPIOL_OUTPUT_VALUE \ h# 36ffc900 h# 1004 pl! \ GPIOL_OUTPUT_ENABLE +lx? if + h# c902 h# 1004 pl! \ GPIOL_OUTPUT_ENABLE - SMBDAT, SMBCLK, DCONLOAD, UART1TX, MIC +else h# e902 h# 1004 pl! \ GPIOL_OUTPUT_ENABLE - SMBDAT, SMBCLK, SMI#, DCONLOAD, UART1TX, MIC +then \ h# ffff0000 h# 1008 pl! \ GPIOL_OUT_OPENDRAIN - default \ h# ffff0000 h# 100c pl! \ GPIOL_OUTPUT_INVERT_ENABLE - default h# c100 h# 1010 pl! \ GPIOL_OUT_AUX1_SELECT - SMBDAT, SMBCLK, UART1TX \ h# ffff0000 h# 1014 pl! \ GPIOL_OUT_AUX2_SELECT - default \ h# 1001effe h# 1018 pl! \ GPIOL_PULLUP_ENABLE - I don't think we need pullups +lx? if + h# 1d7a2000 h# 1018 pl! \ GPIOL_PULLUP_ENABLE - Disable pullups on DCONBLNK/LOAD/STAT, THRM_ALARM, UART1TX, VGA, MICDC + \ Enable pullup on PCI_INTC# +else h# 3d7a0000 h# 1018 pl! \ GPIOL_PULLUP_ENABLE - Disable pullups on SMI#, DCONBLNK/LOAD/STAT, THRM_ALARM, UART1TX, VGA, MICDC +then \ h# efff1000 h# 101c pl! \ GPIOL_PULLDOWN_ENABLE - default h# ffff0000 h# 101c pl! \ GPIOL_PULLDOWN_ENABLE - Disable all pull-downs +lx? if + h# f6e5 h# 1020 pl! \ GPIOL_INPUT_ENABLE - DCONBLNK, DCONLOAD, PCI_INTC, THRM_ALARM, DCONIRQ, DCONSTAT1/0, MEMSIZE, PCI_INTA + h# 2481 h# 1024 pl! \ GPIOL_INPUT_INVERT_ENABLE - Invert PCI_INTC, THRM_ALARM, DCONIRQ and PCI_INTA# +else h# d6e5 h# 1020 pl! \ GPIOL_INPUT_ENABLE - DCONBLNK, DCONLOAD, THRM_ALARM, DCONIRQ, DCONSTAT1/0, MEMSIZE, PCI_INTA h# 0481 h# 1024 pl! \ GPIOL_INPUT_INVERT_ENABLE - Invert THRM_ALARM, DCONIRQ and PCI_INTA# +then \ h# ffff0000 h# 1028 pl! \ GPIOL_IN_FILTER_ENABLE - default \ h# ffff0000 h# 102c pl! \ GPIOL_IN_EVENTCOUNT_ENABLE - default \ h# 2d9bd264 h# 1030 pl! \ GPIOL_READ_BACK h# c600 h# 1034 pl! \ GPIOL_IN_AUX1_SELECT +lx? if + h# 2081 h# 1038 pl! \ GPIOL_EVENTS_ENABLE - PCI_INTC, PCI_INTA +else h# 0081 h# 1038 pl! \ GPIOL_EVENTS_ENABLE +then \ h# 00000000 h# 103c pl! \ GPIOL_LOCK_ENABLE - default \ h# ffff0000 h# 1040 pl! \ GPIOL_IN_POSEDGE_ENABLE - default \ h# ffff0000 h# 1044 pl! \ GPIOL_IN_NEGEDGE_ENABLE - default @@ -81,6 +99,9 @@ \ h# 0000 h# 10de pw! \ GPIO_07_EVENTCOMPARE_VALUE - default h# 20000001 h# 10e0 pl! \ GPIO_MAPPER_X +lx? if + h# 00500000 h# 10e4 pl! \ GPIO_MAPPER_Y +then \ h# 00000000 h# 10e4 pl! \ GPIO_MAPPER_Y - default \ h# 00000000 h# 10e8 pl! \ GPIO_MAPPER_Z - default \ h# 00000000 h# 10ec pl! \ GPIO_MAPPER_W - default

1 0

r337 - dev/olpc/cafenand
by svn＠openbios.org 30 Apr '07

30 Apr '07

Author: wmb Date: 2007-04-30 18:41:48 +0200 (Mon, 30 Apr 2007) New Revision: 337 Modified: dev/olpc/cafenand/cafenand.fth Log: OLPC CaFe NAND driver - fixed typo in previous checkin. Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2007-04-29 19:32:48 UTC (rev 336) +++ dev/olpc/cafenand/cafenand.fth 2007-04-30 16:41:48 UTC (rev 337) @@ -85,7 +85,7 @@ : >cmd ( cmd# #nonmem #address-bytes -- cmdval ) dup if 1- d# 27 lshift h# 4000.0000 or then ( cmd# #nm adr-field ) over 1 and d# 20 lshift or \ #nm[0] ( cmd# #nm adr+nm0 ) - swap e and d# 21 lshift or \ #nm[3:1] ( cmd# adr+nm ) + swap h# e and d# 21 lshift or \ #nm[3:1] ( cmd# adr+nm ) or h# 8000.0000 or ; @@ -147,7 +147,7 @@ write-enable dma-off set-page dup datalen ( adr len ) chip h# 2000 + swap move ( ) - write-cmd h# 0000.0110 cmd wait-cmd ( ) No Auto ECC + write-cmd h# 0000.0110 cmd wait-cmd ( ) \ No Auto ECC wait-write-done write-disable ;

1 0

Overriding default config with nvram?
by Blue Swirl 30 Apr '07

30 Apr '07

Hi, I'm adding support for nvram variables to Qemu (see attached patches), like: qemu-system-sparc -prom-env "boot-device=zorg" But this only works if the variable does not have any default value in nvram.fs. I'd like to change this so that the nvram values override defaults, but how? For example: qemu-system-sparc -boot n -prom-env "boot-device=foobar" -prom-env "boot-device-foobar=foobar" -nographic -monitor stdio -hda /dev/null Nvram id QEMU_BIOS, version 1, machine id 0x80 CPUs: 1 Welcome to OpenBIOS v1.0RC1 built on Apr 29 2007 07:39 Type 'help' for detailed information [sparc] Booting file 'net' without parameters. 0 > printenv name "options" boot-from "disk" boot-device "disk" boot-device-foobar "foobar" boot-args "" [cut] Here boot-device is overridden to "disk" somewhere later but boot-device-foobar survives.

2 2

r134 - openbios-devel/drivers
by svn＠openbios.org 29 Apr '07

29 Apr '07

Author: blueswirl Date: 2007-04-29 21:57:01 +0200 (Sun, 29 Apr 2007) New Revision: 134 Modified: openbios-devel/drivers/obio.c Log: Fix nvram parameter area Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-29 19:55:08 UTC (rev 133) +++ openbios-devel/drivers/obio.c 2007-04-29 19:57:01 UTC (rev 134) @@ -291,19 +291,21 @@ void arch_nvram_get(char *data) { - memcpy(data, nvram, NVRAM_SIZE); + memcpy(data, &nvram[sizeof(struct qemu_nvram_v1)], + NVRAM_IDPROM - sizeof(struct qemu_nvram_v1)); } void arch_nvram_put(char *data) { - memcpy(nvram, data, NVRAM_SIZE); + memcpy(&nvram[sizeof(struct qemu_nvram_v1)], data, + NVRAM_IDPROM - sizeof(struct qemu_nvram_v1)); } int arch_nvram_size(void) { - return NVRAM_SIZE; + return (NVRAM_IDPROM - sizeof(struct qemu_nvram_v1)) & ~15; } static void mb86904_init(void)

1 0

r133 - openbios-devel/drivers
by svn＠openbios.org 29 Apr '07

29 Apr '07

Author: blueswirl Date: 2007-04-29 21:55:08 +0200 (Sun, 29 Apr 2007) New Revision: 133 Modified: openbios-devel/drivers/obio.c Log: More Sparc32 CPUs Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-29 19:50:57 UTC (rev 132) +++ openbios-devel/drivers/obio.c 2007-04-29 19:55:08 UTC (rev 133) @@ -388,6 +388,20 @@ fword("property"); } +static void rt625_init(void) +{ + PUSH(32); + fword("encode-int"); + push_str("cache-line-size"); + fword("property"); + + PUSH(512); + fword("encode-int"); + push_str("cache-nlines"); + fword("property"); + +} + struct cpudef { unsigned long iu_version; const char *name; @@ -407,6 +421,25 @@ .psr_vers = 5, .impl = 0, .vers = 5, + .dcache_line_size = 0x10, + .dcache_lines = 0x200, + .dcache_assoc = 1, + .icache_line_size = 0x20, + .icache_lines = 0x200, + .icache_assoc = 1, + .ecache_line_size = 0x20, + .ecache_lines = 0x4000, + .ecache_assoc = 1, + .mmu_nctx = 0x100, + .initfn = mb86904_init, + }, + { + .iu_version = 0x05 << 24, /* Impl 0, ver 5 */ + .name = "FMI,MB86907", + .psr_impl = 0, + .psr_vers = 5, + .impl = 0, + .vers = 5, .dcache_line_size = 0x20, .dcache_lines = 0x200, .dcache_assoc = 1, @@ -420,6 +453,25 @@ .initfn = mb86904_init, }, { + .iu_version = 0x41000000, + .name = "TI,TMS390S10", + .psr_impl = 4, + .psr_vers = 1, + .impl = 4, + .vers = 1, + .dcache_line_size = 0x10, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x20, + .icache_lines = 0x80, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { .iu_version = 0x40000000, .name = "TI,TMS390Z55", .psr_impl = 4, @@ -438,6 +490,25 @@ .mmu_nctx = 0x10000, .initfn = tms390z55_init, }, + { + .iu_version = 0x1e000000, + .name = "Ross,RT625", + .psr_impl = 1, + .psr_vers = 14, + .impl = 1, + .vers = 7, + .dcache_line_size = 0x20, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x40, + .icache_lines = 0x40, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = rt625_init, + }, }; static const struct cpudef *

1 0

r132 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 29 Apr '07

29 Apr '07

Author: blueswirl Date: 2007-04-29 21:50:57 +0200 (Sun, 29 Apr 2007) New Revision: 132 Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/drivers/obio.c Log: Clear preloaded kernel parameters to avoid crash at reset Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-04-26 17:15:45 UTC (rev 131) +++ openbios-devel/arch/sparc32/entry.S 2007-04-29 19:50:57 UTC (rev 132) @@ -245,6 +245,8 @@ set AC_M_CTPR, %g2 sta %g7, [%g2] ASI_M_MMUREGS ! set ctx table ptr + set AC_M_CXR, %g2 + sta %g0, [%g2] ASI_M_MMUREGS ! context 0 set 1, %g1 sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-26 17:15:45 UTC (rev 131) +++ openbios-devel/drivers/obio.c 2007-04-29 19:50:57 UTC (rev 132) @@ -504,6 +504,9 @@ obio_cmdline[size] = '\0'; cmdline = obio_cmdline; cmdline_size = size; + ((struct qemu_nvram_v1 *)nvram)->kernel_image = 0; + ((struct qemu_nvram_v1 *)nvram)->kernel_size = 0; + ((struct qemu_nvram_v1 *)nvram)->cmdline_size = 0; boot_device = nv_info.boot_device; nographic = nv_info.nographic;

1 0

r336 - dev/olpc/cafenand
by svn＠openbios.org 29 Apr '07

29 Apr '07

Author: wmb Date: 2007-04-29 21:32:48 +0200 (Sun, 29 Apr 2007) New Revision: 336 Modified: dev/olpc/cafenand/badblock.fth dev/olpc/cafenand/cafenand.fth dev/olpc/cafenand/configure.fth dev/olpc/cafenand/methods.fth dev/olpc/cafenand/test.fth Log: OLPC CaFe NAND driver - added support for two-NAND-chip packages. trac #1374 Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2007-04-27 22:25:44 UTC (rev 335) +++ dev/olpc/cafenand/badblock.fth 2007-04-29 19:32:48 UTC (rev 336) @@ -8,7 +8,7 @@ : round-up ( n boundary -- n' ) over 1- + over / * ; : /bbt ( -- bytes ) \ Bytes per bad block table - pages/chip pages/eblock / 3 + 4 / ( bytes ) + total-pages pages/eblock / 3 + 4 / ( bytes ) /page round-up ; @@ -70,8 +70,8 @@ \ Page range to search for a bad block table : bbtbounds ( low-page high-page -- ) 0 to bbt0 0 to bbt1 - pages/chip #bbtsearch pages/eblock * - - pages/chip pages/eblock - + total-pages #bbtsearch pages/eblock * - + total-pages pages/eblock - ; \ Look for existing bad block tables, setting bbt0 and bbt1 if found @@ -118,7 +118,7 @@ \ Scan the device and record the factory bad-block info in a table : initial-badblock-scan ( -- ) - pages/chip 0 do + total-pages 0 do i initial-block-bad? if i .bad else @@ -214,7 +214,7 @@ exit then bbt1 if bbt1 exit then - pages/chip + total-pages ; : map-resblock ( page# #pages -- page#' #pages ) @@ -275,7 +275,7 @@ \ This is fairly severe, not recommended except in exceptional situations : scrub ( -- ) release-bbt - pages/chip 0 ?do + total-pages 0 ?do (cr i . i erase-block pages/eblock +loop @@ -301,7 +301,7 @@ ; : show-bbt ( -- ) get-bbt - pages/chip 0 ?do + total-pages 0 ?do i block-reserved? if ." Reserved " i .page-byte cr else i block-bad? if ." Bad block" i .page-byte cr then then Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2007-04-27 22:25:44 UTC (rev 335) +++ dev/olpc/cafenand/cafenand.fth 2007-04-29 19:32:48 UTC (rev 336) @@ -15,7 +15,6 @@ " reg" property - : my-w@ ( offset -- w ) my-space + " config-w@" $call-parent ; : my-w! ( w offset -- ) my-space + " config-w!" $call-parent ; @@ -64,12 +63,29 @@ \ Wait not busy - XXX need timeout : ctrl-wait ( -- ) begin h# c cl@ h# 8000.0000 and 0= until ; -\ Think of col as the offset within a disk block, and row as the block# -: set-address ( row col -- ) h# 1c cl! h# 20 cl! ; +\ Bit 19 in the command (0) register is reserved according to the +\ version of the CaFe chip spec that we have, but Jerry Zheng says +\ that it chooses the chip select - 0 for CS0, 1 for CS1. +1 instance value chip-boundary \ Boundary between chip 0 and chip 1 +0 instance value cs-mask \ Chip-select bit for command 0 register +: chip0 ( -- ) 0 to cs-mask ; +: chip1 ( -- ) h# 80000 to cs-mask ; + +: set-chip ( page# -- page#' ) + dup chip-boundary >= if chip-boundary - chip1 else chip0 then +; + +\ For erase-block, the address that is sent to the chip is formatted +\ differently than for reads and writes. +: set-erase-page ( page# -- ) set-chip lwsplit h# 20 cl! h# 1c cl! ; + +: set-page ( page# offset -- ) h# 1c cl! set-chip h# 20 cl! ; + : >cmd ( cmd# #nonmem #address-bytes -- cmdval ) dup if 1- d# 27 lshift h# 4000.0000 or then ( cmd# #nm adr-field ) - swap 7 and d# 22 lshift or ( cmd# nm,adr ) + over 1 and d# 20 lshift or \ #nm[0] ( cmd# #nm adr+nm0 ) + swap e and d# 21 lshift or \ #nm[3:1] ( cmd# adr+nm ) or h# 8000.0000 or ; @@ -80,29 +96,26 @@ h# 0420.0000 0 5 >cmd constant read-cmd h# 0220.0080 0 5 >cmd constant write-cmd -: wait-dma-done ( -- ) - begin - h# 10 cl@ h# 1000.0000 and - until - h# 1000.0000 h# 10 cl! \ Clear DMA done +: wait-mask ( bitmask -- ) + begin dup h# 10 cl@ and until ( bitmask ) + h# 10 cl! \ Clear status bit ; +: wait-dma ( -- ) h# 1000.0000 wait-mask ; +: wait-cmd ( -- ) h# 8000.0000 wait-mask ; -: wait-done ( -- ) - begin - h# 10 cl@ h# 8000.0000 and - until - h# 8000.0000 h# 10 cl! \ Clear done -; - \ Control3 - no reset, no BAR write protect : write-disable ( -- ) 0 8 cl! ; : write-enable ( -- ) h# 4000.0000 8 cl! ; -: cmd ( n -- ) 0 cl! wait-done ; -: cmd2 ( n -- ) 4 cl! ; +: cmd ( cmd cmd2 -- ) + /page d# 10 rshift 3 and d# 28 lshift or 4 cl! ( cmd ) + cs-mask or 0 cl! ( ) +; + : datalen ( n -- ) h# 18 cl! ; -: read-status ( -- b ) read-status-cmd cmd h# 30 cl@ h# ff and ; -\ : read-id ( -- ) 0 0 set-address read-id-cmd cmd h# 30 cl@ ; + +: read-status ( -- b ) read-status-cmd 0 cmd wait-cmd h# 30 cl@ h# ff and ; +\ : read-id ( -- ) 0 0 set-page read-id-cmd 0 cmd wait-cmd h# 30 cl@ ; : dma-off ( -- ) 0 h# 40 cl! ; : wait-write-done ( -- ) @@ -118,10 +131,10 @@ \ Assumes that the range doesn't straddle a page boundary : generic-read ( len page# offset cmd cmd2 -- chip-adr ) - cmd2 >r ( len page# offset r: cmd ) - set-address dma-off ( len r: cmd ) - datalen ( r: cmd ) - r> cmd ( ) + >r >r ( len page# offset r: cmd cmd2 ) + set-page dma-off ( len r: cmd cmd2 ) + datalen ( r: cmd cmd2 ) + r> r> cmd wait-cmd ( ) chip h# 1000 + ( adr ) ; : pio-read ( adr len page# offset -- ) @@ -132,19 +145,19 @@ : pio-write-raw ( adr len page# offset -- ) write-enable - dma-off set-address dup datalen ( adr len ) - chip h# 2000 + swap move ( ) - h# 2000.0110 cmd2 write-cmd cmd ( ) \ 2000. 2K page, (No Auto ECC) + dma-off set-page dup datalen ( adr len ) + chip h# 2000 + swap move ( ) + write-cmd h# 0000.0110 cmd wait-cmd ( ) No Auto ECC wait-write-done write-disable ; : pio-write-page ( adr page# -- ) - write-enable dma-off ( adr page# ) - 0 set-address ( adr ) - /page h# e + dup datalen ( adr len ) - chip h# 2000 + swap move ( ) - h# 6800.0110 cmd2 write-cmd cmd ( ) \ 4000. Auto ECC, 2000. 2K page, 0800 R/S ECC + write-enable dma-off ( adr page# ) + 0 set-page ( adr ) + /page h# e + dup datalen ( adr len ) + chip h# 2000 + swap move ( ) + write-cmd h# 4800.0110 cmd wait-cmd ( ) \ 4000. Auto ECC, 0800. R/S ECC wait-write-done write-disable ; @@ -153,7 +166,7 @@ /oob swap h# 800 read-cmd h# 130 generic-read ; -: read-rst ( -- ) h# 8000.0000 h# c cl! ; +: read-rst ( -- ) h# 8000.0000 h# c cl! ; 0 instance value dma-vadr 0 instance value dma-padr @@ -176,13 +189,10 @@ ; : slow-dma-read ( adr len page# offset -- ) - set-address - dup true dma-setup ( ) - h# 130 cmd2 read-cmd 0 cl! ( adr chip-adr r: len ) - \ XXX put a 90 us delay here so we don't start hitting the register - \ until almost done. - wait-dma-done \ For DMA reads we wait for DMA completion instead of cmd - dma-release ( ) + set-page + dup true dma-setup ( ) + read-cmd h# 0800.0130 cmd wait-dma ( adr chip-adr r: len ) + dma-release ( ) ; : /dma-buf ( -- n ) /page /oob + ; @@ -192,34 +202,33 @@ \ XXX should check ECC : read-page ( adr page# -- ) - h# 20 cl! 0 h# 1c cl! + 0 set-page ( adr ) /page ( /oob + ) h# 18 cl! ( adr ) dma-buf-pa h# 44 cl! ( adr ) 0 h# 48 cl! ( adr ) /page h# a000.0000 or h# 40 cl! ( adr ) - h# 130 4 cl! read-cmd 0 cl! ( adr ) - wait-dma-done \ For DMA reads we wait for DMA completion instead of cmd + read-cmd h# 0800.0130 cmd wait-dma ( adr ) dma-buf-va swap /page do-lmove ( ) ; : dma-write-raw ( adr len page# offset -- ) - write-enable ( adr len page# offset ) - set-address ( adr len ) - dup false dma-setup ( ) - h# 2000.0110 cmd2 write-cmd cmd ( ) - wait-write-done - dma-release - write-disable + write-enable ( adr len page# offset ) + set-page ( adr len ) + dup false dma-setup ( ) + write-cmd h# 110 cmd wait-cmd ( ) + wait-write-done ( ) + dma-release ( ) + write-disable ( ) ; : dma-write-page ( adr page# -- ) \ Size is fixed write-enable ( adr page# ) - 0 set-address ( adr ) + 0 set-page ( adr ) h# 800 h# 80e false dma-setup ( ) - h# 6800.0110 cmd2 write-cmd cmd ( ) \ Auto-ECC, 2KB, RS, write cmd - wait-write-done + write-cmd h# 4800.0110 cmd wait-cmd ( ) \ Auto-ECC, RS, write cmd + wait-write-done ( ) \ dma-release - write-disable + write-disable ( ) ; \ : read-page ( adr page# -- ) dma-read-page ; @@ -229,9 +238,8 @@ 3 value #erase-adr-bytes \ Chip dependent : erase-block ( page# -- ) write-enable - lwsplit swap set-address \ Fiddle the block number - h# 1d0 cmd2 - h# 20.0060 0 #erase-adr-bytes >cmd cmd + set-erase-page + h# 20.0060 0 #erase-adr-bytes >cmd h# 1d0 cmd wait-write-done write-disable ; @@ -240,12 +248,10 @@ : send-reset-cmd ( -- ) ctrl-wait - h# 8000.00ff cmd \ NAND Reset command + h# 8000.00ff 0 cmd wait-cmd \ NAND Reset command ; : init ( -- ) - 0 0 cl! \ Clear command register - h# 2000.0000 4 cl! \ Page 2KB write-disable send-reset-cmd Modified: dev/olpc/cafenand/configure.fth =================================================================== --- dev/olpc/cafenand/configure.fth 2007-04-27 22:25:44 UTC (rev 335) +++ dev/olpc/cafenand/configure.fth 2007-04-29 19:32:48 UTC (rev 336) @@ -1,8 +1,9 @@ \ See license at end of file purpose: Common code for NAND FLASH access -h# 4.0000 instance value pages/chip -h# 40 instance value pages/eblock +h# 0 instance value total-pages \ Start with 0 and add chips +h# 0 instance value pages/chip +h# 40 instance value pages/eblock \ This uses byte 4 to work out the plane parameters \ The Samsung part has this byte, but the Hynix part doesn't @@ -10,7 +11,7 @@ dup 4 + c@ ( adr plane-data ) h# 1000 over 4 rshift 7 and lshift ( adr plane-data pages/plane ) 1 rot 2 rshift 3 and lshift ( adr kbytes/plane #planes ) - * to pages/chip ( adr ) + * to pages/chip ( adr ) ; \ This uses byte 3 to work out the page and erase block sizes @@ -55,6 +56,7 @@ : configure ( -- okay? ) read-id ( adr ) ['] configure-auto catch 0= nip + pages/chip total-pages + to total-pages ; \ LICENSE_BEGIN Modified: dev/olpc/cafenand/methods.fth =================================================================== --- dev/olpc/cafenand/methods.fth 2007-04-27 22:25:44 UTC (rev 335) +++ dev/olpc/cafenand/methods.fth 2007-04-29 19:32:48 UTC (rev 336) @@ -6,6 +6,24 @@ comp 0= ; +: configure-all ( -- error? ) + 0 to total-pages + + \ Set boundary to 0 to look for chip on CE1# + \ If one is found, the number of pages will be added to total-pages + 0 to chip-boundary configure drop + + \ Set boundary to 1 to look for chip on CE0# (configure uses page# 0) + 1 to chip-boundary configure if + pages/chip \ Chip present at CE0#, set boundary above it + else + 0 \ No chip at CE0, set boundary at 0 to use CE1# chip + then + to chip-boundary + + total-pages 0= \ Error if there are no chips +; + external : dma-alloc ( len -- adr ) " dma-alloc" $call-parent ; @@ -27,7 +45,7 @@ resmap if #reserved-eblocks /eblock else - pages/chip /page + total-pages /page then um* ; @@ -35,7 +53,7 @@ : open ( -- okay? ) map-regs init - configure 0= if false exit then + configure-all if false exit then /dma-buf dma-alloc to dma-buf-va dma-buf-va /dma-buf false " dma-map-in" $call-parent to dma-buf-pa Modified: dev/olpc/cafenand/test.fth =================================================================== --- dev/olpc/cafenand/test.fth 2007-04-27 22:25:44 UTC (rev 335) +++ dev/olpc/cafenand/test.fth 2007-04-29 19:32:48 UTC (rev 336) @@ -59,7 +59,7 @@ ; : test-all ( -- ) - pages/chip 0 do + total-pages 0 do (cr i . i test-eb key? ?leave @@ -68,7 +68,7 @@ \ XXX skip mfg bad blocks : erase-all ( -- ) - pages/chip 0 do + total-pages 0 do (cr i . i erase-block key? ?leave @@ -84,7 +84,7 @@ : scan-all cr - pages/chip 0 do + total-pages 0 do i ?. ib /full-page i 0 pio-read mismatch? if i . .where then @@ -104,7 +104,7 @@ ; : .bad ( page# -- ) .x ." bad" cr ; : initial-badblock-scan ( -- ) - pages/chip 0 do + total-pages 0 do i block-bad? if i .bad else @@ -147,11 +147,12 @@ [then] : scan-bad ( -- ) - pages/chip 0 do + total-pages 0 do bbbuf 4 i h# 800 pio-read i .bad bbbuf 4 i 1+ h# 800 pio-read i 1+ .bad pages/eblock +loop ; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

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

28 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 28 Apr '07

28 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 28 Apr '07

28 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 28 Apr '07

28 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 28 Apr '07

28 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 28 Apr '07

28 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 27 Apr '07

27 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

r326 - cpu/x86/pc/olpc
by svn＠openbios.org 26 Apr '07

26 Apr '07

Author: wmb Date: 2007-04-26 04:59:13 +0200 (Thu, 26 Apr 2007) New Revision: 326 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2C08j Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-04-26 02:58:50 UTC (rev 325) +++ cpu/x86/pc/olpc/versions.fth 2007-04-26 02:59:13 UTC (rev 326) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 08i +macro: FW_MINOR 08j \ The EC microcode macro: EC_VERSION c03

1 0

r325 - dev/geode/display
by svn＠openbios.org 26 Apr '07

26 Apr '07

Author: wmb Date: 2007-04-26 04:58:50 +0200 (Thu, 26 Apr 2007) New Revision: 325 Modified: dev/geode/display/gxfb.fth Log: OLPC suspend - Wait a frame time after disabling the display controller to ensure that it is quiet before suspending. Modified: dev/geode/display/gxfb.fth =================================================================== --- dev/geode/display/gxfb.fth 2007-04-26 02:58:02 UTC (rev 324) +++ dev/geode/display/gxfb.fth 2007-04-26 02:58:50 UTC (rev 325) @@ -345,6 +345,7 @@ unlock 0 4 dc! \ Turn off video memory access + d# 25 ms \ Wait for a frame time to make sure the display is quiet ; : video-restore

1 0

r324 - cpu/x86/pc/olpc
by svn＠openbios.org 26 Apr '07

26 Apr '07

Author: wmb Date: 2007-04-26 04:58:02 +0200 (Thu, 26 Apr 2007) New Revision: 324 Modified: cpu/x86/pc/olpc/gpioinit.fth cpu/x86/pc/olpc/resume.bth Log: OLPC - Turn of internal pullup on THRM_ALARM# to prevent leakage during suspend. Modified: cpu/x86/pc/olpc/gpioinit.fth =================================================================== --- cpu/x86/pc/olpc/gpioinit.fth 2007-04-25 07:27:37 UTC (rev 323) +++ cpu/x86/pc/olpc/gpioinit.fth 2007-04-26 02:58:02 UTC (rev 324) @@ -7,11 +7,11 @@ h# c100 h# 1010 pl! \ GPIOL_OUT_AUX1_SELECT - SMBDAT, SMBCLK, UART1TX \ h# ffff0000 h# 1014 pl! \ GPIOL_OUT_AUX2_SELECT - default \ h# 1001effe h# 1018 pl! \ GPIOL_PULLUP_ENABLE - I don't think we need pullups - h# 397a0000 h# 1018 pl! \ GPIOL_PULLUP_ENABLE - Disable pullups on SMI#, DCONBLNK/LOAD/STAT UART1TX, VGA, MICDC + h# 3d7a0000 h# 1018 pl! \ GPIOL_PULLUP_ENABLE - Disable pullups on SMI#, DCONBLNK/LOAD/STAT, THRM_ALARM, UART1TX, VGA, MICDC \ h# efff1000 h# 101c pl! \ GPIOL_PULLDOWN_ENABLE - default h# ffff0000 h# 101c pl! \ GPIOL_PULLDOWN_ENABLE - Disable all pull-downs - h# d6e5 h# 1020 pl! \ GPIOL_INPUT_ENABLE - DCONBLNK, DCONLOAD, THERM_ALRM, DCONIRQ, DCONSTAT1/0, MEMSIZE, PCI_INTA - h# 0081 h# 1024 pl! \ GPIOL_INPUT_INVERT_ENABLE - Invert DCONIRQ and PCI_INTA# + h# d6e5 h# 1020 pl! \ GPIOL_INPUT_ENABLE - DCONBLNK, DCONLOAD, THRM_ALARM, DCONIRQ, DCONSTAT1/0, MEMSIZE, PCI_INTA + h# 0481 h# 1024 pl! \ GPIOL_INPUT_INVERT_ENABLE - Invert THRM_ALARM, DCONIRQ and PCI_INTA# \ h# ffff0000 h# 1028 pl! \ GPIOL_IN_FILTER_ENABLE - default \ h# ffff0000 h# 102c pl! \ GPIOL_IN_EVENTCOUNT_ENABLE - default \ h# 2d9bd264 h# 1030 pl! \ GPIOL_READ_BACK Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-04-25 07:27:37 UTC (rev 323) +++ cpu/x86/pc/olpc/resume.bth 2007-04-26 02:58:02 UTC (rev 324) @@ -141,6 +141,10 @@ gpio-port h# c4 + # dx mov dx ax in ax stos \ Neg edge enable gpio-port h# bc + # dx mov dx ax in ax stos \ High bank lock + \ Switch the THRM_ALARM# pin to GPIO during suspend, so it doesn't trigger falsely. + \ THRM_ALARM# is in the standby power well + h# 0400.0000 # ax mov gpio-port h# 34 + # dx mov ax dx out \ GPIO, not THRM_ALARM# + [ifdef] save-display \ \ h# 3c 0 do i gp@ l!+ 4 +loop h# 4c gp@ l!+ \ h# f # cx mov gp-pa set-base begin 0 [bx] ax mov ax stos 4 # bx add loopa

1 0

r130 - openbios-devel/drivers
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: blueswirl Date: 2007-04-25 21:57:23 +0200 (Wed, 25 Apr 2007) New Revision: 130 Modified: openbios-devel/drivers/obio.c Log: CPU specific properties Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-24 20:00:02 UTC (rev 129) +++ openbios-devel/drivers/obio.c 2007-04-25 19:57:23 UTC (rev 130) @@ -306,23 +306,141 @@ return NVRAM_SIZE; } +static void mb86904_init(void) +{ + PUSH(32); + fword("encode-int"); + push_str("cache-line-size"); + fword("property"); + + PUSH(512); + fword("encode-int"); + push_str("cache-nlines"); + fword("property"); + + PUSH(0x23); + fword("encode-int"); + push_str("mask_rev"); + fword("property"); +} + +static void tms390z55_init(void) +{ + push_str(""); + fword("encode-string"); + push_str("ecache-parity?"); + fword("property"); + + push_str(""); + fword("encode-string"); + push_str("bfill?"); + fword("property"); + + push_str(""); + fword("encode-string"); + push_str("bcopy?"); + fword("property"); + + push_str(""); + fword("encode-string"); + push_str("cache-physical?"); + fword("property"); + + PUSH(0xf); + fword("encode-int"); + PUSH(0xf8fffffc); + fword("encode-int"); + fword("encode+"); + PUSH(4); + fword("encode-int"); + fword("encode+"); + + PUSH(0xf); + fword("encode-int"); + fword("encode+"); + PUSH(0xf8c00000); + fword("encode-int"); + fword("encode+"); + PUSH(0x1000); + fword("encode-int"); + fword("encode+"); + + PUSH(0xf); + fword("encode-int"); + fword("encode+"); + PUSH(0xf8000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x1000); + fword("encode-int"); + fword("encode+"); + + PUSH(0xf); + fword("encode-int"); + fword("encode+"); + PUSH(0xf8800000); + fword("encode-int"); + fword("encode+"); + PUSH(0x1000); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); +} + struct cpudef { - const unsigned char *name; unsigned long iu_version; + const char *name; + int psr_impl, psr_vers, impl, vers; + int dcache_line_size, dcache_lines, dcache_assoc; + int icache_line_size, icache_lines, icache_assoc; + int ecache_line_size, ecache_lines, ecache_assoc; + int mmu_nctx; + void (*initfn)(void); }; static const struct cpudef sparc_defs[] = { { + .iu_version = 0x04 << 24, /* Impl 0, ver 4 */ .name = "FMI,MB86904", - .iu_version = 0x04 << 24, /* Impl 0, ver 4 */ + .psr_impl = 0, + .psr_vers = 5, + .impl = 0, + .vers = 5, + .dcache_line_size = 0x20, + .dcache_lines = 0x200, + .dcache_assoc = 1, + .icache_line_size = 0x20, + .icache_lines = 0x200, + .icache_assoc = 1, + .ecache_line_size = 0x20, + .ecache_lines = 0x4000, + .ecache_assoc = 1, + .mmu_nctx = 0x100, + .initfn = mb86904_init, }, { + .iu_version = 0x40000000, .name = "TI,TMS390Z55", - .iu_version = 0x40000000, + .psr_impl = 4, + .psr_vers = 0, + .impl = 0, + .vers = 4, + .dcache_line_size = 0x20, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x40, + .icache_lines = 0x40, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, }, }; -static const char * +static const struct cpudef * id_cpu(void) { unsigned long iu_version; @@ -334,9 +452,10 @@ for (i = 0; i < sizeof(sparc_defs)/sizeof(struct cpudef); i++) { if (iu_version == sparc_defs[i].iu_version) - return sparc_defs[i].name; + return &sparc_defs[i]; } - return "CPU,Unknown"; + printk("Unknown cpu (psr %lx), freezing!\n", iu_version); + for (;;); } static void @@ -351,11 +470,12 @@ extern const char *obp_stdin_path, *obp_stdout_path; extern uint16_t graphic_depth; - const char *stdin, *stdout, *cpuname; + const char *stdin, *stdout; unsigned int i; char nographic; uint32_t size; unsigned int machine_id; + struct cpudef *cpu; ob_new_obio_device("eeprom", NULL); @@ -445,36 +565,31 @@ fword("new-device"); - cpuname = id_cpu(); - push_str(cpuname); + cpu = id_cpu(); + push_str(cpu->name); fword("device-name"); push_str("cpu"); fword("device-type"); - PUSH(0); + PUSH(cpu->psr_impl); fword("encode-int"); - push_str("implementation"); + push_str("psr-implementation"); fword("property"); - PUSH(4); + PUSH(cpu->psr_vers); fword("encode-int"); - push_str("version"); + push_str("psr-version"); fword("property"); - push_str(""); - fword("encode-string"); - push_str("cache-physical?"); - fword("property"); - - PUSH(32); + PUSH(cpu->impl); fword("encode-int"); - push_str("cache-line-size"); + push_str("implementation"); fword("property"); - PUSH(512); + PUSH(cpu->vers); fword("encode-int"); - push_str("cache-nlines"); + push_str("version"); fword("property"); PUSH(4096); @@ -482,48 +597,47 @@ push_str("page-size"); fword("property"); - PUSH(16); + PUSH(cpu->dcache_line_size); fword("encode-int"); push_str("dcache-line-size"); fword("property"); - PUSH(512); + PUSH(cpu->dcache_lines); fword("encode-int"); push_str("dcache-nlines"); fword("property"); - PUSH(1); + PUSH(cpu->dcache_assoc); fword("encode-int"); push_str("dcache-associativity"); fword("property"); - PUSH(16); + PUSH(cpu->icache_line_size); fword("encode-int"); push_str("icache-line-size"); fword("property"); - PUSH(512); + PUSH(cpu->icache_lines); fword("encode-int"); push_str("icache-nlines"); fword("property"); - PUSH(1); + PUSH(cpu->icache_assoc); fword("encode-int"); push_str("icache-associativity"); fword("property"); - - PUSH(0x20); + PUSH(cpu->ecache_line_size); fword("encode-int"); push_str("ecache-line-size"); fword("property"); - PUSH(0x4000); + PUSH(cpu->ecache_lines); fword("encode-int"); push_str("ecache-nlines"); fword("property"); - PUSH(1); + PUSH(cpu->ecache_assoc); fword("encode-int"); push_str("ecache-associativity"); fword("property"); @@ -533,7 +647,7 @@ push_str("ncaches"); fword("property"); - PUSH(4096); + PUSH(cpu->mmu_nctx); fword("encode-int"); push_str("mmu-nctx"); fword("property"); @@ -543,18 +657,18 @@ push_str("sparc-version"); fword("property"); - PUSH(37); - fword("encode-int"); - push_str("mask_rev"); + push_str(""); + fword("encode-string"); + push_str("cache-coherence?"); fword("property"); PUSH(i); fword("encode-int"); push_str("mid"); fword("property"); + + cpu->initfn(); - - fword("finish-device"); }

1 0

pgmap
by Blue Swirl 25 Apr '07

25 Apr '07

Hi, This patch adds pgmap@ and pgmap! functions that NetBSD loader needs. But the functions are only available at /iommu node. How can I make them global? 0 > 0 pgmap@ pgmap@: undefined word. 0 > cd /iommu ok 0 > words pgmap! pgmap@ decode-unit encode-unit close open ok 0 > .properties name "iommu" #address-cells 2 #size-cells 1 page-size 1000 cache-coherence? 0 address ffdae000 reg -- c : 0 0 0 0 10 0 0 0 0 0 3 0 ok 0 > ffdae000 pgmap@ . 100007e ok

1 0

Fixing interpose
by Blue Swirl 25 Apr '07

25 Apr '07

On 4/24/07, Stefan Reinauer <stepan(a)coresystems.de> wrote: > Copying list again... > > * Blue Swirl <blauwirbel(a)gmail.com> [070424 20:49]: > > Copyright (c) 1982, 1986, 1989, 1991, 1993 > > The Regents of the University of California. All rights reserved. > > Copyright (c) 1995-2006 OpenBSD. All rights reserved. http://www.OpenBSD.org > > > > OpenBSD 4.0 (RAMDISK) #297: Sun Sep 17 22:27:36 MDT 2006 > > deraadt@sparc.openbsd.org:/usr/src/sys/arch/sparc/compile/RAMDISK > > real mem = 133505024 > > avail mem = 117956608 > [..] > > zs0 at obio0 addr 0x71100000 pri 12, softpri 6 > > zstty0 at zs0 channel 0 (console i/o) > > zstty1 at zs0 channel 1 > > Is openbsd hanging here? Yes, nothing happens after that. > NetBSD: > > > obp_fortheval_v2(384000 pgmap@ 387d8c L!) > > : pgmap@ ( virt -- pmentry ) > \ Return the page map entry for the virtual address. > ; > > Not sure - can we just use an empty word here, as we use a 1:1 mapping? > > > : pgmap! ( pmentry virt -- ) > \ Store a new page map entry for the virtual address. > 2drop > ; > > Those words are defined in > http://openbios.org/viewvc/obp/cpu/sparc/ultra/mmu.fth?view=markup&revision… > > My sparc know how is pretty limited though ;-) > > > > pgmap@:obp_devclose(0xffd87f0c) = -19 > > Cannot load netbsd: error=27 Nice, assembler with Forth order. Looks like the returned value is a page table entry, not an address. This needs a real implementation.

2 2

r323 - cpu/x86/pc/olpc
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 09:27:37 +0200 (Wed, 25 Apr 2007) New Revision: 323 Modified: cpu/x86/pc/olpc/versions.fth Log: Test version q2c08i Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-04-25 07:26:54 UTC (rev 322) +++ cpu/x86/pc/olpc/versions.fth 2007-04-25 07:27:37 UTC (rev 323) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 08 +macro: FW_MINOR 08i \ The EC microcode macro: EC_VERSION c03

1 0

r322 - dev/olpc/cafecamera
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 09:26:54 +0200 (Wed, 25 Apr 2007) New Revision: 322 Modified: dev/olpc/cafecamera/cafecamera.fth Log: OLPC CaFe camera driver - added workaround for trac ticket #1360, and some diagnostics to help catch the problem. Modified: dev/olpc/cafecamera/cafecamera.fth =================================================================== --- dev/olpc/cafecamera/cafecamera.fth 2007-04-25 07:18:07 UTC (rev 321) +++ dev/olpc/cafecamera/cafecamera.fth 2007-04-25 07:26:54 UTC (rev 322) @@ -27,10 +27,6 @@ : cl! ( l adr -- ) chip + rl! ; : cl@ ( adr -- l ) chip + rl@ ; -: cw! ( w adr -- ) chip + rw! ; -: cw@ ( adr -- w ) chip + rw@ ; -: cb! ( b adr -- ) chip + rb! ; -: cb@ ( adr -- b ) chip + rb@ ; : map-regs ( -- ) 0 0 h# 0200.0010 my-space + /regs " map-in" $call-parent to chip @@ -73,12 +69,22 @@ bc cl@ drop ; +: ovc ( val adr -- ) + 2dup ov@ ( val reg# val actual ) + tuck <> if ( val reg# actual ) + ." Bad camera I2C value at " swap 2 u.r ( val actual ) + ." expected " swap 2 u.r ." got " 2 u.r cr ( ) + else ( val reg# actual ) + 3drop ( ) + then ( ) +; + \ ============================= camera operations ============================= false value ov7670-detected? : ((camera-init) ( -- ) - 80 12 ov! \ reset + 80 12 ov! \ reset (reads back different) 01 11 ov! \ 30 fps 04 3a ov! \ UYVY or VYUY 00 12 ov! \ VGA @@ -89,7 +95,7 @@ b6 32 ov! \ HREF pieces 0a 19 ov! \ Vert start high bits 7a 1a ov! \ Vert stop high bits - 0a 0a ov! \ GAIN, VSTART, VSTOP pieces + 0a 03 ov! \ GAIN, VSTART, VSTOP pieces \ Mystery scaling numbers 00 0c ov! \ Control 3 @@ -153,7 +159,7 @@ 00 3f ov! \ Edge enhancement factor 05 75 ov! e1 76 ov! 00 4c ov! 01 77 ov! c3 3d ov! \ Control 13 - 09 4b ov! 60 c9 ov! + 09 4b ov! 60 c9 ov! \ Reads back differently 38 41 ov! \ Control 16 40 56 ov! @@ -176,8 +182,99 @@ 03 79 ov! 40 c8 ov! 05 79 ov! 30 c8 ov! 26 79 ov! + + \ OVT says that rewrite this works around a bug in 565 mode. + \ The symptom of the bug is red and green speckles in the image. + 01 11 ov! \ 30 fps def 80 ; +: config-check ( -- ) + 01 11 ovc \ 30 fps + 04 3a ovc \ UYVY or VYUY + ( 00 12 ovc ) \ VGA + + \ Hardware window + 13 17 ovc \ Horiz start high bits + 01 18 ovc \ Horiz stop high bits + b6 32 ovc \ HREF pieces + ( 0a 19 ovc ) \ Vert start high bits + 7a 1a ovc \ Vert stop high bits + 0a 03 ovc \ GAIN, VSTART, VSTOP pieces + + \ Mystery scaling numbers + 00 0c ovc \ Control 3 + 00 3e ovc \ Control 14 + 3a 70 ovc 35 71 ovc 11 72 ovc f0 73 ovc + 02 a2 ovc + 00 15 ovc \ Control 10 + + \ Gamma curve values + 20 7a ovc 10 7b ovc 1e 7c ovc 35 7d ovc + 5a 7e ovc 69 7f ovc 76 80 ovc 80 81 ovc + 88 82 ovc 8f 83 ovc 96 84 ovc a3 85 ovc + af 86 ovc c4 87 ovc d7 88 ovc e8 89 ovc + + \ AGC and AEC parameters + ( e0 13 ovc ) \ Control 8 + ( 00 00 ovc ) \ Gain lower 8 bits + 40 0d ovc \ Control 4 magic reserved bit + ( 18 14 ovc ) \ Control 9: 4x gain + magic reserved bit + 05 a5 ovc \ 50hz banding step limit + 07 ab ovc \ 60hz banding step limit + ( 95 24 ovc ) \ AGC upper limit + 33 25 ovc \ AGC lower limit + e3 24 ovc \ AGC/AEC fast mode op region + 78 9f ovc \ Hist AEC/AGC control 1 + 68 a0 ovc \ Hist AEC/AGC control 2 + 03 a1 ovc \ Magic + d8 a6 ovc \ Hist AEC/AGC control 3 + d8 a7 ovc \ Hist AEC/AGC control 4 + f0 a8 ovc \ Hist AEC/AGC control 5 + 90 a9 ovc \ Hist AEC/AGC control 6 + 94 aa ovc \ Hist AEC/AGC control 7 + ( e5 13 ovc ) \ Control 8 + + \ Mostly magic + 61 0e ovc 4b 0f ovc 02 16 ovc 07 1e ovc + 02 21 ovc 91 22 ovc 07 29 ovc 0b 33 ovc + 0b 35 ovc 1d 37 ovc 71 38 ovc 2a 39 ovc + 78 3c ovc 40 4d ovc 20 4e ovc 00 69 ovc + 4a 6b ovc 10 74 ovc 4f 8d ovc 00 8e ovc + 00 8f ovc 00 90 ovc 00 91 ovc 00 96 ovc + ( 00 9a ovc ) 84 b0 ovc 0c b1 ovc 0e b2 ovc + 82 b3 ovc 0a b8 ovc + + \ More magic, some of which tweaks white balance + 0a 43 ovc f0 44 ovc 34 45 ovc 58 46 ovc + 28 47 ovc 3a 48 ovc 88 59 ovc 88 5a ovc + 44 5b ovc 67 5c ovc 49 5d ovc 0e 5e ovc + 0a 6c ovc 55 6d ovc 11 6e ovc + 9f 6f ovc \ 9e for advance AWB + ( 40 6a ovc ) + ( 40 01 ovc ) \ Blue gain + ( 60 02 ovc ) \ Red gain + e7 13 ovc \ Control 8 + + \ Matrix coefficients + b3 4f ovc b3 50 ovc 00 51 ovc 3d 52 ovc + a7 53 ovc e4 54 ovc 9e 58 ovc + + \ 08 41 ovc \ AWB gain enable + ( 00 3f ovc ) \ Edge enhancement factor + 05 75 ovc e1 76 ovc ( 00 4c ovc ) 01 77 ovc + c0 3d ovc \ Control 13 + 09 4b ovc ( 60 c9 ovc ) + 38 41 ovc \ Control 16 + 40 56 ovc + + 11 34 ovc + 12 3b ovc \ Control 11 + 88 a4 ovc 00 96 ovc 30 97 ovc 20 98 ovc + 30 99 ovc 84 9a ovc 29 9b ovc 03 9c ovc + 5c 9d ovc 3f 9e ovc 04 78 ovc + +; + : camera-init ( -- ) false to ov7670-detected? ((camera-init) @@ -424,6 +521,32 @@ close ( error? ) ; +: dump-regs ( run# -- ) + 0 d# 16 " at-xy" eval + ." Pass " .d + key upc h# 47 = if ." Good" else ." Bad" then cr \ 47 is G + + ." 0 1 2 3 4 5 6 7 8 9 a b c d e f" cr + ." -----------------------------------------------" cr + h# ca 0 do + i 2 u.r ." : " + i h# 10 bounds do + i h# ca < if i ov@ 3 u.r then + loop + cr + h# 10 +loop +; + +: xselftest ( -- error? ) + open 0= if true exit then + h# 10 0 do + shoot-still drop d# 500 ms camera-config config-check + i dump-regs + loop + 0 close ( error? ) +; + + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r321 - cpu/x86/pc/olpc
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 09:18:07 +0200 (Wed, 25 Apr 2007) New Revision: 321 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/rmstart.fth cpu/x86/pc/olpc/romreset.bth Log: OLPC memory init: a) Added workaround for LX errata 34 b) Changed LX memory timings according to calculations by John Watlington and Tom Sylla c) Added a facility to temporarily test new timings by setting values in CMOS RAM. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-04-25 07:07:59 UTC (rev 320) +++ cpu/x86/pc/olpc/fw.bth 2007-04-25 07:18:07 UTC (rev 321) @@ -453,6 +453,12 @@ [then] ; +: set-mc ( 19-val 1a-val -- ) + lbsplit h# 66 h# 69 do i cmos! -1 +loop + lbsplit h# 62 h# 65 do i cmos! -1 +loop + 1 h# 61 cmos! 1 h# 60 cmos! +; + : interpreter-init ( -- ) hex warning on Modified: cpu/x86/pc/olpc/rmstart.fth =================================================================== --- cpu/x86/pc/olpc/rmstart.fth 2007-04-25 07:07:59 UTC (rev 320) +++ cpu/x86/pc/olpc/rmstart.fth 2007-04-25 07:18:07 UTC (rev 321) @@ -139,12 +139,20 @@ h# 0017 # cx mov rdmsr \ Read CHIP_REVID h# 0014 # cx mov \ Restore RSTPLL MSR number h# 30 # al cmp >= if \ LX CPU - rdmsr \ Get base MSR value with divisors - op: h# 04de.0000 # ax or \ Set the startup time (de) and breadcrumb (4) - op: h# 0000.03d9 # dx mov \ PLL value for 133 MB clk, 433 CPU -\ op: h# 0000.04d9 # dx mov \ PLL value for 167 MB clk, 433 CPU + h# 60 # al mov al h# 70 # out h# 71 # al in \ Read CMOS 0x60 + al al test 0= if + rdmsr \ Get base MSR value with divisors + op: h# 04de.0000 # ax or \ Set the startup time (de) and breadcrumb (4) + op: h# 0000.04d9 # dx mov \ PLL value for 133 MB clk, 433 CPU + else + al dec al h# 71 # out \ Decrement safety counter + rdmsr \ Get base MSR value with divisors + op: h# 04de.0000 # ax or \ Set the startup time (de) and breadcrumb (4) + op: h# 0000.04d9 # dx mov \ PLL value for 167 MB clk, 433 CPU + then wrmsr \ Put in the base value op: h# 0000.1800 invert # ax and \ Turn off the BYPASS bits + else \ GX CPU op: dx dx xor \ Clear high bits op: h# 04de.0000 # ax mov \ Low MSR bits Modified: cpu/x86/pc/olpc/romreset.bth =================================================================== --- cpu/x86/pc/olpc/romreset.bth 2007-04-25 07:07:59 UTC (rev 320) +++ cpu/x86/pc/olpc/romreset.bth 2007-04-25 07:18:07 UTC (rev 321) @@ -137,20 +137,53 @@ 00000106.83104104. 00001983 set-msr \ Memory delay values 00000000.00000001. 00001980 set-msr \ Enable memory delays - 18000100.3b8332a3. 20000019 set-msr + h# 61 # al mov al h# 70 # out h# 71 # al in \ Read CMOS 0x61 + al al test 0= if + 18000100.6a7332a0. 20000019 set-msr - \ The RAM controller is now set up + \ The RAM controller is now set up - \ Init the SDRAMs - \ sdram_enable,src/northbridge/amd/gx2/raminit.c + \ Init the SDRAMs + \ sdram_enable,src/northbridge/amd/gx2/raminit.c - \ Clock gating for PMode - \ Clocks always on in mode 1, hardware gating in mode 0 -\ 20002004 rmsr 4 bitclr 1 bitset 20002004 wmsr \ GX p 199 - 1. 20002004 set-msr \ GX p 199 + \ Clock gating for PMode + \ Clocks always on in mode 1, hardware gating in mode 0 + \ 20002004 rmsr 4 bitclr 1 bitset 20002004 wmsr \ GX p 199 + 1. 20002004 set-msr \ GX p 199 - \ Delay on exit from power mode 1, use unbuffered RAM - 140dd101. 2000001a set-msr \ MC_CF1017_DATA LX p 231 + \ Delay on exit from power mode 1, use unbuffered RAM + 130cd801. 2000001a set-msr \ MC_CF1017_DATA LX p 231 + else + al dec al h# 71 # out \ Decrement safety counter + + h# 64 # al mov al h# 70 # out h# 71 # al in al bl mov + h# 65 # al mov al h# 70 # out h# 71 # al in al bh mov + d# 16 # bx shl + h# 62 # al mov al h# 70 # out h# 71 # al in al bl mov + h# 63 # al mov al h# 70 # out h# 71 # al in al bh mov + + h# 18000100 # dx mov bx ax mov h# 20000019 wmsr + + \ The RAM controller is now set up + + \ Init the SDRAMs + \ sdram_enable,src/northbridge/amd/gx2/raminit.c + + \ Clock gating for PMode + \ Clocks always on in mode 1, hardware gating in mode 0 + \ 20002004 rmsr 4 bitclr 1 bitset 20002004 wmsr \ GX p 199 + 1. 20002004 set-msr \ GX p 199 + + \ Delay on exit from power mode 1, use unbuffered RAM + h# 68 # al mov al h# 70 # out h# 71 # al in al bl mov + h# 69 # al mov al h# 70 # out h# 71 # al in al bh mov + d# 16 # bx shl + h# 66 # al mov al h# 70 # out h# 71 # al in al bl mov + h# 67 # al mov al h# 70 # out h# 71 # al in al bh mov + + dx dx xor bx ax mov 2000001a wmsr \ MC_CF1017_DATA LX p 231 + then + 00000200.00000000. 20000020 set-msr \ Power mode entry and exit delays \ Unmask CKE1 and CKE0 @@ -292,6 +325,15 @@ fload ${BP}/cpu/x86/pc/olpc/draminit.fth + \ Last-minute check for LX erratum 34 - reset if the DLL didn't start correctly + h# 4c000017 rmsr h# 10 bitand 0<> if \ LX branch + h# 4c00000f rmsr h# 7ff bitclr h# 4 bitset h# 4c00000f wmsr \ Set DLL_OV + h# 4c00000f rmsr h# 7ff # ax and h# 104 # ax cmp = if \ Check the result + \ The value 104 indicates that the DLL did not start, so we must reset + 1. 5140.0017 set-msr + then + then + \ Now we can use the stack and do conventional subroutine calls h# 1f # al mov al h# 80 # out

1 0

r320 - cpu/x86/pc/olpc
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 09:07:59 +0200 (Wed, 25 Apr 2007) New Revision: 320 Modified: cpu/x86/pc/olpc/draminit.fth cpu/x86/pc/olpc/resume.bth Log: OLPC suspend/resume - use PM register 0x30 as a breadcrumb register for resume, instead of looking at bit one of PM+0x54. This is needed because of LX errata 34, which sometimes requires an extra reset to init the memory DLL. Modified: cpu/x86/pc/olpc/draminit.fth =================================================================== --- cpu/x86/pc/olpc/draminit.fth 2007-04-25 07:01:05 UTC (rev 319) +++ cpu/x86/pc/olpc/draminit.fth 2007-04-25 07:07:59 UTC (rev 320) @@ -51,8 +51,12 @@ 0000f001.00001400. 5140000f set-msr \ PMS BAR \ It is tempting to test bit 0 of PM register 5c, but a 5536 erratum - \ prevents that bit from working. - 1454 port-rl 2 bitand 0<> if \ Wakeup event flag + \ prevents that bit from working. Bit 1 works, but LX errata 34 + \ sometimes requires that we reset the system to fix the memory DLL, + \ which destroys all the bits of PM register 5c. So we put a breadcrumb + \ in a PM register that we don't otherwise use. + 1430 port-rl h# 9999 # ax cmp = if \ Wakeup event flag + 0 1430 port-wl h# 1b # al mov al h# 80 # out char r 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until resume-entry # sp mov sp jmp Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-04-25 07:01:05 UTC (rev 319) +++ cpu/x86/pc/olpc/resume.bth 2007-04-25 07:07:59 UTC (rev 320) @@ -258,6 +258,7 @@ \ This is pointless because register 14 is in the working power domain \ and does not retain the value across the suspend \ h# 4000.4601 h# 1414 port-wl \ Release SUSP# 5 mS after wakeup + h# 0000.9999 h# 1430 port-wl \ Breadcrumb indicating sleep h# 4000.0001 h# 1434 port-wl \ Turn on WORK_AUX (== MAIN_ON) at 32 uS h# 4000.0080 h# 1438 port-wl \ RESET_OUT# deassert at 4 mS h# 0002.ffff h# 1454 port-wl \ Clear wakeup type bits

1 0

r319 - cpu/x86/pc/olpc dev/geode/display
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 09:01:05 +0200 (Wed, 25 Apr 2007) New Revision: 319 Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/vsapci.fth dev/geode/display/gxpci.fth Log: OLPC - fixed some fairly innocuous problems with the display device tree and display register mapping. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-04-25 06:59:47 UTC (rev 318) +++ cpu/x86/pc/olpc/devices.fth 2007-04-25 07:01:05 UTC (rev 319) @@ -290,7 +290,7 @@ fload ${BP}/dev/geode/display/loadpkg.fth \ Geode display 0 0 encode-bytes - h# 8200.0910 +i 0+i h# fd00.0000 +i 0+i h# 0100.0000 +i \ Frame buffer + h# 8200.0910 +i 0+i h# fd00.0000 +i 0+i h# 0080.0000 +i \ Frame buffer h# 8200.0914 +i 0+i h# fe00.0000 +i 0+i h# 0000.4000 +i \ GP h# 8200.0918 +i 0+i h# fe40.0000 +i 0+i h# 0000.4000 +i \ DC h# 8200.091c +i 0+i h# fe80.0000 +i 0+i h# 0000.4000 +i \ VP Modified: cpu/x86/pc/olpc/vsapci.fth =================================================================== --- cpu/x86/pc/olpc/vsapci.fth 2007-04-25 06:59:47 UTC (rev 318) +++ cpu/x86/pc/olpc/vsapci.fth 2007-04-25 07:01:05 UTC (rev 319) @@ -201,7 +201,7 @@ h# ffffc000 gxfb-hdr h# 10 + l! \ BAR4 MASK - VIP h# 20811022 gxfb-hdr h# 20 + l! \ Vendor/device ID - AMD - h# fe0c0000 gxfb-hdr h# 40 + l! \ BAR4 address - VIP + h# fe00c000 gxfb-hdr h# 40 + l! \ BAR4 address - VIP then [ifdef] lx-devel exit [then] Modified: dev/geode/display/gxpci.fth =================================================================== --- dev/geode/display/gxpci.fth 2007-04-25 06:59:47 UTC (rev 318) +++ dev/geode/display/gxpci.fth 2007-04-25 07:01:05 UTC (rev 319) @@ -9,10 +9,11 @@ 0 0 encode-bytes 0 0 h# 0000.0000 my-space + phys+ 0 i+ h# 0000.0100 i+ \ Config registers -0 0 h# 0200.0010 my-space + phys+ 0 i+ h# 0100.0000 i+ \ Frame buffer +0 0 h# 0200.0010 my-space + phys+ 0 i+ h# 0080.0000 i+ \ Frame buffer 0 0 h# 0200.0014 my-space + phys+ 0 i+ h# 0000.4000 i+ \ Display controller 0 0 h# 0200.0018 my-space + phys+ 0 i+ h# 0000.4000 i+ \ Video controller 0 0 h# 0200.001c my-space + phys+ 0 i+ h# 0000.4000 i+ \ Graphics controller +0 0 h# 0200.0020 my-space + phys+ 0 i+ h# 0000.4000 i+ \ Video Input Port " reg" property : map-membar ( bar size -- adr ) @@ -27,7 +28,7 @@ h# 1c h# 4000 map-membar ( gp-base dc-base vp-base ) ; : (map-frame-buffer) ( -- adr ) - h# 10 h# 100.0000 map-membar + h# 10 h# 80.0000 map-membar ; \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

r318 - dev/olpc/cafenand
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 08:59:47 +0200 (Wed, 25 Apr 2007) New Revision: 318 Modified: dev/olpc/cafenand/cafenand.fth Log: OLPC cafenand.fth - removed some unused register access words. Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2007-04-25 06:58:37 UTC (rev 317) +++ dev/olpc/cafenand/cafenand.fth 2007-04-25 06:59:47 UTC (rev 318) @@ -23,10 +23,6 @@ : cl! ( l adr -- ) chip + rl! ; : cl@ ( adr -- l ) chip + rl@ ; -: cw! ( w adr -- ) chip + rw! ; -: cw@ ( adr -- w ) chip + rw@ ; -: cb! ( b adr -- ) chip + rb! ; -: cb@ ( adr -- b ) chip + rb@ ; : map-regs ( -- ) 0 0 h# 0200.0010 my-space + /regs " map-in" $call-parent to chip

1 0

r317 - forth/kernel
by svn＠openbios.org 25 Apr '07

25 Apr '07

Author: wmb Date: 2007-04-25 08:58:37 +0200 (Wed, 25 Apr 2007) New Revision: 317 Modified: forth/kernel/kernel.fth Log: Kernel - Added bdump and wdump commands. Modified: forth/kernel/kernel.fth =================================================================== --- forth/kernel/kernel.fth 2007-04-21 14:23:45 UTC (rev 316) +++ forth/kernel/kernel.fth 2007-04-25 06:58:37 UTC (rev 317) @@ -544,28 +544,40 @@ ps-size-t constant ps-size rs-size-t constant rs-size -: cdump (s adr len -- ) +: dump-chars ( adr -- ) + h# 10 bounds do + i c@ dup bl h# 80 within if emit else drop ." ." then + loop +; +: bdump (s adr len -- ) base @ >r hex bounds ?do i 8 u.r ." : " i h# 10 bounds do i /l bounds do i c@ .2 loop space /l +loop - i h# 10 bounds do - i c@ dup bl h# 80 within if emit else drop ." ." then - loop + i dump-chars cr h# 10 +loop r> base ! ; +: wdump (s adr len -- ) + base @ >r hex + bounds ?do + i 8 u.r ." : " i h# 10 bounds do + i w@ 4 u.r space space + /w +loop + i dump-chars + cr + h# 10 +loop + r> base ! +; : ldump (s adr len -- ) base @ >r hex bounds ?do i 8 u.r ." : " i h# 10 bounds do i l@ 8 u.r space space /l +loop - i h# 10 bounds do - i c@ dup bl h# 80 within if emit else drop ." ." then - loop + i dump-chars cr h# 10 +loop r> base !

1 0

r129 - openbios-devel/arch/sparc32
by svn＠openbios.org 24 Apr '07

24 Apr '07

Author: blueswirl Date: 2007-04-24 22:00:02 +0200 (Tue, 24 Apr 2007) New Revision: 129 Modified: openbios-devel/arch/sparc32/romvec.c Log: Fix broken compilation when debugging enabled Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-04-24 19:44:35 UTC (rev 128) +++ openbios-devel/arch/sparc32/romvec.c 2007-04-24 20:00:02 UTC (rev 129) @@ -108,7 +108,7 @@ } } -#if CONFIG_DEBUG_OBP +#ifdef CONFIG_DEBUG_OBP static int looks_like_string(char *str, int len) { int i; @@ -163,7 +163,7 @@ else str = "NULL"; -#if CONFIG_DEBUG_OBP +#ifdef CONFIG_DEBUG_OBP if (looks_like_string(str, len)) { DPRINTF("obp_getprop(0x%x, %s) = %s\n", node, name, str); } else {

1 0

r128 - openbios-devel/drivers
by svn＠openbios.org 24 Apr '07

24 Apr '07

Author: blueswirl Date: 2007-04-24 21:44:35 +0200 (Tue, 24 Apr 2007) New Revision: 128 Modified: openbios-devel/drivers/esp.c Log: Re-enable interpose Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2007-04-24 19:19:58 UTC (rev 127) +++ openbios-devel/drivers/esp.c 2007-04-24 19:44:35 UTC (rev 128) @@ -285,23 +285,11 @@ selfword("open-deblocker"); -#if WHEN_INTERPOSE_IS_FIXED - // Buggy implementation of "interpose" breaks SunOS 4. - // inst2pkg of the device returned by open() should return - // the same phandle regardless of whether any interposition - // has happened. Interpose currently causes inst2pkg to - // return the phandle of /packages/misc-files. - // - // Removing interpose isn't the ideal solution, but it - // allows SunOS 4 to load the kernel. Interpose should - // be fixed, then re-enabled. - /* interpose disk-label */ ph = find_dev("/packages/disk-label"); fword("my-args"); PUSH_ph( ph ); fword("interpose"); -#endif RET ( -ret ); }

1 0

Re: [OpenBIOS] Fixing interpose
by Stefan Reinauer 24 Apr '07

24 Apr '07

Copying list again... * Blue Swirl <blauwirbel(a)gmail.com> [070424 20:49]: > Copyright (c) 1982, 1986, 1989, 1991, 1993 > The Regents of the University of California. All rights reserved. > Copyright (c) 1995-2006 OpenBSD. All rights reserved. http://www.OpenBSD.org > > OpenBSD 4.0 (RAMDISK) #297: Sun Sep 17 22:27:36 MDT 2006 > deraadt@sparc.openbsd.org:/usr/src/sys/arch/sparc/compile/RAMDISK > real mem = 133505024 > avail mem = 117956608 [..] > zs0 at obio0 addr 0x71100000 pri 12, softpri 6 > zstty0 at zs0 channel 0 (console i/o) > zstty1 at zs0 channel 1 Is openbsd hanging here? NetBSD: > obp_fortheval_v2(384000 pgmap@ 387d8c L!) : pgmap@ ( virt -- pmentry ) \ Return the page map entry for the virtual address. ; Not sure - can we just use an empty word here, as we use a 1:1 mapping? : pgmap! ( pmentry virt -- ) \ Store a new page map entry for the virtual address. 2drop ; Those words are defined in http://openbios.org/viewvc/obp/cpu/sparc/ultra/mmu.fth?view=markup&revision… My sparc know how is pretty limited though ;-) > pgmap@:obp_devclose(0xffd87f0c) = -19 > Cannot load netbsd: error=27 Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/

1 0

r127 - in openbios-devel: arch/sparc32 forth/device
by svn＠openbios.org 24 Apr '07

24 Apr '07

Author: stepan Date: 2007-04-24 21:19:58 +0200 (Tue, 24 Apr 2007) New Revision: 127 Modified: openbios-devel/arch/sparc32/romvec.c openbios-devel/forth/device/package.fs Log: Fix for interpose problem. Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-04-21 19:47:16 UTC (rev 126) +++ openbios-devel/arch/sparc32/romvec.c 2007-04-24 19:19:58 UTC (rev 127) @@ -389,7 +389,7 @@ int ret; PUSH(dev_desc); - fword("ihandle>phandle"); + fword("ihandle>non-interposed-phandle"); ret = POP(); DPRINTF("obp_inst2pkg(fd 0x%x) = 0x%x\n", dev_desc, ret); Modified: openbios-devel/forth/device/package.fs =================================================================== --- openbios-devel/forth/device/package.fs 2007-04-21 19:47:16 UTC (rev 126) +++ openbios-devel/forth/device/package.fs 2007-04-24 19:19:58 UTC (rev 127) @@ -25,10 +25,18 @@ ?my-self >in.my-parent @ ; +: ihandle>non-interposed-phandle ( ihandle -- phandle ) + begin dup >in.interposed @ while + >in.my-parent @ + repeat + >in.device-node @ +; + : ihandle>phandle ( ihandle -- phandle ) >in.device-node @ ; + \ next-property \ defined in property.c

1 0

Fixing interpose
by Blue Swirl 23 Apr '07

23 Apr '07

Fixing the handling of interposed devices would allow booting a lot more OSes. If I understand correctly the interpose solution discussed earlier, the ihandle>phandle in line 28 in: http://www.openbios.org/viewvc/openbios-devel/forth/device/package.fs?view=… should become more like something in OBP line 72: http://openbios.org/viewvc/obp/os/bootprom/instance.fth?view=annotate&root=… Is this right? Or could someone more knowledgeable in Forth propose a fix?

3 3

r126 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 21 Apr '07

21 Apr '07

Author: blueswirl Date: 2007-04-21 21:47:16 +0200 (Sat, 21 Apr 2007) New Revision: 126 Modified: openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/tree.fs openbios-devel/drivers/obio.c openbios-devel/drivers/sbus.c Log: TCX 24 bit model support Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2007-04-16 16:52:52 UTC (rev 125) +++ openbios-devel/arch/sparc32/openbios.c 2007-04-21 19:47:16 UTC (rev 126) @@ -95,19 +95,18 @@ void setup_timers(void); modules_init(); -#ifdef CONFIG_DRIVER_SBUS ob_init_mmu(hwdef->iommu_high, hwdef->iommu_base); - ob_sbus_init(hwdef->iommu_high, hwdef->iommu_base + 0x1000, hwdef->machine_id); - -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO - init_video(); -#endif -#endif #ifdef CONFIG_DRIVER_OBIO ob_obio_init(hwdef->slavio_high, hwdef->slavio_base, hwdef->fd_offset, hwdef->counter_offset, hwdef->intr_offset); nvram_init(); #endif +#ifdef CONFIG_DRIVER_SBUS +#ifdef CONFIG_DEBUG_CONSOLE_VIDEO + init_video(); +#endif + ob_sbus_init(hwdef->iommu_high, hwdef->iommu_base + 0x1000, hwdef->machine_id); +#endif device_end(); bind_func("platform-boot", boot ); Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2007-04-16 16:52:52 UTC (rev 125) +++ openbios-devel/arch/sparc32/tree.fs 2007-04-21 19:47:16 UTC (rev 126) @@ -88,8 +88,6 @@ h# 300 encode-int " height" property h# 400 encode-int " width" property h# 400 encode-int " linebytes" property - d# 24 encode-int " depth" property - " no" encode-string " tcx-8-bit" property 5 encode-int 0 encode-int encode+ " intr" property 5 encode-int " interrupts" property finish-device Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-16 16:52:52 UTC (rev 125) +++ openbios-devel/drivers/obio.c 2007-04-21 19:47:16 UTC (rev 126) @@ -349,6 +349,7 @@ extern char boot_device; extern char obp_stdin, obp_stdout; extern const char *obp_stdin_path, *obp_stdout_path; + extern uint16_t graphic_depth; const char *stdin, *stdout, *cpuname; unsigned int i; @@ -386,6 +387,7 @@ boot_device = nv_info.boot_device; nographic = nv_info.nographic; + graphic_depth = nv_info.depth; push_str("mk48t08"); fword("model"); Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2007-04-16 16:52:52 UTC (rev 125) +++ openbios-devel/drivers/sbus.c 2007-04-21 19:47:16 UTC (rev 126) @@ -77,6 +77,8 @@ fword("property"); } +uint16_t graphic_depth; + static void ob_tcx_init(unsigned int slot, unsigned long base) { @@ -98,7 +100,11 @@ PUSH(0x02000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00400000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -108,7 +114,11 @@ PUSH(0x04000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00400000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -128,7 +138,11 @@ PUSH(0x0a000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00400000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -138,7 +152,11 @@ PUSH(0x0c000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00800000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -148,7 +166,11 @@ PUSH(0x0e000000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00800000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); @@ -168,17 +190,29 @@ PUSH(0x00200000); fword("encode-int"); fword("encode+"); - PUSH(0x00000004); + if (graphic_depth == 24) { + PUSH(0x00004000); + } else { + PUSH(0x00000004); + } fword("encode-int"); fword("encode+"); PUSH(slot); fword("encode-int"); fword("encode+"); - PUSH(0x00300000); + if (graphic_depth == 24) { + PUSH(0x00301000); + } else { + PUSH(0x00300000); + } fword("encode-int"); fword("encode+"); - PUSH(0x0000081c); + if (graphic_depth == 24) { + PUSH(0x00001000); + } else { + PUSH(0x0000081c); + } fword("encode-int"); fword("encode+"); @@ -198,7 +232,11 @@ PUSH(0x00240000); fword("encode-int"); fword("encode+"); - PUSH(0x00000004); + if (graphic_depth == 24) { + PUSH(0x00004000); + } else { + PUSH(0x00000004); + } fword("encode-int"); fword("encode+"); @@ -208,12 +246,28 @@ PUSH(0x00280000); fword("encode-int"); fword("encode+"); - PUSH(0x00000001); + if (graphic_depth == 24) { + PUSH(0x00008000); + } else { + PUSH(0x00000001); + } fword("encode-int"); fword("encode+"); push_str("reg"); fword("property"); + + PUSH((int)graphic_depth); + fword("encode-int"); + push_str("depth"); + fword("property"); + + if (graphic_depth == 8) { + push_str("true"); + fword("encode-string"); + push_str("tcx-8-bit"); + fword("property"); + } } static void

1 0

r125 - openbios-devel/arch/sparc64
by svn＠openbios.org 16 Apr '07

16 Apr '07

Author: blueswirl Date: 2007-04-16 18:52:52 +0200 (Mon, 16 Apr 2007) New Revision: 125 Modified: openbios-devel/arch/sparc64/vectors.S Log: Fix exception number in crash output Modified: openbios-devel/arch/sparc64/vectors.S =================================================================== --- openbios-devel/arch/sparc64/vectors.S 2007-04-16 16:47:42 UTC (rev 124) +++ openbios-devel/arch/sparc64/vectors.S 2007-04-16 16:52:52 UTC (rev 125) @@ -210,7 +210,10 @@ bug: /* Dump the exception and its context */ ! Set up CPU state - wrpr %g0, PSTATE_PRIV, %pstate + ! Don't change the global register set or we lose %g1 (exception level) + rdpr %pstate, %g2 + or %g2, PSTATE_PRIV, %g2 + wrpr %g2, %pstate wr %g0, 0, %fprs wrpr %g0, 0x0, %tl

1 0

r124 - openbios-devel/arch/sparc64
by svn＠openbios.org 16 Apr '07

16 Apr '07

Author: blueswirl Date: 2007-04-16 18:47:42 +0200 (Mon, 16 Apr 2007) New Revision: 124 Modified: openbios-devel/arch/sparc64/build.xml Log: Linkage fix to reduce Sparc64 image size by 1M Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2007-04-15 05:46:25 UTC (rev 123) +++ openbios-devel/arch/sparc64/build.xml 2007-04-16 16:47:42 UTC (rev 124) @@ -66,8 +66,9 @@  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> +  <rule> - $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^ + $(LD) -N -T arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule>

1 0

r123 - openbios-devel/drivers
by svn＠openbios.org 15 Apr '07

15 Apr '07

Author: blueswirl Date: 2007-04-15 07:46:25 +0200 (Sun, 15 Apr 2007) New Revision: 123 Modified: openbios-devel/drivers/esp.c openbios-devel/drivers/obio.c Log: Fix Sparc32 properties with wrong encoding Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2007-04-15 00:41:40 UTC (rev 122) +++ openbios-devel/drivers/esp.c 2007-04-15 05:46:25 UTC (rev 123) @@ -432,7 +432,6 @@ push_str(device); fword("encode-string"); push_str(alias); - fword("encode-string"); fword("property"); } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-15 00:41:40 UTC (rev 122) +++ openbios-devel/drivers/obio.c 2007-04-15 05:46:25 UTC (rev 123) @@ -405,23 +405,29 @@ switch (machine_id) { case 0x72: push_str("SPARCstation 10 (1 X 390Z55)"); + fword("encode-string"); push_str("banner-name"); fword("property"); push_str("SUNW,S10,501-2365"); + fword("encode-string"); push_str("model"); fword("property"); push_str("SUNW,SPARCstation-10"); + fword("encode-string"); push_str("name"); fword("property"); break; case 0x80: push_str("SPARCstation 5"); - push_str("name"); + fword("encode-string"); + push_str("banner-name"); fword("property"); push_str("SUNW,501-3059"); + fword("encode-string"); push_str("model"); fword("property"); push_str("SUNW,SPARCstation-5"); + fword("encode-string"); push_str("name"); fword("property"); break; @@ -455,6 +461,7 @@ fword("property"); push_str(""); + fword("encode-string"); push_str("cache-physical?"); fword("property"); @@ -566,13 +573,11 @@ push_str(stdin); fword("encode-string"); push_str("stdin-path"); - fword("encode-string"); fword("property"); push_str(stdout); fword("encode-string"); push_str("stdout-path"); - fword("encode-string"); fword("property"); obp_stdin_path = stdin;

1 0

[PATCH] Fix some unaligned memory accesses
by Aurelien Jarno 15 Apr '07

15 Apr '07

Hi all, The current SVN version currently fails to work on machines that have strict alignment requirements, for example the SPARC target. This is due to the way the struct fat_bpb in fs/grubfs/fat.h is defined and accessed (through FAT_CVT_U16) to avoid padding. Some 16 bits fields like bytes_per_sect are thus accessed unaligned. The patch below takes the same approach as for other structures in openbios, it declares the structure as packed, and lets GCC do the right things to access those unaligned field. Regards, Aurelien Index: fs/grubfs/fsys_fat.c =================================================================== --- fs/grubfs/fsys_fat.c (révision 116) +++ fs/grubfs/fsys_fat.c (copie de travail) @@ -75,23 +75,23 @@ if (bpb.sects_per_clust == 0) return 0; - FAT_SUPER->sectsize_bits = log2 (FAT_CVT_U16 (bpb.bytes_per_sect)); + FAT_SUPER->sectsize_bits = log2 (bpb.bytes_per_sect); FAT_SUPER->clustsize_bits = FAT_SUPER->sectsize_bits + log2 (bpb.sects_per_clust); /* Fill in info about super block */ - FAT_SUPER->num_sectors = FAT_CVT_U16 (bpb.short_sectors) - ? FAT_CVT_U16 (bpb.short_sectors) : bpb.long_sectors; + FAT_SUPER->num_sectors = bpb.short_sectors + ? bpb.short_sectors : bpb.long_sectors; /* FAT offset and length */ - FAT_SUPER->fat_offset = FAT_CVT_U16 (bpb.reserved_sects); + FAT_SUPER->fat_offset = bpb.reserved_sects; FAT_SUPER->fat_length = bpb.fat_length ? bpb.fat_length : bpb.fat32_length; /* Rootdir offset and length for FAT12/16 */ FAT_SUPER->root_offset = FAT_SUPER->fat_offset + bpb.num_fats * FAT_SUPER->fat_length; - FAT_SUPER->root_max = FAT_DIRENTRY_LENGTH * FAT_CVT_U16(bpb.dir_entries); + FAT_SUPER->root_max = FAT_DIRENTRY_LENGTH * bpb.dir_entries; /* Data offset and number of clusters */ FAT_SUPER->data_offset = @@ -105,7 +105,7 @@ if (!bpb.fat_length) { /* This is a FAT32 */ - if (FAT_CVT_U16(bpb.dir_entries)) + if (bpb.dir_entries) return 0; if (bpb.flags & 0x0080) @@ -144,8 +144,8 @@ /* Now do some sanity checks */ - if (FAT_CVT_U16(bpb.bytes_per_sect) != (1 << FAT_SUPER->sectsize_bits) - || FAT_CVT_U16(bpb.bytes_per_sect) != SECTOR_SIZE + if (bpb.bytes_per_sect != (1 << FAT_SUPER->sectsize_bits) + || bpb.bytes_per_sect != SECTOR_SIZE || bpb.sects_per_clust != (1 << (FAT_SUPER->clustsize_bits - FAT_SUPER->sectsize_bits)) || FAT_SUPER->num_clust <= 2 Index: fs/grubfs/fat.h =================================================================== --- fs/grubfs/fat.h (révision 116) +++ fs/grubfs/fat.h (copie de travail) @@ -37,12 +37,12 @@ __s8 ignored[3]; /* Boot strap short or near jump */ __s8 system_id[8]; /* Name - can be used to special case partition manager volumes */ - __u8 bytes_per_sect[2]; /* bytes per logical sector */ + __u16 bytes_per_sect; /* bytes per logical sector */ __u8 sects_per_clust;/* sectors/cluster */ - __u8 reserved_sects[2]; /* reserved sectors */ + __u16 reserved_sects; /* reserved sectors */ __u8 num_fats; /* number of FATs */ - __u8 dir_entries[2]; /* root directory entries */ - __u8 short_sectors[2]; /* number of sectors */ + __u16 dir_entries; /* root directory entries */ + __u16 short_sectors; /* number of sectors */ __u8 media; /* media code (unused) */ __u16 fat_length; /* sectors/FAT */ __u16 secs_track; /* sectors per track */ @@ -53,15 +53,13 @@ /* The following fields are only used by FAT32 */ __u32 fat32_length; /* sectors/FAT */ __u16 flags; /* bit 8: fat mirroring, low 4: active fat */ - __u8 version[2]; /* major, minor filesystem version */ + __u16 version; /* major, minor filesystem version */ __u32 root_cluster; /* first cluster in root directory */ __u16 info_sector; /* filesystem info sector */ __u16 backup_boot; /* backup boot sector */ __u16 reserved2[6]; /* Unused */ -}; +} __attribute__ ((packed)); -#define FAT_CVT_U16(bytarr) (* (__u16*)(bytarr)) - /* * Defines how to differentiate a 12-bit and 16-bit FAT. */ -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

3 3

r122 - openbios-devel/fs/grubfs
by svn＠openbios.org 15 Apr '07

15 Apr '07

Author: stepan Date: 2007-04-15 02:41:40 +0200 (Sun, 15 Apr 2007) New Revision: 122 Modified: openbios-devel/fs/grubfs/fat.h openbios-devel/fs/grubfs/fsys_fat.c Log: Patch from Aurelien Jarno <aurelien(a)aurel32.net>: The current SVN version currently fails to work on machines that have strict alignment requirements, for example the SPARC target. This is due to the way the struct fat_bpb in fs/grubfs/fat.h is defined and accessed (through FAT_CVT_U16) to avoid padding. Some 16 bits fields like bytes_per_sect are thus accessed unaligned. The patch below takes the same approach as for other structures in openbios, it declares the structure as packed, and lets GCC do the right things to access those unaligned field. Modified: openbios-devel/fs/grubfs/fat.h =================================================================== --- openbios-devel/fs/grubfs/fat.h 2007-04-14 19:48:59 UTC (rev 121) +++ openbios-devel/fs/grubfs/fat.h 2007-04-15 00:41:40 UTC (rev 122) @@ -37,12 +37,12 @@ __s8 ignored[3]; /* Boot strap short or near jump */ __s8 system_id[8]; /* Name - can be used to special case partition manager volumes */ - __u8 bytes_per_sect[2]; /* bytes per logical sector */ + __u16 bytes_per_sect; /* bytes per logical sector */ __u8 sects_per_clust;/* sectors/cluster */ - __u8 reserved_sects[2]; /* reserved sectors */ + __u16 reserved_sects; /* reserved sectors */ __u8 num_fats; /* number of FATs */ - __u8 dir_entries[2]; /* root directory entries */ - __u8 short_sectors[2]; /* number of sectors */ + __u16 dir_entries; /* root directory entries */ + __u16 short_sectors; /* number of sectors */ __u8 media; /* media code (unused) */ __u16 fat_length; /* sectors/FAT */ __u16 secs_track; /* sectors per track */ @@ -53,15 +53,13 @@ /* The following fields are only used by FAT32 */ __u32 fat32_length; /* sectors/FAT */ __u16 flags; /* bit 8: fat mirroring, low 4: active fat */ - __u8 version[2]; /* major, minor filesystem version */ + __u16 version; /* major, minor filesystem version */ __u32 root_cluster; /* first cluster in root directory */ __u16 info_sector; /* filesystem info sector */ __u16 backup_boot; /* backup boot sector */ __u16 reserved2[6]; /* Unused */ -}; +} __attribute__ ((packed)); -#define FAT_CVT_U16(bytarr) (* (__u16*)(bytarr)) - /* * Defines how to differentiate a 12-bit and 16-bit FAT. */ Modified: openbios-devel/fs/grubfs/fsys_fat.c =================================================================== --- openbios-devel/fs/grubfs/fsys_fat.c 2007-04-14 19:48:59 UTC (rev 121) +++ openbios-devel/fs/grubfs/fsys_fat.c 2007-04-15 00:41:40 UTC (rev 122) @@ -75,23 +75,23 @@ if (bpb.sects_per_clust == 0) return 0; - FAT_SUPER->sectsize_bits = log2 (FAT_CVT_U16 (bpb.bytes_per_sect)); + FAT_SUPER->sectsize_bits = log2 (bpb.bytes_per_sect); FAT_SUPER->clustsize_bits = FAT_SUPER->sectsize_bits + log2 (bpb.sects_per_clust); /* Fill in info about super block */ - FAT_SUPER->num_sectors = FAT_CVT_U16 (bpb.short_sectors) - ? FAT_CVT_U16 (bpb.short_sectors) : bpb.long_sectors; + FAT_SUPER->num_sectors = bpb.short_sectors + ? bpb.short_sectors : bpb.long_sectors; /* FAT offset and length */ - FAT_SUPER->fat_offset = FAT_CVT_U16 (bpb.reserved_sects); + FAT_SUPER->fat_offset = bpb.reserved_sects; FAT_SUPER->fat_length = bpb.fat_length ? bpb.fat_length : bpb.fat32_length; /* Rootdir offset and length for FAT12/16 */ FAT_SUPER->root_offset = FAT_SUPER->fat_offset + bpb.num_fats * FAT_SUPER->fat_length; - FAT_SUPER->root_max = FAT_DIRENTRY_LENGTH * FAT_CVT_U16(bpb.dir_entries); + FAT_SUPER->root_max = FAT_DIRENTRY_LENGTH * bpb.dir_entries; /* Data offset and number of clusters */ FAT_SUPER->data_offset = @@ -105,7 +105,7 @@ if (!bpb.fat_length) { /* This is a FAT32 */ - if (FAT_CVT_U16(bpb.dir_entries)) + if (bpb.dir_entries) return 0; if (bpb.flags & 0x0080) @@ -144,8 +144,8 @@ /* Now do some sanity checks */ - if (FAT_CVT_U16(bpb.bytes_per_sect) != (1 << FAT_SUPER->sectsize_bits) - || FAT_CVT_U16(bpb.bytes_per_sect) != SECTOR_SIZE + if (bpb.bytes_per_sect != (1 << FAT_SUPER->sectsize_bits) + || bpb.bytes_per_sect != SECTOR_SIZE || bpb.sects_per_clust != (1 << (FAT_SUPER->clustsize_bits - FAT_SUPER->sectsize_bits)) || FAT_SUPER->num_clust <= 2

1 0

r121 - openbios-devel/arch/sparc64
by svn＠openbios.org 14 Apr '07

14 Apr '07

Author: blueswirl Date: 2007-04-14 21:48:59 +0200 (Sat, 14 Apr 2007) New Revision: 121 Modified: openbios-devel/arch/sparc64/context.c Log: Fix Sparc64 stack offset Modified: openbios-devel/arch/sparc64/context.c =================================================================== --- openbios-devel/arch/sparc64/context.c 2007-04-09 12:35:41 UTC (rev 120) +++ openbios-devel/arch/sparc64/context.c 2007-04-14 19:48:59 UTC (rev 121) @@ -21,7 +21,7 @@ * to start us up. */ const struct context main_ctx = { - .regs[REG_SP] = (uint64_t) &_estack - 96, + .regs[REG_SP] = (uint64_t) &_estack - 2047 - 96, .pc = (uint64_t) start_main, .npc = (uint64_t) start_main + 4, .return_addr = (uint64_t) __exit_context,

1 0

Sparc property fixes
by Blue Swirl 09 Apr '07

09 Apr '07

Hi, Some properties in the Sparc32 device tree were incorrectly encoded, this patch fixes them.

1 0

Sparc64 alignment fix
by Blue Swirl 09 Apr '07

09 Apr '07

Hi, Currently Qemu does not enforce correct alignment on Sparc32/64 targets, but a patch by Aurelien Jarno would change that to match the real life CPUs. But before the patch can get in, problems with unaligned memory accesses in OpenBIOS must be corrected. This patch fixes the stack alignment problem on Sparc64 (actually caused by gcc, see gcc -mstack-bias).

1 0

Support for Sparcstation 10
by Blue Swirl 09 Apr '07

09 Apr '07

Hi, This patch adds support to Qemu's Sparcstation 10 machine model introduced in recent CVS version of Qemu. Tests run fine on both machines, please apply. _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

2 1

r120 - in openbios-devel: arch/sparc32 config/scripts drivers include/openbios include/sparc32
by svn＠openbios.org 09 Apr '07

09 Apr '07

Author: stepan Date: 2007-04-09 14:35:41 +0200 (Mon, 09 Apr 2007) New Revision: 120 Modified: openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/tree.fs openbios-devel/config/scripts/archname openbios-devel/config/scripts/crosscflags openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/obio.c openbios-devel/drivers/sbus.c openbios-devel/include/openbios/drivers.h openbios-devel/include/sparc32/io.h Log: SS10 support by blueswirl Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/arch/sparc32/console.c 2007-04-09 12:35:41 UTC (rev 120) @@ -17,11 +17,11 @@ #ifdef CONFIG_DEBUG_CONSOLE_SERIAL -#define KBD_BASE 0x71000004 -#define SERIAL_BASE 0x71100004 -#define CTRL(port) (SERIAL_BASE + (port) * 2 + 0) -#define DATA(port) (SERIAL_BASE + (port) * 2 + 2) +static unsigned long kbd_base, serial_base; +#define CTRL(port) (serial_base + (port) * 2 + 0) +#define DATA(port) (serial_base + (port) * 2 + 2) + /* Conversion routines to/from brg time constants from/to bits * per second. */ @@ -98,7 +98,8 @@ int uart_init(int port, unsigned long speed) { - uart_init_line(port, speed); + serial_base = ((unsigned long)port) & ~3; + uart_init_line(port & 3, speed); return -1; } @@ -177,6 +178,11 @@ console_init(); } +void kbd_init(unsigned long base) +{ + kbd_base = base + 4; +} + static const unsigned char sunkbd_keycode[128] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -210,7 +216,7 @@ int keyboard_dataready(void) { - return ((inb(KBD_BASE) & 1) == 1); + return ((inb(kbd_base) & 1) == 1); } unsigned char @@ -221,7 +227,7 @@ while (!keyboard_dataready()) { } do { - ch = inb(KBD_BASE + 2) & 0xff; + ch = inb(kbd_base + 2) & 0xff; if (ch == 99) shiftstate |= 1; else if (ch == 110) Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/arch/sparc32/entry.S 2007-04-09 12:35:41 UTC (rev 120) @@ -14,6 +14,9 @@ #define PHYS_JJ_EEPROM 0x71200000 /* [2000] MK48T08 */ #define PHYS_JJ_INTR0 0x71E00000 /* CPU0 interrupt control registers */ +#define PHYS_SS10_EEPROM 0xf1200000 /* XXX Actually at 0xff1200000ULL (36 bits)*/ +#define PHYS_SS10_INTR0 0xf1400000 /* 0xff1400000ULL */ + #define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */ .globl entry, _entry @@ -31,9 +34,30 @@ * Main context is statically defined in C. */ + ! Check if this is QEMU for SS-5 + set PHYS_JJ_EEPROM, %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'Q' + bne ss10 + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'E' + bne ss10 + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'M' + bne ss10 + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'U' + bne ss10 + + ! Ok, this is SS-5 + mov 0x80, %y ! Check if this not the first SMP CPU, if so, bypass PROM entirely set PHYS_JJ_EEPROM + 0x2E, %g1 lduba [%g1] ASI_M_BYPASS, %g2 + set PHYS_JJ_EEPROM + 0x30, %g1 tst %g2 bz first_cpu nop @@ -58,11 +82,64 @@ set 1, %g1 jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu + +bad_nvram: + ! Unknown machine, freeze + b bad_nvram + nop +ss10: + set PHYS_SS10_EEPROM, %g1 + ! XXX use full 36 bits access + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'Q' + bne bad_nvram + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'E' + bne bad_nvram + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'M' + bne bad_nvram + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'U' + bne bad_nvram + ! Ok, this is SS-10 + mov 0x72, %y + ! Check if this not the first SMP CPU, if so, bypass PROM entirely + ! XXX use full 36 bits access + set PHYS_SS10_EEPROM + 0x2E, %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + set PHYS_SS10_EEPROM + 0x30, %g1 + tst %g2 + bz first_cpu + nop + set PHYS_SS10_INTR0 + 0x04, %g1 + sll %g2, 12, %g2 + add %g1, %g2, %g2 + set 0xffffffff, %g1 + sta %g1, [%g2] ASI_M_BYPASS ! clear softints + add %g2, 4, %g2 + sta %g0, [%g2] ASI_M_BYPASS ! clear softints + set PHYS_SS10_EEPROM + 0x3C, %g1 + lda [%g1] ASI_M_BYPASS, %g1 + set AC_M_CTPR, %g2 + sta %g1, [%g2] ASI_M_MMUREGS ! set ctx table ptr + set PHYS_JJ_EEPROM + 0x40, %g1 + lda [%g1] ASI_M_BYPASS, %g1 + set AC_M_CXR, %g2 + sta %g1, [%g2] ASI_M_MMUREGS ! set context + set PHYS_SS10_EEPROM + 0x38, %g1 + lda [%g1] ASI_M_BYPASS, %g2 + set 1, %g1 + jmp %g2 ! jump to kernel + sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu + first_cpu: /* Create temporary page tables and map the ROM area to end of RAM. This will be done properly in iommu.c later. */ - set PHYS_JJ_EEPROM + 0x30, %g1 lda [%g1] ASI_M_BYPASS, %g1 set _end, %g3 set 0xfff, %g2 @@ -213,6 +290,10 @@ sub %g1, %g7, %g7 set va_shift, %g1 st %g7, [%g1] + + set qemu_machine_type, %g1 + mov %y, %g2 + st %g2, [%g1] /* Finally, turn on traps so that we can call c-code. */ rd %psr, %g3 Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/arch/sparc32/openbios.c 2007-04-09 12:35:41 UTC (rev 120) @@ -19,12 +19,60 @@ void boot(void); void ob_ide_init(void); void tcx_init(unsigned long base); +void kbd_init(unsigned long base); -#define IOMMU_BASE 0x10000000 /* First page of sun4m IOMMU */ -#define SBUS_BASE 0x10001000 -#define SLAVIO_BASE 0x71000000 -#define TCX_BASE 0x50000000 +int qemu_machine_type; +struct hwdef { + unsigned long iommu_high, iommu_base; + unsigned long slavio_high, slavio_base; + unsigned long intctl_base, counter_base, nvram_base, ms_kb_base, serial_base; + unsigned long fd_offset, counter_offset, intr_offset; + unsigned long dma_base, esp_base, le_base; + unsigned long tcx_base; + int machine_id; +}; + +static const struct hwdef hwdefs[] = { + /* SS-5 */ + { + .iommu_high = 0x0, + .iommu_base = 0x10000000, + .tcx_base = 0x50000000, + .slavio_high = 0x0, + .slavio_base = 0x71000000, + .ms_kb_base = 0x71000000, + .serial_base = 0x71100000, + .nvram_base = 0x71200000, + .fd_offset = 0x00400000, + .counter_offset = 0x00d00000, + .intr_offset = 0x00e00000, + .dma_base = 0x78400000, + .esp_base = 0x78800000, + .le_base = 0x78c00000, + .machine_id = 0x80, + }, + /* SS-10 */ + { + .iommu_high = 0xf, + .iommu_base = 0xe0000000, // XXX Actually at 0xfe0000000ULL (36 bits) + .tcx_base = 0x20000000, // 0xe20000000ULL, + .slavio_high = 0xf, + .slavio_base = 0xf1000000, // 0xff1000000ULL, + .ms_kb_base = 0xf1000000, // 0xff1000000ULL, + .serial_base = 0xf1100000, // 0xff1100000ULL, + .nvram_base = 0xf1200000, // 0xff1200000ULL, + .fd_offset = 0x00700000, // 0xff1700000ULL, + .counter_offset = 0x00300000, // 0xff1300000ULL, + .intr_offset = 0x00400000, // 0xff1400000ULL, + .dma_base = 0xf0400000, // 0xef0400000ULL, + .esp_base = 0xf0800000, // 0xef0800000ULL, + .le_base = 0xf0c00000, // 0xef0c00000ULL, + .machine_id = 0x72, + }, +}; + +static const struct hwdef *hwdef; static unsigned char intdict[256 * 1024]; static void init_memory(void) @@ -48,15 +96,16 @@ modules_init(); #ifdef CONFIG_DRIVER_SBUS - ob_init_mmu(IOMMU_BASE); - ob_sbus_init(SBUS_BASE); + ob_init_mmu(hwdef->iommu_high, hwdef->iommu_base); + ob_sbus_init(hwdef->iommu_high, hwdef->iommu_base + 0x1000, hwdef->machine_id); #ifdef CONFIG_DEBUG_CONSOLE_VIDEO init_video(); #endif #endif #ifdef CONFIG_DRIVER_OBIO - ob_obio_init(SLAVIO_BASE); + ob_obio_init(hwdef->slavio_high, hwdef->slavio_base, hwdef->fd_offset, + hwdef->counter_offset, hwdef->intr_offset); nvram_init(); #endif device_end(); @@ -68,17 +117,29 @@ { extern struct sys_info sys_info; extern struct mem cmem; + unsigned int i; + for (i = 0; i < sizeof(hwdefs) / sizeof(struct hwdef); i++) { + if (hwdefs[i].machine_id == qemu_machine_type) { + hwdef = &hwdefs[i]; + break; + } + } + if (!hwdef) + for(;;); // Internal inconsistency, hang + mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); #ifdef CONFIG_DRIVER_SBUS - init_mmu_swift(IOMMU_BASE); + init_mmu_swift(hwdef->iommu_base); #endif #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); + uart_init(hwdef->serial_base | (CONFIG_SERIAL_PORT? 0: 4), + CONFIG_SERIAL_SPEED); #endif #ifdef CONFIG_DEBUG_CONSOLE_VIDEO - tcx_init(TCX_BASE); + tcx_init(hwdef->tcx_base); + kbd_init(hwdef->ms_kb_base); #endif /* Clear the screen. */ cls(); Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/arch/sparc32/tree.fs 2007-04-09 12:35:41 UTC (rev 120) @@ -3,10 +3,7 @@ 2 encode-int " #address-cells" property 1 encode-int " #size-cells" property - " SUNW,SPARCstation-5" encode-string " name" property - " SPARCstation 5" encode-string " banner-name" property " sun4m" encode-string " compatible" property - " SUNW,501-3059" encode-string " model" property h# 0a21fe80 encode-int " clock-frequency" property : encode-unit encode-unit-sbus ; @@ -36,8 +33,6 @@ 1 encode-int " #size-cells" property h# 1000 encode-int " page-size" property 0 encode-int " cache-coherence?" property - h# ffee8000 encode-int " address" property - h# 0 encode-int h# 10000000 encode-int encode+ h# 00000300 encode-int encode+ " reg" property external : open ( cr ." opening iommu" cr) true ; : close ; @@ -54,12 +49,6 @@ h# 01443fd0 encode-int " clock-frequency" property h# 1c encode-int " slot-address-bits" property h# 3f encode-int " burst-sizes" property - h# 0 encode-int h# 0 encode-int encode+ h# 0 encode-int encode+ h# 30000000 encode-int encode+ h# 10000000 encode-int encode+ - h# 1 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 40000000 encode-int encode+ h# 10000000 encode-int encode+ - h# 2 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 50000000 encode-int encode+ h# 10000000 encode-int encode+ - h# 3 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 60000000 encode-int encode+ h# 10000000 encode-int encode+ - h# 4 encode-int encode+ h# 0 encode-int encode+ h# 0 encode-int encode+ h# 70000000 encode-int encode+ h# 10000000 encode-int encode+ - " ranges" property external : open ( cr ." opening SBus" cr) true ; : close ; @@ -103,20 +92,6 @@ " no" encode-string " tcx-8-bit" property 5 encode-int 0 encode-int encode+ " intr" property 5 encode-int " interrupts" property - 2 encode-int h# 00800000 encode-int encode+ h# 00100000 encode-int encode+ - 2 encode-int encode+ h# 02000000 encode-int encode+ h# 00000001 encode-int encode+ - 2 encode-int encode+ h# 04000000 encode-int encode+ h# 00800000 encode-int encode+ - 2 encode-int encode+ h# 06000000 encode-int encode+ h# 00800000 encode-int encode+ - 2 encode-int encode+ h# 0a000000 encode-int encode+ h# 00000001 encode-int encode+ - 2 encode-int encode+ h# 0c000000 encode-int encode+ h# 00000001 encode-int encode+ - 2 encode-int encode+ h# 0e000000 encode-int encode+ h# 00000001 encode-int encode+ - 2 encode-int encode+ h# 00700000 encode-int encode+ h# 00001000 encode-int encode+ - 2 encode-int encode+ h# 00200000 encode-int encode+ h# 00000004 encode-int encode+ - 2 encode-int encode+ h# 00300000 encode-int encode+ h# 0000081c encode-int encode+ - 2 encode-int encode+ h# 00000000 encode-int encode+ h# 00010000 encode-int encode+ - 2 encode-int encode+ h# 00240000 encode-int encode+ h# 00000004 encode-int encode+ - 2 encode-int encode+ h# 00280000 encode-int encode+ h# 00000001 encode-int encode+ - " reg" property finish-device " /iommu/sbus" find-device @@ -130,7 +105,6 @@ " /iommu/sbus" find-device new-device " ledma" device-name - h# 4 encode-int h# 08400010 encode-int encode+ h# 00000020 encode-int encode+ " reg" property h# 3f encode-int " burst-sizes" property external : encode-unit encode-unit-sbus ; @@ -141,7 +115,6 @@ new-device " le" device-name " network" device-type - h# 4 encode-int h# 08c00000 encode-int encode+ h# 00000004 encode-int encode+ " reg" property h# 7 encode-int " busmaster-regval" property h# 26 encode-int 0 encode-int encode+ " intr" property finish-device @@ -160,8 +133,6 @@ " hierarchical" device-type 2 encode-int " #address-cells" property 1 encode-int " #size-cells" property - h# 0 encode-int h# 0 encode-int encode+ h# 0 encode-int encode+ h# 71000000 encode-int encode+ h# 01000000 encode-int encode+ - " ranges" property external : open ( cr ." opening obio" cr) true ; : close ; Modified: openbios-devel/config/scripts/archname =================================================================== --- openbios-devel/config/scripts/archname 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/config/scripts/archname 2007-04-09 12:35:41 UTC (rev 120) @@ -9,7 +9,8 @@ ppc|powerpc|mpc107|osx|darwin) ARCH=ppc ;; esac -test "$ARCH" || ARCH=`uname -m | sed -e s/i.86/x86/ -e s/i86pc/x86/ -e s/sun4u/sparc64/ \ +test "$ARCH" || ARCH=`uname -m | sed -e s/i.86/x86/ -e s/i86pc/x86/ \ + -e s/sun4u/sparc64/ -e s/sparc$/sparc32/ \ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ -e "s/Power Macintosh/ppc/"` Modified: openbios-devel/config/scripts/crosscflags =================================================================== --- openbios-devel/config/scripts/crosscflags 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/config/scripts/crosscflags 2007-04-09 12:35:41 UTC (rev 120) @@ -3,31 +3,33 @@ host=$1 target=$2 -if test "$host" = "sparc"; then - host="sparc32" -fi - -if test "$host" = "powerpc" -o "$host" = "mips" -o "$host" = "s390" -o "$host" = "sparc32" -o "$host" = "sparc64" -o "$host" = "m68k" -o "$host" = "armv4b"; then +if test "$host" = "powerpc" -o "$host" = "mips" -o "$host" = "s390" \ + -o "$host" = "sparc32" -o "$host" = "sparc64" \ + -o "$host" = "m68k" -o "$host" = "armv4b"; then hostbigendian="yes" else hostbigendian="no" fi # host long bits test -if test "$host" = "sparc64" -o "$host" = "ia64" -o "$host" = "amd64" -o "$host" = "alpha"; then +if test "$host" = "sparc64" -o "$host" = "ia64" \ + -o "$host" = "amd64" -o "$host" = "alpha"; then hostlongbits="64" else hostlongbits="32" fi -if test "$target" = "powerpc" -o "$target" = "mips" -o "$target" = "s390" -o "$target" = "sparc32" -o "$target" = "sparc64" -o "$target" = "m68k" -o "$target" = "armv4b"; then +if test "$target" = "powerpc" -o "$target" = "mips" -o "$target" = "s390" \ + -o "$target" = "sparc32" -o "$target" = "sparc64" \ + -o "$target" = "m68k" -o "$target" = "armv4b"; then targetbigendian="yes" else targetbigendian="no" fi # target long bits test -if test "$target" = "sparc64" -o "$target" = "ia64" -o "$target" = "amd64" -o "$target" = "alpha"; then +if test "$target" = "sparc64" -o "$target" = "ia64" \ + -o "$target" = "amd64" -o "$target" = "alpha"; then targetlongbits="64" else targetlongbits="32" Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/drivers/esp.c 2007-04-09 12:35:41 UTC (rev 120) @@ -25,8 +25,8 @@ #include "asm/dma.h" #include "esp.h" -#define MACIO_ESPDMA 0x08400000 /* ESP DMA controller */ -#define MACIO_ESP 0x08800000 /* ESP SCSI */ +#define MACIO_ESPDMA 0x00400000 /* ESP DMA controller */ +#define MACIO_ESP 0x00800000 /* ESP SCSI */ #define BUFSIZE 4096 @@ -321,9 +321,10 @@ static int -espdma_init(unsigned long base, struct esp_dma *espdma) +espdma_init(unsigned int slot, unsigned long base, unsigned long offset, + struct esp_dma *espdma) { - espdma->regs = (void *)map_io(base + MACIO_ESPDMA, 0x10); + espdma->regs = (void *)map_io(base + offset + MACIO_ESPDMA, 0x10); if (espdma->regs == 0) { DPRINTF("espdma_init: cannot map registers\n"); @@ -369,9 +370,9 @@ fword("find-device"); /* set reg */ - PUSH(4); + PUSH(slot); fword("encode-int"); - PUSH(MACIO_ESPDMA); + PUSH(offset + MACIO_ESPDMA); fword("encode-int"); fword("encode+"); PUSH(0x00000010); @@ -395,18 +396,6 @@ push_str("scsi"); fword("device-type"); - /* set reg */ - PUSH(4); - fword("encode-int"); - PUSH(MACIO_ESP); - fword("encode-int"); - fword("encode+"); - PUSH(0x00000010); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); - PUSH(0x24); fword("encode-int"); PUSH(0); @@ -448,7 +437,7 @@ } int -ob_esp_init(unsigned long base) +ob_esp_init(unsigned int slot, unsigned long base, unsigned long offset) { int id, diskcount = 0, cdcount = 0, *counter_ptr; char nodebuff[256], aliasbuff[256]; @@ -464,11 +453,11 @@ global_esp = esp; - if (espdma_init(base, &esp->espdma) != 0) { + if (espdma_init(slot, base, offset, &esp->espdma) != 0) { return -1; } /* Get the IO region */ - esp->ll = (void *)map_io(base + MACIO_ESP, sizeof(struct esp_regs)); + esp->ll = (void *)map_io(base + offset + MACIO_ESP, sizeof(struct esp_regs)); if (esp->ll == 0) { DPRINTF("Can't map ESP registers\n"); return -1; @@ -501,6 +490,19 @@ REGISTER_NAMED_NODE(ob_esp, "/iommu/sbus/espdma/esp"); device_end(); + /* set reg */ + push_str("/iommu/sbus/espdma/esp"); + fword("find-device"); + PUSH(slot); + fword("encode-int"); + PUSH(offset + MACIO_ESP); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000010); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); for (id = 0; id < 8; id++) { if (!esp->sd[id].present) Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/drivers/iommu.c 2007-04-09 12:35:41 UTC (rev 120) @@ -199,7 +199,7 @@ } void -ob_init_mmu(unsigned long base) +ob_init_mmu(unsigned long bus, unsigned long base) { extern unsigned int qemu_mem_size; @@ -231,7 +231,7 @@ push_str("/virtual-memory"); fword("find-device"); - PUSH(0); + PUSH(bus); fword("encode-int"); PUSH(base); fword("encode-int"); @@ -269,6 +269,17 @@ fword("encode-int"); push_str("address"); fword("property"); + + PUSH(bus); + fword("encode-int"); + PUSH(base); + fword("encode-int"); + fword("encode+"); + PUSH(IOMMU_REGS); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/drivers/obio.c 2007-04-09 12:35:41 UTC (rev 120) @@ -285,7 +285,7 @@ } } -static char *nvram; +static unsigned char *nvram; struct qemu_nvram_v1 nv_info; void @@ -306,6 +306,39 @@ return NVRAM_SIZE; } +struct cpudef { + const unsigned char *name; + unsigned long iu_version; +}; + +static const struct cpudef sparc_defs[] = { + { + .name = "FMI,MB86904", + .iu_version = 0x04 << 24, /* Impl 0, ver 4 */ + }, + { + .name = "TI,TMS390Z55", + .iu_version = 0x40000000, + }, +}; + +static const char * +id_cpu(void) +{ + unsigned long iu_version; + unsigned int i; + + asm("rd %%psr, %0\n" + : "=r"(iu_version) :); + iu_version &= 0xff000000; + + for (i = 0; i < sizeof(sparc_defs)/sizeof(struct cpudef); i++) { + if (iu_version == sparc_defs[i].iu_version) + return sparc_defs[i].name; + } + return "CPU,Unknown"; +} + static void ob_nvram_init(unsigned long base, unsigned long offset) { @@ -317,10 +350,11 @@ extern char obp_stdin, obp_stdout; extern const char *obp_stdin_path, *obp_stdout_path; - const char *stdin, *stdout; + const char *stdin, *stdout, *cpuname; unsigned int i; char nographic; uint32_t size; + unsigned int machine_id; ob_new_obio_device("eeprom", NULL); @@ -332,12 +366,14 @@ fword("property"); memcpy(&nv_info, nvram, sizeof(nv_info)); - - printk("Nvram id %s, version %d\n", nv_info.id_string, nv_info.version); + machine_id = (unsigned int)nvram[0x1fd9] & 0xff; + printk("Nvram id %s, version %d, machine id 0x%2.2x\n", nv_info.id_string, + nv_info.version, machine_id); if (strcmp(nv_info.id_string, "QEMU_BIOS") || nv_info.version != 1) { printk("Unknown nvram, freezing!\n"); for (;;); } + kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; size = nv_info.cmdline_size; @@ -366,6 +402,33 @@ push_str("idprom"); fword("property"); + switch (machine_id) { + case 0x72: + push_str("SPARCstation 10 (1 X 390Z55)"); + push_str("banner-name"); + fword("property"); + push_str("SUNW,S10,501-2365"); + push_str("model"); + fword("property"); + push_str("SUNW,SPARCstation-10"); + push_str("name"); + fword("property"); + break; + case 0x80: + push_str("SPARCstation 5"); + push_str("name"); + fword("property"); + push_str("SUNW,501-3059"); + push_str("model"); + fword("property"); + push_str("SUNW,SPARCstation-5"); + push_str("name"); + fword("property"); + break; + default: + printk("Unknown machine, freezing!\n"); + for (;;); + } // Add cpus printk("CPUs: %x\n", nv_info.smp_cpus); for (i = 0; i < (unsigned int)nv_info.smp_cpus; i++) { @@ -373,8 +436,9 @@ fword("find-device"); fword("new-device"); - - push_str("FMI,MB86904"); + + cpuname = id_cpu(); + push_str(cpuname); fword("device-name"); push_str("cpu"); @@ -713,7 +777,7 @@ } static void -ob_set_obio_ranges(unsigned long base) +ob_set_obio_ranges(unsigned long high, unsigned long base) { push_str("/obio"); fword("find-device"); @@ -722,7 +786,7 @@ PUSH(0); fword("encode-int"); fword("encode+"); - PUSH(0); + PUSH(high); fword("encode-int"); fword("encode+"); PUSH(base); @@ -758,7 +822,9 @@ int -ob_obio_init(unsigned long slavio_base) +ob_obio_init(unsigned long slavio_high, unsigned long slavio_base, + unsigned long fd_offset, unsigned long counter_offset, + unsigned long intr_offset) { // All devices were integrated to NCR89C105, see @@ -768,8 +834,8 @@ #if 0 // XXX REGISTER_NAMED_NODE(ob_obio, "/obio"); device_end(); - ob_set_obio_ranges(slavio_base); #endif + ob_set_obio_ranges(slavio_high, slavio_base); // Zilog Z8530 serial ports, see http://www.zilog.com // Must be before zs@0,0 or Linux won't boot @@ -781,7 +847,7 @@ ob_nvram_init(slavio_base, SLAVIO_NVRAM); // 82078 FDC - ob_fd_init(slavio_base, SLAVIO_FD, FD_INTR); + ob_fd_init(slavio_base, fd_offset, FD_INTR); ob_sconfig_init(slavio_base, SLAVIO_SCONFIG); @@ -789,9 +855,9 @@ ob_power_init(slavio_base, SLAVIO_POWER, POWER_INTR); - ob_counter_init(slavio_base, SLAVIO_COUNTER); + ob_counter_init(slavio_base, counter_offset); - ob_interrupt_init(slavio_base, SLAVIO_INTERRUPT); + ob_interrupt_init(slavio_base, intr_offset); return 0; } Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/drivers/sbus.c 2007-04-09 12:35:41 UTC (rev 120) @@ -19,17 +19,17 @@ #include "openbios/drivers.h" #define SBUS_REGS 0x28 -#define SBUS_SLOTS 5 +#define SBUS_SLOTS 16 static void -ob_sbus_node_init(unsigned long base) +ob_sbus_node_init(unsigned long bus, unsigned long base) { void *regs; push_str("/iommu/sbus"); fword("find-device"); - PUSH(0); + PUSH(bus); fword("encode-int"); PUSH(base); fword("encode-int"); @@ -48,19 +48,188 @@ } static void -ob_macio_init(unsigned int slot, unsigned long base) +ob_le_init(unsigned int slot, unsigned long base, unsigned long offset) { + push_str("/iommu/sbus/ledma"); + fword("find-device"); + PUSH(slot); + fword("encode-int"); + PUSH(offset + 0x00400010); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000020); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + push_str("/iommu/sbus/ledma/le"); + fword("find-device"); + PUSH(slot); + fword("encode-int"); + PUSH(offset + 0x00c00000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000004); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); +} + +static void +ob_tcx_init(unsigned int slot, unsigned long base) +{ + push_str("/iommu/sbus/SUNW,tcx"); + fword("find-device"); + + PUSH(slot); + fword("encode-int"); + PUSH(0x00800000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00100000); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x02000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000001); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x04000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000001); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x06000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00800000); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x0a000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000001); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x0c000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000001); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x0e000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000001); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x00700000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00001000); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x00200000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000004); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x00300000); + fword("encode-int"); + fword("encode+"); + PUSH(0x0000081c); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00010000); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x00240000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000004); + fword("encode-int"); + fword("encode+"); + + PUSH(slot); + fword("encode-int"); + fword("encode+"); + PUSH(0x00280000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000001); + fword("encode-int"); + fword("encode+"); + + push_str("reg"); + fword("property"); +} + +static void +ob_macio_init(unsigned int slot, unsigned long base, unsigned long offset) +{ // All devices were integrated to NCR89C100, see // http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR89C100.t… // NCR 53c9x, aka ESP. See // http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR53C9X.txt #ifdef CONFIG_DRIVER_ESP - ob_esp_init(base); + ob_esp_init(slot, base, offset); #endif // NCR 92C990, Am7990, Lance. See http://www.amd.com - //ob_le_init(base); + ob_le_init(slot, base, offset); // Parallel port //ob_bpp_init(base); @@ -70,18 +239,18 @@ } static void -sbus_probe_slot(unsigned int slot, unsigned long base) +sbus_probe_slot_ss5(unsigned int slot, unsigned long base) { // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { - case 2: // SUNW,tcx - //ob_tcx_init(slot, base); + case 3: // SUNW,tcx + ob_tcx_init(slot, base); break; - case 3: // SUNW,CS4231 + case 4: // SUNW,CS4231 //ob_cs4231_init(slot, base); break; - case 4: // MACIO: le, esp, bpp, power-management - ob_macio_init(slot, base); + case 5: // MACIO: le, esp, bpp, power-management + ob_macio_init(slot, base, 0x08000000); break; default: break; @@ -89,6 +258,22 @@ } static void +sbus_probe_slot_ss10(unsigned int slot, unsigned long base) +{ + // OpenBIOS and Qemu don't know how to do Sbus probing + switch(slot) { + case 2: // SUNW,tcx + ob_tcx_init(slot, base); + break; + case 0xf: // le, esp, bpp, power-management + ob_macio_init(slot, base, 0); + break; + default: + break; + } +} + +static void ob_sbus_open(int *idx) { int ret=1; @@ -113,23 +298,100 @@ { "close", ob_sbus_close }, }; -static const unsigned long sbus_offset[SBUS_SLOTS] = { - 0x30000000, - 0x40000000, - 0x50000000, - 0x60000000, - 0x70000000, +static const unsigned long sbus_offsets_ss5[SBUS_SLOTS][5] = { + { 0, 0, 0x0, 0x20000000, 0x10000000,}, + { 1, 0, 0x0, 0x30000000, 0x10000000,}, + { 2, 0, 0x0, 0x40000000, 0x10000000,}, + { 3, 0, 0x0, 0x50000000, 0x10000000,}, + { 4, 0, 0x0, 0x60000000, 0x10000000,}, + { 5, 0, 0x0, 0x70000000, 0x10000000,}, }; -int ob_sbus_init(unsigned long base) +static const unsigned long sbus_offsets_ss10[SBUS_SLOTS][5] = { + { 0, 0, 0xe, 0x00000000, 0x10000000,}, + { 1, 0, 0xe, 0x10000000, 0x10000000,}, + { 2, 0, 0xe, 0x20000000, 0x10000000,}, + { 3, 0, 0xe, 0x30000000, 0x10000000,}, + [0xf] = { 0xf, 0, 0xe, 0xf0000000, 0x10000000,}, +}; + +static void +ob_add_sbus_range(const unsigned long *range, int notfirst) { + if (!notfirst) { + push_str("/iommu/sbus"); + fword("find-device"); + } + PUSH(range[0]); + fword("encode-int"); + if (notfirst) + fword("encode+"); + PUSH(range[1]); + fword("encode-int"); + fword("encode+"); + PUSH(range[2]); + fword("encode-int"); + fword("encode+"); + PUSH(range[3]); + fword("encode-int"); + fword("encode+"); + PUSH(range[4]); + fword("encode-int"); + fword("encode+"); +} + +static int +ob_sbus_init_ss5(unsigned long bus, unsigned long base) +{ unsigned int slot; + int notfirst = 0; - ob_sbus_node_init(base); + for (slot = 0; slot < SBUS_SLOTS; slot++) { + if (sbus_offsets_ss5[slot][4] > 0) + ob_add_sbus_range(sbus_offsets_ss5[slot], notfirst++); + } + push_str("ranges"); + fword("property"); for (slot = 0; slot < SBUS_SLOTS; slot++) { - sbus_probe_slot(slot, sbus_offset[slot]); + if (sbus_offsets_ss5[slot][4] > 0) + sbus_probe_slot_ss5(slot, sbus_offsets_ss5[slot][3]); } return 0; } + +static int +ob_sbus_init_ss10(unsigned long bus, unsigned long base) +{ + unsigned int slot; + int notfirst = 0; + + for (slot = 0; slot < SBUS_SLOTS; slot++) { + if (sbus_offsets_ss10[slot][4] > 0) + ob_add_sbus_range(sbus_offsets_ss10[slot], notfirst++); + } + push_str("ranges"); + fword("property"); + + for (slot = 0; slot < SBUS_SLOTS; slot++) { + if (sbus_offsets_ss10[slot][4] > 0) + sbus_probe_slot_ss10(slot, sbus_offsets_ss10[slot][3]); + } + + return 0; +} + +int ob_sbus_init(unsigned long bus, unsigned long base, int machine_id) +{ + ob_sbus_node_init(bus, base); + + switch (machine_id) { + case 0x72: + return ob_sbus_init_ss10(bus, base); + case 0x80: + return ob_sbus_init_ss5(bus, base); + default: + return -1; + } +} Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/include/openbios/drivers.h 2007-04-09 12:35:41 UTC (rev 120) @@ -15,15 +15,17 @@ int ob_pci_init(void); #endif #ifdef CONFIG_DRIVER_SBUS -int ob_sbus_init(unsigned long base); +int ob_sbus_init(unsigned long bus, unsigned long base, int machine_id); #endif #ifdef CONFIG_DRIVER_IDE int ob_ide_init(void); #endif #ifdef CONFIG_DRIVER_ESP -int ob_esp_init(unsigned long base); +int ob_esp_init(unsigned int slot, unsigned long base, unsigned long offset); #endif #ifdef CONFIG_DRIVER_OBIO -int ob_obio_init(unsigned long slavio_base); +int ob_obio_init(unsigned long slavio_high, unsigned long slavio_base, + unsigned long fd_offset, unsigned long counter_offset, + unsigned long intr_offset); #endif Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2007-04-09 12:19:41 UTC (rev 119) +++ openbios-devel/include/sparc32/io.h 2007-04-09 12:35:41 UTC (rev 120) @@ -38,7 +38,7 @@ void *mem_zalloc(struct mem *t, int size, int align); int map_page(unsigned long va, unsigned long epa, int type); void *map_io(unsigned pa, int size); -void ob_init_mmu(unsigned long base); +void ob_init_mmu(unsigned long bus, unsigned long base); void init_mmu_swift(unsigned long base); void *dvma_alloc(int size, unsigned int *pphys);

1 0

Re: [OpenBIOS] r117 - openbios-devel/drivers
by Blue Swirl 09 Apr '07

09 Apr '07

> > if (size > OBIO_CMDLINE_MAX) size = OBIO_CMDLINE_MAX; > > memcpy(obio_cmdline, nv_info.cmdline, size); > > - obio_cmdline[size-1] = '\0'; > > + obio_cmdline[size] = '\0'; > >Looks like you need to change the declaration of >"obio_cmdline[]" or the maximum value "size" is >clamped to, as well? Good point. The attached untested patch should fix the overflow possibility. _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

2 1

r119 - openbios-devel/drivers
by svn＠openbios.org 09 Apr '07

09 Apr '07

Author: stepan Date: 2007-04-09 14:19:41 +0200 (Mon, 09 Apr 2007) New Revision: 119 Modified: openbios-devel/drivers/obio.c Log: fix from blueswirl Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-04-09 12:17:51 UTC (rev 118) +++ openbios-devel/drivers/obio.c 2007-04-09 12:19:41 UTC (rev 119) @@ -341,7 +341,8 @@ kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; size = nv_info.cmdline_size; - if (size > OBIO_CMDLINE_MAX) size = OBIO_CMDLINE_MAX; + if (size > OBIO_CMDLINE_MAX - 1) + size = OBIO_CMDLINE_MAX - 1; memcpy(obio_cmdline, nv_info.cmdline, size); obio_cmdline[size] = '\0'; cmdline = obio_cmdline;

1 0

[Patch] to fix XSLT build issue
by Alex Owen 09 Apr '07

09 Apr '07

Hi I was having a problem compiling openbios on the lastest debian release. I thought it may have been a problem with the xsltproc version in debian... however the debian maintainer Mike Hommey tells me that the issue is in the openbios code. He has generated a patch which I am forwarding (attached) which he tells me fixes the openbios XSLT. Regards Alex Owen ---------- Forwarded message ---------- From: Mike Hommey <mh(a)glandium.org> Date: 08-Apr-2007 17:02 Subject: Re: Bug#401337: test case for error "Unexpected XSLT element 'param'" To: Alex Owen <r.alex.owen(a)gmail.com>, 401337-done(a)bugs.debian.org Cc: Nicolas Haller <nicolas(a)boiteameuh.org> On Fri, Feb 23, 2007 at 09:32:48PM +0000, Alex Owen <r.alex.owen(a)gmail.com> wrote: > Sorry missed a line: > > >mkdir /var/tmp/testcase > >cd /var/tmp/testcase > >svn co svn://openbios.org/openbios/openbios-devel -r 113 > >cd openbios-devel > config/scripts/switch-arch x86 > >make xml > >###output starts### > >Cleaning up... ok > >Initializing build tree...ok. > >Creating target Makefile...warning: failed to load external entity > >"rules.xml" > >runtime error: file config/xml/dictionary.xsl line 13 element param > >Unexpected XSLT element 'param'. > >runtime error: file config/xml/dictionary.xsl line 22 element if > >Variable 'conditions' has not been declared. > >make: *** [xml] Error 10 > >###output ends### Okay, I have been able to reproduce the bug... and it's not a bug. The reason why it didn't fail before is that previous versions of libxslt were lax on xsl:param. You are using xsl:param where xsl:variable is to be used. xsl:param can only be top-level or a direct child of an xsl:template. Attached here is a diff to fix openbios-devel's xsl stylesheet. With this patch applied, it works with xsltproc from etch. Mike

2 1

r118 - openbios-devel/config/xml
by svn＠openbios.org 09 Apr '07

09 Apr '07

Author: stepan Date: 2007-04-09 14:17:51 +0200 (Mon, 09 Apr 2007) New Revision: 118 Modified: openbios-devel/config/xml/dictionary.xsl openbios-devel/config/xml/object.xsl openbios-devel/config/xml/util.xsl Log: fixes for xslt sheets from Mike Hommey <mh(a)glandium.org>, reported by Alex Owen <r.alex.owen(a)gmail.com> Modified: openbios-devel/config/xml/dictionary.xsl =================================================================== --- openbios-devel/config/xml/dictionary.xsl 2007-04-07 09:37:28 UTC (rev 117) +++ openbios-devel/config/xml/dictionary.xsl 2007-04-09 12:17:51 UTC (rev 118) @@ -10,14 +10,14 @@ <xsl:for-each select="//dictionary"> <xsl:sort select="@name"/> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions = 0"> @@ -31,26 +31,26 @@  <xsl:for-each select="//dictionary/object"> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> - <xsl:param name="dictname"> + <xsl:variable name="dictname"> <xsl:value-of select="parent::*/@name"/> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> @@ -68,22 +68,22 @@ <xsl:for-each select="//dictionary"> <xsl:sort select="@name"/> - <xsl:param name="outer-conditions"> + <xsl:variable name="outer-conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$outer-conditions = 0"> <xsl:if test="not(preceding::dictionary/@name = @name)"> - <xsl:param name="name"><xsl:value-of select="@name"/></xsl:param> - <xsl:param name="init"> + <xsl:variable name="name"><xsl:value-of select="@name"/></xsl:variable> + <xsl:variable name="init"> <xsl:value-of select="(//dictionary[@name=$name]/attribute::init)[last()]"/> - </xsl:param> + </xsl:variable>  <xsl:text>$(ODIR)/</xsl:text> <xsl:value-of select="@name"/><xsl:text>.dict: $(</xsl:text> @@ -97,22 +97,22 @@ <xsl:text>	$(ODIR)/forthstrap</xsl:text> <xsl:for-each select="//dictionary[@name = @name]"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions = 0"> <xsl:text> -I</xsl:text> @@ -139,14 +139,14 @@ <xsl:for-each select="//dictionary"> <xsl:sort select="@name"/> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions = 0"> Modified: openbios-devel/config/xml/object.xsl =================================================================== --- openbios-devel/config/xml/object.xsl 2007-04-07 09:37:28 UTC (rev 117) +++ openbios-devel/config/xml/object.xsl 2007-04-09 12:17:51 UTC (rev 118) @@ -24,22 +24,22 @@  <xsl:for-each select="//object[(ancestor-or-self::*)[@target = $target]]"> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> @@ -78,14 +78,14 @@  <xsl:for-each select="//executable"> - <xsl:param name="outer-conditions"> + <xsl:variable name="outer-conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$outer-conditions = 0"> <xsl:if test="(ancestor-or-self::*)[@target = $target]"> @@ -98,24 +98,24 @@  <xsl:for-each select="object"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:text> $(ODIR)/</xsl:text> <xsl:value-of select="$target"/> @@ -130,14 +130,14 @@  <xsl:for-each select="external-object"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:text> $(ODIR)/</xsl:text> @@ -166,14 +166,14 @@ <xsl:for-each select="//library"> <xsl:sort select="@name"/> - <xsl:param name="outer-conditions"> + <xsl:variable name="outer-conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$outer-conditions = 0"> @@ -196,29 +196,29 @@ </xsl:choose> <xsl:text>: </xsl:text> - <xsl:param name="name"><xsl:value-of select="@name"/></xsl:param> + <xsl:variable name="name"><xsl:value-of select="@name"/></xsl:variable>  <xsl:for-each select="//library[@name=$name]/object"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> - <xsl:param name="path"> + <xsl:variable name="path"> <xsl:for-each select="ancestor::build"> <xsl:call-template name="get-dirname"> <xsl:with-param select="@base" name="path"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:text>$(ODIR)/</xsl:text> <xsl:value-of select="$target"/> @@ -234,14 +234,14 @@  <xsl:for-each select="external-object"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:text> $(ODIR)/</xsl:text> @@ -267,14 +267,14 @@ <xsl:for-each select="//library"> <xsl:if test="object[(ancestor-or-self::*)[@target = $target]]"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:text> $(ODIR)/</xsl:text> <xsl:text>lib</xsl:text> @@ -300,14 +300,14 @@ <xsl:for-each select="//executable"> <xsl:if test="(ancestor-or-self::*)[@target = $target]"> - <xsl:param name="conditions"> + <xsl:variable name="conditions"> <xsl:text>0</xsl:text> <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> <xsl:call-template name="resolve-condition"> <xsl:with-param select="@condition" name="expression"/> </xsl:call-template> </xsl:for-each> - </xsl:param> + </xsl:variable> <xsl:if test="$conditions=0"> <xsl:text> $(ODIR)/</xsl:text> <xsl:value-of select="@name"/> Modified: openbios-devel/config/xml/util.xsl =================================================================== --- openbios-devel/config/xml/util.xsl 2007-04-07 09:37:28 UTC (rev 117) +++ openbios-devel/config/xml/util.xsl 2007-04-09 12:17:51 UTC (rev 118) @@ -44,8 +44,8 @@ <xsl:choose> <xsl:when test="$expression!=''"> - <xsl:param name="value"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::value"/></xsl:param> - <xsl:param name="type"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::type"/></xsl:param> + <xsl:variable name="value"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::value"/></xsl:variable> + <xsl:variable name="type"><xsl:value-of select="document('../../config.xml')//option[@name=$confexpr]/attribute::type"/></xsl:variable> <xsl:choose> <xsl:when test="$type='boolean'"> <xsl:choose>

1 0

Re: [OpenBIOS] r117 - openbios-devel/drivers
by Segher Boessenkool 07 Apr '07

07 Apr '07

> if (size > OBIO_CMDLINE_MAX) size = OBIO_CMDLINE_MAX; > memcpy(obio_cmdline, nv_info.cmdline, size); > - obio_cmdline[size-1] = '\0'; > + obio_cmdline[size] = '\0'; Looks like you need to change the declaration of "obio_cmdline[]" or the maximum value "size" is clamped to, as well? Segher

1 0

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

07 Apr '07

Author: stepan Date: 2007-04-07 11:37:28 +0200 (Sat, 07 Apr 2007) New Revision: 117 Modified: openbios-devel/drivers/obio.c Log: boot fix from blueswirl. Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-03-23 17:00:01 UTC (rev 116) +++ openbios-devel/drivers/obio.c 2007-04-07 09:37:28 UTC (rev 117) @@ -340,11 +340,10 @@ } kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; - - size = cmdline_size; + size = nv_info.cmdline_size; if (size > OBIO_CMDLINE_MAX) size = OBIO_CMDLINE_MAX; memcpy(obio_cmdline, nv_info.cmdline, size); - obio_cmdline[size-1] = '\0'; + obio_cmdline[size] = '\0'; cmdline = obio_cmdline; cmdline_size = size;

1 0

OpenBIOS Sparc32 boot fix
by Blue Swirl 07 Apr '07

07 Apr '07

Hi, Current version can't boot the test images from Qemu, because the command line is truncated. Boot is fixed with the attached patch, please apply. _________________________________________________________________ FREE pop-up blocking with the new MSN Toolbar - get it now! http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/

1 0

Re: [OpenBIOS] r116 - openbios-devel/config/scripts
by Segher Boessenkool 24 Mar '07

24 Mar '07

> -if test "$host" = "sparc64" -o "$host" = "ia64" -o "$host" = "x86_64" > -o "$host" = "alpha"; then > +if test "$host" = "sparc64" -o "$host" = "ia64" -o "$host" = "amd64" > -o "$host" = "alpha"; then Do all hosts say this now? Shouldn't you keep x86_64 as well (at least for a while)? Segher

3 2

r116 - openbios-devel/config/scripts
by svn＠openbios.org 23 Mar '07

23 Mar '07

Author: stepan Date: 2007-03-23 18:00:01 +0100 (Fri, 23 Mar 2007) New Revision: 116 Modified: openbios-devel/config/scripts/crosscflags Log: small fix for width detection Modified: openbios-devel/config/scripts/crosscflags =================================================================== --- openbios-devel/config/scripts/crosscflags 2007-03-23 16:26:44 UTC (rev 115) +++ openbios-devel/config/scripts/crosscflags 2007-03-23 17:00:01 UTC (rev 116) @@ -14,7 +14,7 @@ fi # host long bits test -if test "$host" = "sparc64" -o "$host" = "ia64" -o "$host" = "x86_64" -o "$host" = "alpha"; then +if test "$host" = "sparc64" -o "$host" = "ia64" -o "$host" = "amd64" -o "$host" = "alpha"; then hostlongbits="64" else hostlongbits="32" @@ -27,7 +27,7 @@ fi # target long bits test -if test "$target" = "sparc64" -o "$target" = "ia64" -o "$target" = "x86_64" -o "$target" = "alpha"; then +if test "$target" = "sparc64" -o "$target" = "ia64" -o "$target" = "amd64" -o "$target" = "alpha"; then targetlongbits="64" else targetlongbits="32"

1 0

r115 - /
by svn＠openbios.org 23 Mar '07

23 Mar '07

Author: stepan Date: 2007-03-23 17:26:44 +0100 (Fri, 23 Mar 2007) New Revision: 115 Removed: openbios-website/ Log: drop svn based web site, it has been replaced by a wiki since a long time now.

1 0

Openbios crashes 2
by Jason Hooper 21 Mar '07

21 Mar '07

Hi all, Obviously my last post was not clear enough. I have extracted and compiled the tar of the previous version in SVN, which is reported as directory revision 87. I can successfully boot the Debian install iso and the Solaris install iso starts booting but crashes later, as expected. However, if I extract and build the latest version, reported as directory revision 114, it crashes straight away. The exact error reported is "Floating point exception". This is all on linux 2.6.9. If I remove the latest patches to obio.c, and then try and boot, I then get "Unsupported image format". If I remove the latest patches to esp.c, everything seems to be as it used to be. Hope this is of some help. Regards, _________________________________________________________________ Solve the Conspiracy and win fantastic prizes. http://www.theconspiracygame.co.uk/

2 1

Latest OpenBios crashes...
by Jason Hooper 18 Mar '07

18 Mar '07

Hi all, I have downloaded and built the latest tar.gz file from the repository. It crashes trying to boot either a Solaris or Linux cdrom with a floating point exception. Is anybody else getting this or is it only me? Regards, _________________________________________________________________ MSN Hotmail is evolving - check out the new Windows Live Mail http://ideas.live.co.uk

2 1

Sun OBP bugs in 1.0RC1
by Peter 16 Mar '07

16 Mar '07

I've been trying to get old versions of SunOS to load under qemu. In doing so, I've encountered a number of bugs in OBP. I'm not always certain of the best fix, but I can at least provide a quick hack that will get people farther along. 1) Error message: "kmem_alloc failed, nbytes 680" Bug: obp_dumb_memalloc is a bit too dumb. It needs to pick an address if passed a null address. (According to the comment in the allocator in OpenSolaris prom_alloc.c (see <http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/psm/promif/ie…>), "If virthint is zero, a suitable virt is chosen.") Quick fix: If passed a null address, start doling out addresses at 10MB and increment by size. Shortcomings: The quick fix ignores the issue of free() and doesn't remove memory from the virtual-memory/available node. After the quick fix, the boot gets farther, leading us to: 2) Error message: "Unhandled Exception 0x00000080" Bug: Trap 0 (entry 0x80 in the table, i.e. syscall_trap_4x) is undefined. This is because the SunOS bootloader installs the trap by writing code in the trap table, but the trap table is in the .text section of OpenBIOS. Thus the trap 0 handler simply jumps to "bug". Quick fix: Move the trap table to the .data section. Insert a "b entry; nop; nop; nop;" before "bug:". Shortcomings: Requires the extra "b entry" code. Allows the only VM copy of the trap table to be permanently changed. OpenBIOS should copy the read-only trap table to read-write memory (and update %tbr) upon reset/entry. 3) #2 above actually exposes another bug. The write to the read-only trap table does not cause an access violation -- instead, it silently fails. The "std" instruction at 0x403e6c in the bootloader has no effect. Bug: Uncertain. It could be a systemic bug in qemu, but it appears that the VM's MMU believes that the page is writable. That means that the VM's MMU is not having the access protection flags set for pages mapped to ROM. It thinks everything is rwx. Fix?: The VM's MMU should have the access protection flags properly set for each ROM section. This should probably be done within OpenBIOS. E.g., .text should be r-x, .data should probably be rwx, etc. This is the one fix I'm really not sure how to implement. Any suggestions? This may be a problem that only affects this bootloader, so fixing #2 above may be all that's strictly necessary. But I'm not positive that this bug doesn't have other ill effects I haven't found yet. At any rate, fixing #2 gets us still further, to: 4) Error messages: "obp_devopen(sd(0,0,0):d) = 0xffd8e270 obp_inst2pkg(fd 0xffd8e270) = 0xffd57f44 obp_getprop(0xffd57f44, device_type) (not found)" Bug: The OpenBIOS "interpose" implementation is not transparent to non-interposition-aware code (in violation of the interposition spec). The inst2pkg call in this sequence returns the phandle for /packages/misc-files, instead of the proper phandle. Quick fix: Comment out the "interpose disk-label" lines in ob_sd_open. Shortcomings: It disables disk-label. The correct fix is to fix the underlying problem with interposition, but I'm not sure exactly what it is. Could someone help? Fixing #4 gets us quite a bit further, until: 5) Error message: "Unhandled Exception 0x00000009 PC = 0xf0138b20 NPC = 0xf0138b24 Stopping execution" Bug: The instruction is trying to read from 0xfd020000+4, which is an invalid address. This address isn't mapped by OBP by default on Sun hardware, so the bootloader must be trying to (a) map this address and failing silently or (b) skipping the mapping for some reason. The instruction is hard-coded to look at this absolute address. Fix: Unknown. This may be another instance of writes silently failing, hence my interest in #3 above. It could also be a side-effect of the quick fix for #4. I'm happy to work further on these fixes and put them into patch form. Could someone point me to how I'd do that?

4 10

x86 ISA binding for open firmware
by (अमेय) Ameya ( पाळंदे) Palande 15 Mar '07

15 Mar '07

Hi, I am not able to locate x86 open firmware isa specific supplements. Can any one give me information about this ? I want information about client execution environment on x86. Thank you. Regards, Ameya.

3 3

problem in running ofclient
by (अमेय) Ameya ( पाळंदे) Palande 15 Mar '07

15 Mar '07

Hi, I am trying to run ofclient on x86. I started openbios from GRUB. But its not working, I can't see Hello World message. :( Can any one tell me how openbios passes client_interface_handler to client program ? Thank you, Regards, Ameya.

2 1

Re: [OpenBIOS] Sun OBP bugs in 1.0RC1
by Peter 09 Mar '07

09 Mar '07

On 3/8/07, Stefan Reinauer <stepan(a)coresystems.de> wrote: > So what's the correct thing to do, inst2pkg is supposed to return the > phandle to sd, even though the device was interposed? That's correct. The interposition spec <http://www.openbios.org/data/docs/rec.intpos.d02.pdf> says that interpose should be "invisible" to interpose-unaware (e.g., IEEE1275 or existing) clients. The SunOS boot loader doesn't know about interpose, and so expects ihandle>phandle to return the phandle to sd. It looks like the specified way to query for interposed packages is via "instance-to-interposed-path", whereas the previously specified "instance-to-path" omits any reference to interposed packages for backwards compatibility.

1 0

r114 - in openbios-devel: arch/sparc32 drivers include/sparc32
by svn＠openbios.org 09 Mar '07

09 Mar '07

Author: stepan Date: 2007-03-09 01:59:05 +0100 (Fri, 09 Mar 2007) New Revision: 114 Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/romvec.c openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/obio.c openbios-devel/include/sparc32/io.h Log: Patch for SunOS compatibility from pjcreath+openbios(a)gmail.com: I've been trying to get old versions of SunOS to load under qemu. In doing so, I've encountered a number of bugs in OBP. I'm not always certain of the best fix, but I can at least provide a quick hack that will get people farther along. 1) Error message: "kmem_alloc failed, nbytes 680" Bug: obp_dumb_memalloc is a bit too dumb. It needs to pick an address if passed a null address. (According to the comment in the allocator in OpenSolaris prom_alloc.c (see <http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/psm/promif/ie…>), "If virthint is zero, a suitable virt is chosen.") Quick fix: If passed a null address, start doling out addresses at 10MB and increment by size. Shortcomings: The quick fix ignores the issue of free() and doesn't remove memory from the virtual-memory/available node. After the quick fix, the boot gets farther, leading us to: 2) Error message: "Unhandled Exception 0x00000080" Bug: Trap 0 (entry 0x80 in the table, i.e. syscall_trap_4x) is undefined. This is because the SunOS bootloader installs the trap by writing code in the trap table, but the trap table is in the .text section of OpenBIOS. Thus the trap 0 handler simply jumps to "bug". Quick fix: Move the trap table to the .data section. Insert a "b entry; nop; nop; nop;" before "bug:". Shortcomings: Requires the extra "b entry" code. Allows the only VM copy of the trap table to be permanently changed. OpenBIOS should copy the read-only trap table to read-write memory (and update %tbr) upon reset/entry. 3) #2 above actually exposes another bug. The write to the read-only trap table does not cause an access violation -- instead, it silently fails. The "std" instruction at 0x403e6c in the bootloader has no effect. Bug: Uncertain. It could be a systemic bug in qemu, but it appears that the VM's MMU believes that the page is writable. That means that the VM's MMU is not having the access protection flags set for pages mapped to ROM. It thinks everything is rwx. Fix?: The VM's MMU should have the access protection flags properly set for each ROM section. This should probably be done within OpenBIOS. E.g., .text should be r-x, .data should probably be rwx, etc. This is the one fix I'm really not sure how to implement. Any suggestions? This may be a problem that only affects this bootloader, so fixing #2 above may be all that's strictly necessary. But I'm not positive that this bug doesn't have other ill effects I haven't found yet. At any rate, fixing #2 gets us still further, to: 4) Error messages: "obp_devopen(sd(0,0,0):d) = 0xffd8e270 obp_inst2pkg(fd 0xffd8e270) = 0xffd57f44 obp_getprop(0xffd57f44, device_type) (not found)" Bug: The OpenBIOS "interpose" implementation is not transparent to non-interposition-aware code (in violation of the interposition spec). The inst2pkg call in this sequence returns the phandle for /packages/misc-files, instead of the proper phandle. Quick fix: Comment out the "interpose disk-label" lines in ob_sd_open. Shortcomings: It disables disk-label. The correct fix is to fix the underlying problem with interposition, but I'm not sure exactly what it is. Could someone help? Fixing #4 gets us quite a bit further, until: 5) Error message: "Unhandled Exception 0x00000009 PC = 0xf0138b20 NPC = 0xf0138b24 Stopping execution" Bug: The instruction is trying to read from 0xfd020000+4, which is an invalid address. This address isn't mapped by OBP by default on Sun hardware, so the bootloader must be trying to (a) map this address and failing silently or (b) skipping the mapping for some reason. The instruction is hard-coded to look at this absolute address. Fix: Unknown. This may be another instance of writes silently failing, hence my interest in #3 above. It could also be a side-effect of the quick fix for #4. 6) Error message: "BAD TRAP: cpu=0 type=9 rp=fd008f0c addr=feff8008 mmu_fsr=3a6 rw=2 MMU sfsr=3a6: Invalid Address on supv data store at level 3 regs at fd008f0c: psr=4400fc7 pc=f00053f4 npc=f00053f8 ..." Bug: Real sun4m hardware registers 4 CPU-specific interrupts followed by a system-wide interrupt, regardless of the number of CPUs installed. The same is true of counters. SunOS looks at the 5th interrupt for the system-wide interrupt. OBP, since there's only one CPU, just sets up one CPU-specific interrupt followed by the system-wide interrupt, so there is no 5th interrupt. See the comment on "NCPU" at <http://stuff.mit.edu/afs/athena/astaff/project/opssrc/sys.sunos/sun4m/devad…>. Fix: in obp_interrupt_init() and obp_counter_init() register 4 CPU-specific interrupts before allocating the system-wide interrupt. The kernel will then map the 5th interrupt to the system-wide interrupt. 7) Error message: "BAD TRAP: cpu=0 type=9 rp=fd008d8c addr=7ff000 mmu_fsr=126 rw=1 MMU sfsr=126: Invalid Address on supv data fetch at level 1 regs at fd008d8c: psr=4000cc4 pc=f01339a4 npc=f01339a8 ..." Bug: The command-line arguments passed to the kernel are fixed at address 0x7FF000 (CMDLINE_ADDR, passed from qemu via nv_info.cmdline), which is no longer mapped by the time the kernel looks at the boot arguments. A regular Sun boot ROM will copy this into mapped memory. Fix: Copy the string in nv_info.cmdline to a OpenBIOS global (since OpenBIOS continues to be mapped) in ob_nvram_init(). 8) Error message: "BAD TRAP: cpu=0 type=9 rp=fd008dec addr=1019000 mmu_fsr=126 rw=1 MMU sfsr=126: Invalid Address on supv data fetch at level 1 regs at fd008dec: psr=4400cc5 pc=f0131680 npc=f0131684 ..." Bug: The dumb memory allocator from bug #1 was allocating a range that the SunOS 4 kernel doesn't like. Fix: Mimic the Sun boot ROM allocator: the top of the heap should be a 0xFFEDA000 and allocations should return descending addresses. So, for example, if asking for 0x1000 bytes, the first returned pointer should be 0xFFED9000. 9) Error message: "BAD TRAP: cpu=0 type=9 rp=fd008d2c addr=b1b91000 mmu_fsr=126 rw=1 MMU sfsr=126: Invalid Address on supv data fetch at level 1 regs at fd008d2c: psr=4900cc3 pc=f0142c04 npc=f0142c08 ..." Bug: The precise underlying cause isn't clear. The bug appears due to a variation between OBP's behavior and stock Sun behavior. Fix: Add the "cache-physical?" property to the CPU node in ob_nvram_init() and bump the "mmu-nctx" property up to 4096 (from 256). Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2006-10-30 23:06:43 UTC (rev 113) +++ openbios-devel/arch/sparc32/entry.S 2007-03-09 00:59:05 UTC (rev 114) @@ -60,15 +60,15 @@ sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu first_cpu: + /* Create temporary page tables and map the ROM area to end of + RAM. This will be done properly in iommu.c later. */ set PHYS_JJ_EEPROM + 0x30, %g1 lda [%g1] ASI_M_BYPASS, %g1 - ! map PROLDATA to PROLBASE+PROLSIZE to end of ram - !set PROLSIZE+0x1000-PROLDATA+PROLBASE, %g2 ! add 0x1000 for temp tables set _end, %g3 set 0xfff, %g2 add %g3, %g2, %g3 andn %g3, %g2, %g3 - set _data, %g2 + set _start, %g2 sub %g3, %g2, %g3 set 0x1000, %g4 ! add 0x1000 for page tables add %g4, %g3, %g2 @@ -128,45 +128,17 @@ sta %g3, [%g2] ASI_M_BYPASS add %g2, 0xa00-0x9e0, %g2 ! s+0xa00 - !set (PROLDATA-PROLBASE)/0x1000, %g6 ! # of .text pages - set _start, %g3 - set _data, %g6 - set 0x1000, %g5 - sub %g6, %g3, %g6 - srl %g6, 12, %g6 ! # of .text pages -1: srl %g3, 0x4, %g4 - or %g4, ((7 << 2) | 2), %g4 ! 4 = U: --X S: --X (rom, execute only) - sta %g4, [%g2] ASI_M_BYPASS - add %g2, 4, %g2 - add %g3, %g5, %g3 - deccc %g6 - bne 1b - nop -#if 0 - !set (PROLDATA-PROLRODATA)/0x1000, %g6 ! # of .rodata pages - set _data, %g6 - set _rodata, %g4 - sub %g6, %g4, %g6 - srl %g6, 12, %g6 ! # of .bss pages -1: srl %g3, 0x4, %g4 - or %g4, ((0 << 2) | 2), %g4 ! 0 = U: R-- S: R-- (rom, read only) - sta %g4, [%g2] ASI_M_BYPASS - add %g2, 4, %g2 - add %g3, %g5, %g3 - deccc %g6 - bne 1b - nop -#endif - !set (PROLBASE+PROLSIZE-PROLDATA)/0x1000, %g6 ! # of .bss pages + /* Use end of ram for code, rodata, data, and bss + sections. SunOS wants to write to trap table... */ set _end, %g6 - set _data, %g4 + set _start, %g4 sub %g6, %g4, %g6 - srl %g6, 12, %g6 ! # of .bss pages - set 0x1000, %g4 + srl %g6, 12, %g6 ! # of all pages + set 0x1000, %g5 sll %g7, 0x4, %g3 - add %g4, %g3, %g3 + add %g5, %g3, %g3 ! ctx table + 0x1000 1: srl %g3, 0x4, %g4 - or %g4, ((7 << 2) | 2), %g4 ! 5 = U: R-- S: RW- (data area, read/write) + or %g4, ((7 << 2) | 2), %g4 ! 7 = U: --- S: RWX sta %g4, [%g2] ASI_M_BYPASS add %g2, 4, %g2 add %g3, %g5, %g3 @@ -174,8 +146,26 @@ bne 1b nop - mov %g1, %g3 + mov %g1, %g6 ! %g6 = memory size + /* Copy the code, rodata and data sections from ROM. */ + set 0x1000 - 4, %g4 + sll %g7, 0x4, %g3 + add %g4, %g3, %g3 ! ctx table + 0x1000 - 4 + set _start - 4, %g4 ! First address of TEXT + set _bss, %g5 ! Last address of DATA + ba 2f + nop +1: + lda [%g4] ASI_M_BYPASS, %g1 + sta %g1, [%g3] ASI_M_BYPASS +2: + cmp %g4, %g5 + add %g3, 0x4, %g3 + bl 1b + add %g4, 0x4, %g4 + + set AC_M_CTPR, %g2 sta %g7, [%g2] ASI_M_MMUREGS ! set ctx table ptr set 1, %g1 @@ -196,19 +186,6 @@ wr %g2, 0x0, %psr WRITE_PAUSE - /* Copy the DATA section from ROM. */ - set _data - 4, %o0 ! First address of DATA - set _bss, %o1 ! Last address of DATA - ba 2f - nop -1: - lda [%o0] ASI_M_BYPASS, %g1 - st %g1, [%o0] -2: - subcc %o0, %o1, %g0 - bl 1b - add %o0, 0x4, %o0 - /* Zero out our BSS section. */ set _bss - 4, %o0 ! First address of BSS set _estack, %o1 ! Last address of BSS @@ -229,10 +206,10 @@ wr %g1, 0x0, %tbr set qemu_mem_size, %g1 - st %g3, [%g1] + st %g6, [%g1] sll %g7, 4, %g7 ! Store va->pa conversion factor - set _data - 0x1000, %g1 + set _start - 0x1000, %g1 sub %g1, %g7, %g7 set va_shift, %g1 st %g7, [%g1] Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2006-10-30 23:06:43 UTC (rev 113) +++ openbios-devel/arch/sparc32/romvec.c 2007-03-09 00:59:05 UTC (rev 114) @@ -108,6 +108,21 @@ } } +#if CONFIG_DEBUG_OBP +static int looks_like_string(char *str, int len) +{ + int i; + int ret = (str[len-1] == '\0'); + for (i = 0; i < len-1 && ret; i++) + { + int ch = str[i] & 0xFF; + if (ch < 0x20 || ch > 0x7F) + ret = 0; + } + return ret; +} +#endif + static int obp_getprop(int node, char *name, char *value) { int notfound, found; @@ -148,7 +163,19 @@ else str = "NULL"; - DPRINTF("obp_getprop(0x%x, %s) = %s\n", node, name, str); +#if CONFIG_DEBUG_OBP + if (looks_like_string(str, len)) { + DPRINTF("obp_getprop(0x%x, %s) = %s\n", node, name, str); + } else { + int i; + DPRINTF("obp_getprop(0x%x, %s) = ", node, name); + for (i = 0; i < len; i++) { + DPRINTF("%02x%s", str[i] & 0xFF, + (len == 4 || i == len-1) ? "" : " "); + } + DPRINTF("\n"); + } +#endif return len; } @@ -378,8 +405,22 @@ static char * obp_dumb_memalloc(char *va, unsigned int size) { + static unsigned int next_free_address = 0xFFEDA000; + free_ram -= size; DPRINTF("obp_dumb_memalloc req 0x%x of %d at 0x%x\n", va, size, free_ram); + + // If va is null, the allocator is supposed to pick a "suitable" address. + // (See OpenSolaric prom_alloc.c) There's not any real guidance as + // to what might be "suitable". So we mimic the behavior of a Sun boot + // ROM. + + if (va == NULL) { + va = next_free_address - size; + next_free_address -= size; + DPRINTF("obp_dumb_memalloc req null -> 0x%x\n", va); + } + obp_dumb_mmap(va, 1, free_ram, size); return va; @@ -447,7 +488,7 @@ void * init_openprom(unsigned long memsize) { - free_ram = va2pa((int)&_data) - PAGE_SIZE; + free_ram = va2pa((int)&_start) - PAGE_SIZE; ptphys = totphys; ptmap = totmap; Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2006-10-30 23:06:43 UTC (rev 113) +++ openbios-devel/drivers/esp.c 2007-03-09 00:59:05 UTC (rev 114) @@ -285,12 +285,24 @@ selfword("open-deblocker"); +#if WHEN_INTERPOSE_IS_FIXED + // Buggy implementation of "interpose" breaks SunOS 4. + // inst2pkg of the device returned by open() should return + // the same phandle regardless of whether any interposition + // has happened. Interpose currently causes inst2pkg to + // return the phandle of /packages/misc-files. + // + // Removing interpose isn't the ideal solution, but it + // allows SunOS 4 to load the kernel. Interpose should + // be fixed, then re-enabled. + /* interpose disk-label */ ph = find_dev("/packages/disk-label"); fword("my-args"); PUSH_ph( ph ); fword("interpose"); - +#endif + RET ( -ret ); } Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2006-10-30 23:06:43 UTC (rev 113) +++ openbios-devel/drivers/iommu.c 2007-03-09 00:59:05 UTC (rev 114) @@ -222,7 +222,7 @@ PUSH(0); fword("encode-int"); fword("encode+"); - PUSH(va2pa((unsigned long)&_data) - PAGE_SIZE); + PUSH(va2pa((unsigned long)&_start) - PAGE_SIZE); fword("encode-int"); fword("encode+"); push_str("available"); @@ -295,14 +295,8 @@ l1[i] = SRMMU_ET_INVALID; } - // 1:1 mapping for ROM - pa = va = (unsigned long)&_start; - for (; va < (unsigned long)&_data; va += PAGE_SIZE, pa += PAGE_SIZE) { - map_page(va, pa, 0); - } - - // data & bss mapped to end of RAM - va = (unsigned long)&_data; + // text, rodata, data, and bss mapped to end of RAM + va = (unsigned long)&_start; for (; va < (unsigned long)&_end; va += PAGE_SIZE) { pa = va2pa(va); map_page(va, pa, 0); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2006-10-30 23:06:43 UTC (rev 113) +++ openbios-devel/drivers/obio.c 2007-03-09 00:59:05 UTC (rev 114) @@ -37,6 +37,20 @@ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ +/* "NCPU" is an historical name that's now a bit of a misnomer. The sun4m + * architecture registers NCPU CPU-specific interrupts along with one + * system-wide interrupt, regardless of the number of actual CPUs installed. + * See the comment on "NCPU" at <http://stuff.mit.edu/afs/athena/astaff/ + * project/opssrc/sys.sunos/sun4m/devaddr.h>. + */ +#define SUN4M_NCPU 4 + +/* The kernel may want to examine the arguments, so hold a copy in OBP's + * mapped memory. + */ +#define OBIO_CMDLINE_MAX 256 +char obio_cmdline[OBIO_CMDLINE_MAX]; + /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); @@ -306,6 +320,7 @@ const char *stdin, *stdout; unsigned int i; char nographic; + uint32_t size; ob_new_obio_device("eeprom", NULL); @@ -325,8 +340,14 @@ } kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; - cmdline = nv_info.cmdline; - cmdline_size = nv_info.cmdline_size; + + size = cmdline_size; + if (size > OBIO_CMDLINE_MAX) size = OBIO_CMDLINE_MAX; + memcpy(obio_cmdline, nv_info.cmdline, size); + obio_cmdline[size-1] = '\0'; + cmdline = obio_cmdline; + cmdline_size = size; + boot_device = nv_info.boot_device; nographic = nv_info.nographic; @@ -369,6 +390,10 @@ push_str("version"); fword("property"); + push_str(""); + push_str("cache-physical?"); + fword("property"); + PUSH(32); fword("encode-int"); push_str("cache-line-size"); @@ -435,7 +460,7 @@ push_str("ncaches"); fword("property"); - PUSH(256); + PUSH(4096); fword("encode-int"); push_str("mmu-nctx"); fword("property"); @@ -539,26 +564,32 @@ ob_counter_init(unsigned long base, unsigned long offset) { volatile struct sun4m_timer_regs *regs; + int i; ob_new_obio_device("counter", NULL); + for (i = 0; i < SUN4M_NCPU; i++) { + PUSH(0); + fword("encode-int"); + if (i != 0) fword("encode+"); + PUSH(offset + (i * PAGE_SIZE)); + fword("encode-int"); + fword("encode+"); + PUSH(COUNTER_REGS); + fword("encode-int"); + fword("encode+"); + } + PUSH(0); fword("encode-int"); - PUSH(offset); - fword("encode-int"); fword("encode+"); - PUSH(COUNTER_REGS); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); PUSH(offset + 0x10000); fword("encode-int"); fword("encode+"); PUSH(COUNTER_REGS); fword("encode-int"); fword("encode+"); + push_str("reg"); fword("property"); @@ -580,26 +611,32 @@ static void ob_interrupt_init(unsigned long base, unsigned long offset) { + int i; ob_new_obio_device("interrupt", NULL); + for (i = 0; i < SUN4M_NCPU; i++) { + PUSH(0); + fword("encode-int"); + if (i != 0) fword("encode+"); + PUSH(offset + (i * PAGE_SIZE)); + fword("encode-int"); + fword("encode+"); + PUSH(INTERRUPT_REGS); + fword("encode-int"); + fword("encode+"); + } + PUSH(0); fword("encode-int"); - PUSH(offset); - fword("encode-int"); fword("encode+"); - PUSH(INTERRUPT_REGS); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); PUSH(offset + 0x10000); fword("encode-int"); fword("encode+"); PUSH(INTERRUPT_REGS); fword("encode-int"); fword("encode+"); + push_str("reg"); fword("property"); Modified: openbios-devel/include/sparc32/io.h =================================================================== --- openbios-devel/include/sparc32/io.h 2006-10-30 23:06:43 UTC (rev 113) +++ openbios-devel/include/sparc32/io.h 2007-03-09 00:59:05 UTC (rev 114) @@ -10,7 +10,7 @@ static inline unsigned long va2pa(unsigned long va) { - if ((va >= (unsigned long)&_data) && + if ((va >= (unsigned long)&_start) && (va < (unsigned long)&_end)) return va - va_shift; else @@ -20,8 +20,8 @@ static inline unsigned long pa2va(unsigned long pa) { - if ((pa + va_shift >= (unsigned long)&_data) && - (pa + va_shift< (unsigned long)&_end)) + if ((pa + va_shift >= (unsigned long)&_start) && + (pa + va_shift < (unsigned long)&_end)) return pa + va_shift; else return pa;

1 0

RAM codes.
by Feng, Libo 08 Mar '07

08 Mar '07

I am studying the LinuxBios project. I have a question about the RAM code: from Makefile, it seems that LinuxBios could load codes from FLASH to RAM twice, first for linuxbios_ram, second for so-called payload. My understanding is correct or not. However, also from Makefile, it seems that linuxbios is dependent on LINUXBIOS_RAM_ROM, but doesn't include it. The below is abstracted from a Makefile: linuxbios: crt0.o $(INIT-OBJECTS) $(LINUXBIOS_APC) $(LINUXBIOS_RAM_ROM) ldscript.ld $(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o $(INIT-OBJECTS) $(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map. So, there is no action on LINUXBIOS_RAM_ROM. Does it mean linuxbios_ram is not very important. Even without it, the system is also ok? Feng Libo

2 1

Re: [OpenBIOS] Sun OBP bugs in 1.0RC1
by Blue Swirl 17 Feb '07

17 Feb '07

>2) Error message: "Unhandled Exception 0x00000080" > >Bug: Trap 0 (entry 0x80 in the table, i.e. syscall_trap_4x) is >undefined. This is because the SunOS bootloader installs the trap by >writing code in the trap table, but the trap table is in the .text >section of OpenBIOS. Thus the trap 0 handler simply jumps to "bug". Okay, can you try if this patch helps? _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

1 0

Filo problems booting El Torito (LiveCD) CD-ROMS?
by roger 31 Jan '07

31 Jan '07

Could it be I'm just having problems using Linuxbios & Filo under Qemu emulation instead of actually booting from a flash device? Anyways, here's my debug info: I'm successfully using Qemu to load Linuxbios with a filo payload specifying "hdc1" as my CD-ROM device within the Filo Config file. /dev/hdc = DVD-ROM with DVD+R LiveCD /dev/hdd = CD-ROM with CD-R LiveCD Using an actual CD-ROM (DVD-ROM) device with the Qemu "-cdrom /dev/hdc" option : $ /home/roger/tmp/qemu/bin/qemu -L ~ -nographic -cdrom /dev/hdc -boot d <snip Linuxbios & Filo messages> boot: hdc1 malloc_diag: alloc: 208 bytes (5 blocks), free: 16168 bytes (1 blocks) malloc_diag: alloc: 224 bytes (6 blocks), free: 16152 bytes (1 blocks) file_open: dev=hdc1, path=<NULL> find_ide_controller: found PCI IDE controller 8086:7010 prog_if=0x80 find_ide_controller: secodary channel: compatibility mode find_ide_controller: cmd_base=0x170 ctrl_base=0x374 ide_software_reset: Waiting for ide1 to become ready for reset... ok init_drive: Testing for hdc init_drive: Probing for hdc print_status: IDE: status=0x41, err=0x4 init_drive: Testing for hdc init_drive: Probing for hdc hdc: ATAPI: QEMU CD-ROM init_drive: Testing for hdd init_drive: Probing for hdd print_status: IDE: status=0x0, err=0x1 init_drive: Testing for hdd init_drive: Probing for hdd print_status: IDE: status=0x0, err=0x1 atapi_detect_medium: block_len=2048 atapi_detect_medium: sectors=520415 1016MB medium detected open_pc_partition: pc partition magic number not found open_eltorito_image: El-Torito boot catalog at sector 53 open_eltorito_image: id='' Disc doesn't use boot disk emulation devopen: can't open partition 1 malloc_diag: alloc: 208 bytes (5 blocks), free: 16168 bytes (1 blocks) malloc_diag: alloc: 192 bytes (4 blocks), free: 16184 bytes (1 blocks) boot: hdc1 Using a Loop ISO Filesystem specified as a "-cdrom" option for Qemu: $ /home/roger/tmp/qemu/bin/qemu -L ~ -nographic -cdrom /home/roger/gentoo/install cd/install-x86-minimal-2006.1.iso <snip Linuxbios & Filo messages> boot: hdc1 malloc_diag: alloc: 208 bytes (5 blocks), free: 16168 bytes (1 blocks) malloc_diag: alloc: 224 bytes (6 blocks), free: 16152 bytes (1 blocks) file_open: dev=hdc1, path=<NULL> find_ide_controller: found PCI IDE controller 8086:7010 prog_if=0x80 find_ide_controller: secodary channel: compatibility mode find_ide_controller: cmd_base=0x170 ctrl_base=0x374 ide_software_reset: Waiting for ide1 to become ready for reset... ok init_drive: Testing for hdc init_drive: Probing for hdc print_status: IDE: status=0x41, err=0x4 init_drive: Testing for hdc init_drive: Probing for hdc hdc: ATAPI: QEMU CD-ROM init_drive: Testing for hdd init_drive: Probing for hdd print_status: IDE: status=0x0, err=0x1 init_drive: Testing for hdd init_drive: Probing for hdd print_status: IDE: status=0x0, err=0x1 atapi_detect_medium: block_len=2048 atapi_detect_medium: sectors=27737 54MB medium detected open_pc_partition: pc partition magic number not found open_eltorito_image: El-Torito boot catalog at sector 34 open_eltorito_image: id='' Disc doesn't use boot disk emulation devopen: can't open partition 1 malloc_diag: alloc: 208 bytes (5 blocks), free: 16168 bytes (1 blocks) malloc_diag: alloc: 192 bytes (4 blocks), free: 16184 bytes (1 blocks) boot: hdc1 -- Roger http://www.eskimo.com/~roger/index.html Key fingerprint = 8977 A252 2623 F567 70CD 1261 640F C963 1005 1D61 Sun Jan 28 21:32:04 PST 2007

3 11

Hang executing memtest86 from Livecd
by roger 31 Jan '07

31 Jan '07

Loading memtest86 from a livecd hangs on memtest86 execution. Thought the following was just an issue with running qemu with "-no-graphic" option. But running without "-no-graphic", I still get a hang with executing memtest86. $ ~/tmp/qemu/bin/qemu -L ~ -nographic -cdrom /dev/hdc ... pci_init: 00:01.3 8086:7113 0680 00 pci_init: 00:02.0 1013:00b8 0300 00 pci_init: 00:03.0 10ec:8029 0200 00 Press <Enter> for default boot, or <Esc> for boot prompt... timed out boot: hdc:/isolinux/memtest86 malloc_diag: alloc: 224 bytes (5 blocks), free: 16152 bytes (1 blocks) malloc_diag: alloc: 240 bytes (6 blocks), free: 16136 bytes (1 blocks) file_open: dev=hdc, path=/isolinux/memtest86 find_ide_controller: found PCI IDE controller 8086:7010 prog_if=0x80 find_ide_controller: secodary channel: compatibility mode find_ide_controller: cmd_base=0x170 ctrl_base=0x374 ide_software_reset: Waiting for ide1 to become ready for reset... ok init_drive: Testing for hdc init_drive: Probing for hdc print_status: IDE: status=0x41, err=0x4 init_drive: Testing for hdc init_drive: Probing for hdc hdc: ATAPI: QEMU CD-ROM init_drive: Testing for hdd init_drive: Probing for hdd print_status: IDE: status=0x0, err=0x1 init_drive: Testing for hdd init_drive: Probing for hdd print_status: IDE: status=0x0, err=0x1 atapi_detect_medium: block_len=2048 atapi_detect_medium: sectors=520415 1016MB medium detected Mounted iso9660 malloc_diag: alloc: 224 bytes (5 blocks), free: 16152 bytes (1 blocks) elf_load: Not a bootable ELF image malloc_diag: alloc: 240 bytes (6 blocks), free: 16136 bytes (1 blocks) file_open: dev=hdc, path=/isolinux/memtest86 devopen: already open malloc_diag: alloc: 224 bytes (5 blocks), free: 16152 bytes (1 blocks) Possible very old Linux (protocol 0x0) zImage or Image. init_linux_params: Setting up paramters at 0x90000 set_memory_size: 0000000000000ba4 - 00000000000f0000 set_memory_size: 00000000000f0400 - 0000000008000000 set_memory_size: ramtop=0x8000000 set_memory_size: ext_mem_k=64512, alt_mem_k=130048 load_linux_kernel: offset=0xa00 addr=0x1000 size=0x16708 Loading kernel... ok start_linux: eip=0x1000 Jumping to entry point... -- Roger http://www.eskimo.com/~roger/index.html Key fingerprint = 8977 A252 2623 F567 70CD 1261 640F C963 1005 1D61 Tue Jan 30 14:31:58 PST 2007

1 0

Run from flash hang
by Krzysz Kowalski 29 Jan '07

29 Jan '07

Hi all! I try write my own code which changes Cas Latency on motherboard with AM2 socket (CPU AMD64 family 0fh, motherboard with original BIOS). My program is on FLASH chip in network card, on address 0xFDEC0000. I put execution there and program works (I can see that FLASH is reading). The program hangs when I set EnDramInit (reg. 0x7c, bit 31, function 2, device 24). Address map configuration is set properly. Program is running from flash - why program hangs? Best regards Kris ---------------------------------------------------- Ostatnia sobota karnawału - wielka impreza! Wyjątkowy koncert noJazz - gwiazdy funk, jazz, hiphop. Występy czołówki polskich DJ. 17.02.2007 - Fabryka Trzciny, Warszawa - Szczegóły: http://klik.wp.pl/?adr=http%3A%2F%2Fadv.reklama.wp.pl%2Fas%2Fd65.html&sid=1…

1 0

[PATCH] Filo README
by roger 29 Jan '07

29 Jan '07

Can somebody please update the Filo README file to including the following concerning CD-ROM device file syntax? ie. CD-ROM device is to be specified as "hdc1" and not "hdc"! Following are the relevant Filo documentation clippings: According to: http://te.to/~ts1/filo/CHANGES "* Support for mounting boot disk image of El Torito bootable CD-ROM. ("hdc1" means the boot disk image of the CD-ROM at hdc.)" However, I only see a very vague reference for the syntax of specifying CD-ROM drives within Filo's README: "Notation of DEVICE for IDE disk and CD-ROM is same as in Linux (eg. hda1 means the first partition of master device on primary IDE channel)." With the above Filo README information, the user is going to think "/dev/hdb" or "hdb" instead, FILO wants to see "hdb1"! -- Roger http://www.eskimo.com/~roger/index.html Key fingerprint = 8977 A252 2623 F567 70CD 1261 640F C963 1005 1D61 Sun Jan 28 21:30:07 PST 2007

1 0

how to search the mail archive
by Noah yan 14 Jan '07

14 Jan '07

Thanks Noah

2 1

AMD Socket F BIOS information
by Dave Graham 13 Jan '07

13 Jan '07

Hi all, I'm new to the list and just wanted to find out about any socket F mainboard bios' floating around. I'm also working on a project to allow AMD Athlon FX-7x series processors to be used on Opteron 2000 based boards. I've got the hardware, just need the know-how. any insite would be GREATLY appreciated. -- Dave Graham Flickerdown Data Systems 1207 Main St. #2 Holden, MA. 01520 978.239.2489

2 1

Cisco Content Engine ce507 Flash bios and boot
by marks twotoe.com 08 Jan '07

08 Jan '07

There are a lot of Cisco ce507 content engines going very cheap on the big auction at the moment. You can even pick one up on ebay for as low as ~$10AU if you are dillegent enough watching the auctions. Although they are obsolete for there intended purpose the hardware is very cool. The ce507 contain: P3/600 cpu 256 meg ram symbios 83C895 with 18gig deathstar drive asiliant 69000 video chip, 1 IDE port Floppy port i8042 kb/mous interface 2 standard comports. 2 intel e100 (82559) network interfaces. The chipset is 443BX with a PIIX4E. The bios is a general software job, possibly with video/mouse/keyboard handling removed. All video goes out the console port (com1) at 9600, as does the input from the kb/mouse. The video and keyboard/mouse ports are availible via headers. Although the kernel detects the i8042 and the asiliant video, I am unable to get any video besides a cursor and no input from the kb/mouse happening. The flash chips are 82F128J and a 82F400B and there is an altera EPM7032 sitting between them. One of the flash chips is for the bios, the second is for the boot. There is also a 93C46 1K microwire eeprom onboard. If you access the bios at post and set the boot device to other than flash you can boot floppy/ide/scsi. In this way I have slack up and running on sda. I also have zeroshell and ubuntu pyramid running off a cf card plugged into ide0. I used a boot floppy and scsi cd to install slack. After that long winded background my 2 questions are: Has anyone managed to put openbios on one of these or similar boards? Has anyone managed to access the boot flash on one of these or similar boards? If so, what is the proceedure? Best regards, Marks < m a r k s @ t w o t o e . c o m >

1 0

Build requirements for OpenBIOS
by Blue Swirl 24 Dec '06

24 Dec '06

Hi, At least to target Sparc you don't need toke to compile OpenBIOS, just xsltproc and (cross)compiler setup. _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

1 0

Build requirements for OpenBIOS
by Gregg Levine 20 Dec '06

20 Dec '06

Hello! Did I miss a message or three? I have a copy of the OpenBIOS code, which was checked out from SVN about a month ago. Upon entering the make command it promptly complains that I need to install the fcode utilities. And provides the instructions for retrieving them from SVN. I do that. It then happens that they do not compile properly on my Slackware system who uses the 3.4.6 variant of GCC. (More later.) -- Gregg C Levine gregg.drwho8(a)gmail.com "This signature was once found posting rude messages in English in the Moscow subway."

1 0