OpenBIOS August 2007

openbios@openbios.org

12 participants
103 discussions

[5/5] Open Firmware on LinuxBIOS on M57SLI
by Torsten Duwe 29 Aug '07

29 Aug '07

This may look right, but it is a bad kludge. Open Firmware, when "biosload"ed, expects a top-of-RAM at physical address 0x1004 ( mem-info-pa 4 + ) , as a little endian pointer. LinuxBIOS however only provides its tables. There's currently code in the queue from Jens Freimann to parse the LB tables, and OFW should ideally get its info from that, but the stuff is not yet stable (right, Jens?) and providing the table info to the /memory device init is still to be written. Until openfirmware/cpu/x86/pc/biosload/probemem.fth is changed or maybe even an openfirmware/cpu/x86/pc/linuxbiosload is created, use this evil hack. The memory map is parsed anyway to find a RAM buffer for the payload, so I just hook in here to find a 32-bit pointer to the top of RAM, clipped to 3GB, to not confuse the payload :) Recommendation: do _NOT_ apply!

1 0

r584 - cpu/x86/pc/olpc dev/olpc/cafenand
by svn＠openbios.org 29 Aug '07

29 Aug '07

Author: wmb Date: 2007-08-29 01:18:26 +0200 (Wed, 29 Aug 2007) New Revision: 584 Modified: cpu/x86/pc/olpc/copynand.fth cpu/x86/pc/olpc/nandstat.fth dev/olpc/cafenand/badblock.fth dev/olpc/cafenand/cafenand.fth Log: copy-nand - Check carefully for bad blocks when copying on the OS image, adding any newly-discovered ones to the bad block table. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-08-28 18:45:58 UTC (rev 583) +++ cpu/x86/pc/olpc/copynand.fth 2007-08-28 23:18:26 UTC (rev 584) @@ -135,32 +135,32 @@ defer show-erasing ( #blocks -- ) : (show-erasing) ( #blocks -- ) ." Erasing " . ." blocks" cr ; -' (show-erasing) is show-erasing +' (show-erasing) to show-erasing defer show-erased ( block# -- ) : (show-erased) ( block# -- ) (cr . ; -' (show-erased) is show-erased +' (show-erased) to show-erased defer show-bad ( block# -- ) -' drop is show-bad +' drop to show-bad -defer show-bbt ( block# -- ) -' drop is show-bbt +defer show-bbt-block ( block# -- ) +' drop to show-bbt-block defer show-clean ( block# -- ) -' drop is show-clean +' drop to show-clean defer show-cleaning ( -- ) : (show-cleaning) ( -- ) cr ." Cleanmarkers" cr ; -' (show-cleaning) is show-cleaning +' (show-cleaning) to show-cleaning defer show-writing ( #blocks -- ) : (show-writing) ." Writing " . ." blocks" cr ; -' (show-writing) is show-writing +' (show-writing) to show-writing defer show-written : (show-written) ( block# -- ) (cr . ; -' (show-written) is show-written +' (show-written) to show-written : copy-nand ( "devspec" -- ) open-nand @@ -171,7 +171,7 @@ ['] noop to show-progress #nand-pages nand-pages/block / show-erasing - ['] show-bad ['] show-erased ['] show-bbt " (wipe)" $call-nand + ['] show-bad ['] show-erased ['] show-bbt-block " (wipe)" $call-nand #image-eblocks show-writing @@ -307,7 +307,6 @@ : dump-nand ( "devspec" -- ) true to dump-oob? (dump-nand) ; : save-nand ( "devspec" -- ) false to dump-oob? (dump-nand) ; - : fastcopy-nand ( "devspec" -- ) open-nand Modified: cpu/x86/pc/olpc/nandstat.fth =================================================================== --- cpu/x86/pc/olpc/nandstat.fth 2007-08-28 18:45:58 UTC (rev 583) +++ cpu/x86/pc/olpc/nandstat.fth 2007-08-28 23:18:26 UTC (rev 584) @@ -44,10 +44,10 @@ drop ; -: gshow-erased ( eblock# -- ) erased-color show-state ; -: gshow-bad ( eblock# -- ) bad-color show-state ; -: gshow-bbt ( eblock# -- ) bbt-color show-state ; -: gshow-clean ( eblock# -- ) clean-color show-state ; +: gshow-erased ( eblock# -- ) erased-color show-state ; +: gshow-bad ( eblock# -- ) bad-color show-state ; +: gshow-bbt-block ( eblock# -- ) bbt-color show-state ; +: gshow-clean ( eblock# -- ) clean-color show-state ; : gshow-cleaning ( -- ) ." Cleanmarkers" cr cursor-on ; @@ -69,14 +69,14 @@ : gshow-written ( eblock# -- ) written-color show-state ; : gshow - ['] gshow-erasing to show-erasing - ['] gshow-erased to show-erased - ['] gshow-bad to show-bad - ['] gshow-bbt to show-bbt - ['] gshow-clean to show-clean - ['] gshow-cleaning to show-cleaning - ['] gshow-writing to show-writing - ['] gshow-written to show-written + ['] gshow-erasing to show-erasing + ['] gshow-erased to show-erased + ['] gshow-bad to show-bad + ['] gshow-bbt-block to show-bbt-block + ['] gshow-clean to show-clean + ['] gshow-cleaning to show-cleaning + ['] gshow-writing to show-writing + ['] gshow-written to show-written ; gshow Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2007-08-28 18:45:58 UTC (rev 583) +++ dev/olpc/cafenand/badblock.fth 2007-08-28 23:18:26 UTC (rev 584) @@ -142,7 +142,9 @@ /page + ( signature$ page# adr' ) loop ( signature$ page# adr' ) drop ( signature$ page# ) - /page bb-offset + write-bytes ( ) + /page bb-offset + write-bytes if ( ) + ." Failed to write bad block table" cr + then else ( signature$ page# ) 3drop ( ) then @@ -386,21 +388,51 @@ : start-scan ( -- ) pages/eblock negate to scan-page# ; -\ Must erase all (wipe) first +: try-copy-block ( adr page# -- okay? ) + pages/eblock bounds ?do ( adr ) + dup i write-page if ( adr ) + drop false unloop exit ( false ) + then ( adr ) + /page + ( adr' ) + loop ( adr ) + drop true ( true ) +; +: block-okay? ( adr page# -- okay? ) + pages/eblock bounds ?do ( adr ) + i get-page if ( adr ) + drop false unloop exit ( false ) + then ( adr buf-adr ) + over /page comp if ( adr ) + drop false unloop exit + then + /page + ( adr' ) + loop ( adr ) + drop true ( true ) +; +: copy&check ( adr page# -- okay? ) + 2dup try-copy-block 0= if 2drop false exit then ( adr page# ) + block-okay? +; + : copy-block ( adr -- page# error? ) - next-page# ( adr page# ) - tuck pages/eblock bounds ?do ( page# adr ) - dup i write-page if ( page# adr ) - drop true unloop exit ( page# true ) - then ( page# adr ) - /page + ( page# adr' ) - loop ( page# adr ) - drop false ( page# false ) + begin (next-page#) 0= while ( adr page# ) + 2dup copy&check if nip false exit then ( adr page# ) + \ Error; retry once + dup erase-block ( adr page# ) + 2dup copy&check if nip false exit then ( adr page# ) + mark-bad save-bbt ( adr ) + repeat ( adr ) + drop ( ) + usable-page-limit pages/eblock - true ( page# error? ) ; : put-cleanmarker ( page# -- ) - " "(85 19 03 20 08 00 00 00)" ( page# adr len ) - rot /page /ecc + write-bytes ( ) + >r + " "(85 19 03 20 08 00 00 00)" ( adr len r: page# ) + r@ /page /ecc + write-bytes if ( r: page# ) + r@ mark-bad save-bbt ( r: page# ) + then ( r: page# ) + r> drop ; : put-cleanmarkers ( show-xt -- ) begin (next-page#) 0= while ( show-xt page# ) Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2007-08-28 18:45:58 UTC (rev 583) +++ dev/olpc/cafenand/cafenand.fth 2007-08-28 23:18:26 UTC (rev 584) @@ -149,13 +149,12 @@ swap r> move ( ) ; -: pio-write-raw ( adr len page# offset -- ) +: pio-write-raw ( adr len page# offset -- error? ) 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 wait-write-done ( error? ) - drop ; : pio-write-page ( adr page# -- error? ) @@ -210,21 +209,27 @@ syndrome-buf ; -: read-page ( adr page# -- error? ) - 0 set-page ( adr ) - /page /ecc + 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 ) - read-cmd h# 0800.0130 cmd wait-dma ( adr ) +\ Reads page into DMA buffer +: get-page ( page# -- true | adr false ) + 0 set-page ( ) + /page /ecc + h# 18 cl! ( ) + dma-buf-pa h# 44 cl! ( ) + 0 h# 48 cl! ( ) + /page h# a000.0000 or h# 40 cl! ( ) + read-cmd h# 0800.0130 cmd wait-dma ( ) - h# 3c cl@ h# 40000 and if ( adr ) \ ECC error - dma-buf-va syndrome correct-ecc ( adr uncorrectable? ) - else ( adr ) - false ( adr error? ) - then ( adr error? ) + h# 3c cl@ h# 40000 and if ( ) \ ECC error + dma-buf-va syndrome correct-ecc ( uncorrectable? ) + else ( ) + false ( error? ) + then ( error? ) + dup 0= if dma-buf-va swap then ( true | adr false ) +; - dma-buf-va rot /page do-lmove ( error? ) +: read-page ( adr page# -- error? ) + get-page if drop true exit then ( adr dma-buf-adr ) + swap /page do-lmove ( ) + false ; [ifdef] notdef @@ -267,7 +272,7 @@ ; : write-page ( adr page# -- error? ) dma-write-page ; -: write-bytes ( adr len page# offset -- ) pio-write-raw ; +: write-bytes ( adr len page# offset -- error? ) pio-write-raw ; 3 value #erase-adr-bytes \ Chip dependent : erase-block ( page# -- )

1 0

r583 - dev/olpc/cafenand
by svn＠openbios.org 28 Aug '07

28 Aug '07

Author: lwalter Date: 2007-08-28 20:45:58 +0200 (Tue, 28 Aug 2007) New Revision: 583 Modified: dev/olpc/cafenand/selftest.fth Log: Add fixbbt selftest Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2007-08-27 23:09:32 UTC (rev 582) +++ dev/olpc/cafenand/selftest.fth 2007-08-28 18:45:58 UTC (rev 583) @@ -7,9 +7,31 @@ 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 cur-eblock \ Eblock # under scrutiny +0 value prev-eblock \ Last bad eblock # +0 value #fixbbt \ Counter of bad eblocks found +false value fixbbt? \ Flag to determine whether to mark bad eblocks +false value selftest-err? \ Selftest result +: #fixbbt++ ( -- ) #fixbbt 1+ to #fixbbt ; +: .#fixbbt ( -- ) + (cr ." # bad blocks " + fixbbt? if ." marked" else ." found" then + ." = " #fixbbt .d cr +; +: record-err ( error? -- ) + noop + if + true to selftest-err? + prev-eblock cur-eblock <> if + ." Bad block" cur-eblock .page-byte cr + cur-eblock to prev-eblock + #fixbbt++ + fixbbt? if cur-eblock mark-bad then + then + then +; + 0 value sbuf \ Original content of block 0 value obuf \ Block data written 0 value ibuf \ Block data read @@ -37,7 +59,7 @@ : 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 + obuf over write-eblock if drop true exit then ibuf swap read-eblock if true exit then ibuf obuf erase-size comp ; @@ -46,7 +68,7 @@ : 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 ; +: .skip-bad ( page# -- ) (cr ." Skip bad block" .page-byte cr ; : fill ( subarg$ -- ) $number if 0 else 0 max h# ff min then ." Fill nandflash with h# " dup u. cr @@ -55,9 +77,12 @@ i block-bad? if i .skip-bad else + i to cur-eblock (cr i . i over test-eblock record-err then pages/eblock +loop drop + + .#fixbbt ; \ Non-destructive. Argument is number of blocks to test. @@ -77,6 +102,7 @@ dup block-bad? if ( block#' ) drop ( ) else ( block#' ) + dup to cur-eblock (cr dup . sbuf over read-eblock dup record-err 0= if dup h# 55 test-eblock record-err @@ -86,6 +112,8 @@ sbuf swap write-eblock record-err then loop + + .#fixbbt ; \ Non-destructive. Argument is <#blk>,<blk#> @@ -119,6 +147,7 @@ pages/eblock * swap 1+ pages/eblock * ( page# #page ) usable-page-limit rot ?do ( #blk+1 ) i block-bad? not if + i to cur-eblock (cr i . sbuf i read-eblock dup record-err 0= if i h# 55 test-eblock record-err @@ -127,8 +156,17 @@ sbuf i write-eblock record-err then dup +loop drop + + .#fixbbt ; +\ Non-destructive. Same as full. Except failed eblocks are marked as bad. +: fixbbt ( subarg$ -- ) + true to fixbbt? + full + #fixbbt if save-bbt then +; + : none ( subarg$ -- ) 2drop exit ; : help ( subarg$ -- ) @@ -146,19 +184,28 @@ ." 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 + ." 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 + ." fixbbt[,<#blk>[,<blk#>]]" cr + ." same as full; however, bad blocks found are marked as bad" cr cr ; +: selftest-init ( -- ) \ Init variables per test + false to fixbbt? + 0 to #fixbbt + -1 to prev-eblock +; + : parse-selftest-args ( arg$ -- ) begin ( arg$ ) ascii ; left-parse-string ?dup if ( rem$ arg$' ) + selftest-init ( rem$ arg$' ) ascii , left-parse-string ( rem$ subarg$ method$ ) my-self ['] $call-method catch if ( rem$ x x x x x ) ." Unknown argument" cr @@ -179,6 +226,7 @@ selftest-args ?dup if parse-selftest-args else + selftest-init drop " " fast then free-test-bufs

1 0

r582 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Aug '07

28 Aug '07

Author: wmb Date: 2007-08-28 01:09:32 +0200 (Tue, 28 Aug 2007) New Revision: 582 Modified: cpu/x86/pc/olpc/nandstat.fth Log: nandstat.fth - Refactored the color names. Modified: cpu/x86/pc/olpc/nandstat.fth =================================================================== --- cpu/x86/pc/olpc/nandstat.fth 2007-08-27 23:08:11 UTC (rev 581) +++ cpu/x86/pc/olpc/nandstat.fth 2007-08-27 23:09:32 UTC (rev 582) @@ -25,6 +25,12 @@ dev screen : erase-screen erase-screen ; dend h# 80 h# 80 h# 80 rgb>565 constant bbt-color + 0 0 0 rgb>565 constant erased-color +h# ff 0 0 rgb>565 constant bad-color + 0 0 h# ff rgb>565 constant clean-color +h# ff h# ff 0 rgb>565 constant writing-color + 0 h# ff 0 rgb>565 constant written-color +h# ff h# ff h# ff rgb>565 constant starting-color : gshow-erasing ( #eblocks -- ) cursor-off " erase-screen" $call-screen 0 status-line at-xy @@ -33,21 +39,21 @@ " bbt0" $call-nand nand-pages/block / bbt-color show-state " bbt1" $call-nand nand-pages/block / bbt-color show-state - h# ff h# ff h# ff rgb>565 ( #eblocks color ) + starting-color ( #eblocks color ) swap 0 ?do i over show-state loop drop ; -: gshow-erased ( eblock# -- ) 0 0 0 rgb>565 show-state ; -: gshow-bad ( eblock# -- ) h# ff 0 0 rgb>565 show-state ; -: gshow-bbt ( eblock# -- ) h# 80 80 0 rgb>565 show-state ; -: gshow-clean ( eblock# -- ) h# 0 0 ff rgb>565 show-state ; +: gshow-erased ( eblock# -- ) erased-color show-state ; +: gshow-bad ( eblock# -- ) bad-color show-state ; +: gshow-bbt ( eblock# -- ) bbt-color show-state ; +: gshow-clean ( eblock# -- ) clean-color show-state ; : gshow-cleaning ( -- ) ." Cleanmarkers" cr cursor-on ; : gshow-writing ( #eblocks -- ) ." Writing " - h# ff h# ff 0 rgb>565 ( #eblocks color ) + writing-color ( #eblocks color ) 0 rot 0 ?do ( color eblock# ) dup nand-pages/block * " block-bad?" $call-nand 0= if ( color eblock# ) 2dup swap show-state ( color eblock# ) @@ -60,7 +66,7 @@ 2drop ; -: gshow-written ( eblock# -- ) 0 h# ff 0 rgb>565 show-state ; +: gshow-written ( eblock# -- ) written-color show-state ; : gshow ['] gshow-erasing to show-erasing

1 0

r581 - cpu/x86/pc/olpc dev/olpc/spiflash
by svn＠openbios.org 28 Aug '07

28 Aug '07

Author: wmb Date: 2007-08-28 01:08:11 +0200 (Tue, 28 Aug 2007) New Revision: 581 Modified: cpu/x86/pc/olpc/spiflash.bth dev/olpc/spiflash/flashec.fth Log: Added flash-ec to spiflash.dic Modified: cpu/x86/pc/olpc/spiflash.bth =================================================================== --- cpu/x86/pc/olpc/spiflash.bth 2007-08-27 23:07:37 UTC (rev 580) +++ cpu/x86/pc/olpc/spiflash.bth 2007-08-27 23:08:11 UTC (rev 581) @@ -3,17 +3,22 @@ command: &builder &this build-now -: null$ " " ; +\needs cdump : cdump ( adr len -- ) push-hex bounds ?do i c@ 3 u.r loop pop-base ; +\needs null$ : null$ " " ; + +h# fff0.0000 constant rom-pa + fload ${BP}/cpu/x86/pc/olpc/linuxserial.fth fload ${BP}/cpu/x86/ioports.fth \ I/O port access under Linux +alias root-map-in mmap ( phys len -- virt ) +alias root-map-out munmap ( virt len -- ) + fload ${BP}/cpu/x86/crc32.fth \ Assembly language Zip CRC calculation fload ${BP}/forth/lib/crc32.fth \ High-level portion of CRC calculation +fload ${BP}/forth/lib/wrtime.fth \ Time delays via the wrapper -: us ( microseconds -- ) drop ; -: ms ( milliseconds -- ) drop ; - : power-off ( -- ) " sync" $sh " kbc-on" eval ; hex @@ -30,6 +35,7 @@ fload ${BP}/dev/olpc/kb3700/ecserial.fth fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth fload ${BP}/dev/olpc/spiflash/spiui.fth +fload ${BP}/dev/olpc/spiflash/flashec.fth : os-fw-filename$ ( -- adr len ) " olpc.rom" ; @@ -63,7 +69,11 @@ ." Verification over the serial line is slow (17 minutes)" cr ." so you might want to skip it and let the" cr ." loaded image verify itself upon booting." cr + ." cr + ." flash-ec filename \ Programs the EC FLASH from the named file + + cr ; ' usage to title Modified: dev/olpc/spiflash/flashec.fth =================================================================== --- dev/olpc/spiflash/flashec.fth 2007-08-27 23:07:37 UTC (rev 580) +++ dev/olpc/spiflash/flashec.fth 2007-08-27 23:08:11 UTC (rev 581) @@ -2,11 +2,13 @@ \ This will cause the overall CRC near the end of the FLASH to be wrong, \ but that won't prevent the system from working. -.( EC FLASH Program. Example: ok flash-ec disk:\PQ2B31.bin) cr +\ .( EC FLASH Program. Example: ok flash-ec disk:\PQ2B31.bin) cr +h# 1.0000 constant /ec + : flash-ec ( "filename" -- ) reading - ec-buf /ec ifd @ fgets ( len ) + flash-buf /ec ifd @ fgets ( len ) ifd @ fclose /ec <> abort" EC image file is the wrong length" @@ -14,7 +16,7 @@ spi-start spi-identify .spi-id cr - merge-mfg-data + \ merge-mfg-data flash-buf /ec 0 write-flash-range \ Write everything ;

1 0

r580 - cpu/x86/pc/olpc/sdtools
by svn＠openbios.org 28 Aug '07

28 Aug '07

Author: wmb Date: 2007-08-28 01:07:37 +0200 (Tue, 28 Aug 2007) New Revision: 580 Modified: cpu/x86/pc/olpc/sdtools/dumpgamma.fth cpu/x86/pc/olpc/sdtools/maketar cpu/x86/pc/olpc/sdtools/sd.fth Log: Cleaned up the initialization of base addresses. Modified: cpu/x86/pc/olpc/sdtools/dumpgamma.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/dumpgamma.fth 2007-08-27 22:44:27 UTC (rev 579) +++ cpu/x86/pc/olpc/sdtools/dumpgamma.fth 2007-08-27 23:07:37 UTC (rev 580) @@ -5,7 +5,7 @@ \needs mmap fload ioports.fth hex -fe00.8000 4000 mmap constant vp-base +-1 value vp-base : vp@ ( reg -- l ) vp-base + l@ ; : vp! ( l reg -- ) vp-base + l! ; @@ -24,20 +24,16 @@ h# 8 +loop ; -fe00.4000 4000 mmap constant dc-base +-1 value dc-base : dc@ ( reg -- l ) dc-base + l@ ; : dc! ( l reg -- ) dc-base + l! ; -fe00.0000 4000 mmap constant gp-base +-1 value 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-08-27 22:44:27 UTC (rev 579) +++ cpu/x86/pc/olpc/sdtools/maketar 2007-08-27 23:07:37 UTC (rev 580) @@ -4,8 +4,10 @@ cp ../../../../../cpu/x86/build/builder.dic sdkit cp ../../../../../cpu/x86/ioports.fth sdkit cp ../../../../../cpu/x86/pc/olpc/mfgdata.fth sdkit +cp ../../../../../forth/lib/wrtime.fth sdkit cp ../../../../../dev/olpc/dcon/dconsmb.fth sdkit cp ../../../../../dev/olpc/kb3700/ecio.fth sdkit cp sd sd.fth ecdump.fth dumpgamma.fth sdkit +chmod 755 sdkit/sd tar cfz sdkit.tgz sdkit # rm sdkit/* Modified: cpu/x86/pc/olpc/sdtools/sd.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/sd.fth 2007-08-27 22:44:27 UTC (rev 579) +++ cpu/x86/pc/olpc/sdtools/sd.fth 2007-08-27 23:07:37 UTC (rev 580) @@ -21,30 +21,24 @@ usage hex -fe01.0000 4000 mmap constant sd +0 value sd-base -: sdl@ ( offset -- l ) sd + l@ ; -: sdw@ ( offset -- w ) sd + w@ ; -: sdb@ ( offset -- b ) sd + c@ ; +: sdl@ ( offset -- l ) sd-base + l@ ; +: sdw@ ( offset -- w ) sd-base + w@ ; +: sdb@ ( offset -- b ) sd-base + c@ ; -: sdl! ( l offset -- ) sd + l! ; -: sdw! ( w offset -- ) sd + w! ; -: sdb! ( b offset -- ) sd + c! ; +: sdl! ( l offset -- ) sd-base + l! ; +: sdw! ( w offset -- ) sd-base + w! ; +: sdb! ( b offset -- ) sd-base + c! ; : r ( offset -- ) sdl@ u. ; : w ( l offset -- ) sdl! ; -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 -: 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 ms fload wrtime.fth \needs dcon@ fload dconsmb.fth @@ -68,6 +62,15 @@ \needs ec@ fload ecio.fth \needs ec-range fload ecdump.fth +: map-io ( -- ) + h# fe01.0000 h# 4000 mmap to sd-base + h# fff0.0000 h# 10.0000 mmap to flash-base + h# fe00.8000 h# 4000 mmap to vp-base + h# fe00.4000 h# 4000 mmap to dc-base + h# fe00.0000 h# 4000 mmap to gp-base +; +map-io + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r579 - ofw/inetv6
by svn＠openbios.org 28 Aug '07

28 Aug '07

Author: lwalter Date: 2007-08-28 00:44:27 +0200 (Tue, 28 Aug 2007) New Revision: 579 Modified: ofw/inetv6/dhcpv6.fth ofw/inetv6/ipv6.fth ofw/inetv6/udpv6.fth Log: Get DNS ipv6 address from stateless DHCPv6 server if the router does not provide the info Modified: ofw/inetv6/dhcpv6.fth =================================================================== --- ofw/inetv6/dhcpv6.fth 2007-08-24 00:08:52 UTC (rev 578) +++ ofw/inetv6/dhcpv6.fth 2007-08-27 22:44:27 UTC (rev 579) @@ -36,7 +36,7 @@ 0 sfield do6-data \ Option data constant /do6-hdr -d# 1024 constant /dhcpv6-packet +d# 1024 constant max-dhcpv6-packet \ do6-code values \ 1 client ID @@ -55,14 +55,22 @@ d# 256 buffer: 'root-path d# 256 buffer: 'client-name d# 256 buffer: 'vendor-options + headers ' 'client-name " client-name" chosen-string ' 'vendor-options " vendor-options" chosen-string ' 'root-path " root-path" chosen-string : domain-name ( -- adr len ) 'domain-name cscount ; + +headerless +instance variable xid [then] -0 instance value dhcpv6-packet +headers + +0 instance value dhcp-pref \ DHCPv6 server preference +0 instance value dhcpv6-packet \ DHCPv6 packet to send +0 instance value dhcpv6-reply \ DHCPv6 packet received 0 instance value dhcpv6-len \ Actual length of received DHCPv6 packet 0 instance value dhcpv6-option \ Pointer to option field in dhcpv6-packet @@ -75,15 +83,13 @@ : op$! ( $ -- ) tuck dhcpv6-option swap move +dhcpv6-option ; : allocate-dhcpv6 ( size -- ) - allocate-udp dup is dhcpv6-packet set-struct + allocate-udpv6 dup is dhcpv6-packet set-struct set-dhcpv6-option - get-msecs start-time ! - \ Set "random" transaction ID and random number generator seed my-en-addr 2 + xl@ get-msecs xor dup xid ! rn ! ; -: free-dhcpv6 ( size -- ) dhcpv6-packet swap free-udp ; +: free-dhcpv6 ( size -- ) dhcpv6-packet swap free-udpv6 ; : init-dhcpv6 ( -- ) [ifndef] include-ipv4 @@ -101,23 +107,53 @@ ; previous definitions -: send-dhcpv6-packet ( size op -- ) - dh6-op c! - xid dh6-xid! - dhcpv6-packet swap client-port dhcpv6-port send-udpv6-packet +: .dhcpv6-err ( status -- ) + ?dup 0= if exit then + ." DHCPv6: " + case + 1 of ." unspecified failure" endof + 2 of ." no address available" endof + 3 of ." no binding" endof + 4 of ." not on-link" endof + 5 of ." use multicast" endof + ( otherwise ) ." unknown error: " dup u. + endcase + cr ; -: detect-dhcpv6-packet ( op -- timeout? ) +: process-dhcpv6-options ( adr len -- error? ) + begin dup 0> while + over be-w@ case \ Option code + 7 of over 4 + c@ to dhcp-pref endof \ Preference + d# 13 of over 4 + be-w@ dup .dhcpv6-err \ Reply status + if 2drop true exit then endof + d# 25 of over 4 + name-server-ipv6 copy-ipv6-addr endof \ RDNSS + endcase + over 2 + be-w@ 4 + /string \ Advance to next option + repeat 2drop false +; + +: receive-dhcpv6-packet ( op -- timeout? ) >r dhcpv6-timeout set-timeout begin client-port receive-udp-packet 0= while ( adr,len src-port ) - drop to dhcpv6-len set-struct -the-struct dhcpv6-len dump cr - dh6-xid@ xid @ h# ff.ffff = dh6-op c@ r@ = and if r> drop false exit then + drop to dhcpv6-len dup set-struct to dhcpv6-reply + dh6-xid@ xid @ h# ff.ffff and = dh6-op c@ r@ = and if r> drop false exit then repeat r> drop true ; +: detect-dhcpv6-packet ( op -- error? ) + receive-dhcpv6-packet ?dup if exit then + dh6-options dhcpv6-len /dhcpv6-hdr - process-dhcpv6-options +; + +: send-dhcpv6-packet ( size op -- ) + dh6-op c! + xid @ dh6-xid! + dhcpv6-packet swap client-port dhcpv6-port send-udpv6-packet +; + : option-client-id ( -- ) 1 opw! \ Client ID option /e 4 + opw! \ Option len @@ -151,16 +187,14 @@ ; : do-dhcpv6-stateless ( -- ) - ." DHCPv6 stateless auto configuration not supported yet" cr exit - bootnet-debug if - ." DHCPv6 protocol: Getting network information" cr + ." DHCPv6 protocol: Information Request" cr then - /dhcpv6-packet allocate-dhcpv6 + max-dhcpv6-packet allocate-dhcpv6 - ['] dhcpv6-req-info catch drop + ['] dhcpv6-req-info catch if indent ." Timeout waiting for requested info" cr then - /dhcpv6-packet free-dhcpv6 + max-dhcpv6-packet free-dhcpv6 ; : do-dhcpv6-stateful ( -- ) Modified: ofw/inetv6/ipv6.fth =================================================================== --- ofw/inetv6/ipv6.fth 2007-08-24 00:08:52 UTC (rev 578) +++ ofw/inetv6/ipv6.fth 2007-08-27 22:44:27 UTC (rev 579) @@ -78,7 +78,6 @@ /ipv6 buffer: my-ipv6-addr-global /ipv6 buffer: router-ipv6-addr /ipv6 buffer: name-server-ipv6 -/ipv6 buffer: dhcp-ipv6-addr headerless @@ -107,6 +106,7 @@ >r r@ his-ipv6-addr-mc-sol-node ipv6= \ His solicited node address? r@ ipv6-addr-mc-all-nodes ipv6= or \ Multicast all-nodes? + r@ ipv6-addr-mc-all-dhcp ipv6= or \ Multicast all-dhcp? r> ipv6-addr-mc-all-routers ipv6= or \ Multicast all-routers? ; : my-ipv6-addr-mc? ( adr-buf -- flag ) Modified: ofw/inetv6/udpv6.fth =================================================================== --- ofw/inetv6/udpv6.fth 2007-08-24 00:08:52 UTC (rev 578) +++ ofw/inetv6/udpv6.fth 2007-08-27 22:44:27 UTC (rev 579) @@ -29,18 +29,18 @@ /udpv6-pseudo-hdr instance buffer: udpv6-pseudo-hdr \ Assumes the-struct is the UDP packet. -: fill-udpv6-pseudo-hdr ( -- ) +: fill-udpv6-pseudo-hdr ( his-ipv6 my-ipv6 -- ) /ipv6-header negate +struct udpv6-pseudo-hdr ( udp-pseudo-addr ) - my-ipv6-addr over udpv6-src-addr copy-ipv6-addr ( udp-pseudo-addr ) - his-ipv6-addr over udpv6-dst-addr copy-ipv6-addr ( udp-pseudo-addr ) + tuck ( my-ipv6-addr ) udpv6-src-addr copy-ipv6-addr ( udp-pseudo-addr ) + tuck ( his-ipv6-addr ) udpv6-dst-addr copy-ipv6-addr ( udp-pseudo-addr ) IP_HDR_UDP over udpv6-protocol-id xl! ( udp-pseudo-addr ) /ipv6-header +struct ( udp-pseudo-addr ) udp-length xw@ swap udpv6-len-copy xl! ( ) ; \ Assumes the-struct is the UDP packet. -: calc-udpv6-checksum ( -- checksum ) +: calc-udpv6-checksum ( his-ipv6 my-ipv6 -- checksum ) fill-udpv6-pseudo-hdr 0 udpv6-pseudo-hdr /udpv6-pseudo-hdr (oc-checksum) ( cksum ) 0 udp-checksum xw! @@ -54,7 +54,8 @@ /udp-header + dup udp-length xw! ( udp-len ) 0 udp-checksum xw! ( udp-len ) - calc-udpv6-checksum udp-checksum xw! ( udp-len ) + his-ipv6-addr my-ipv6-addr calc-udpv6-checksum udp-checksum xw! + ( udp-len ) the-struct swap IP_HDR_UDP send-ipv6-packet ( ) ; @@ -76,10 +77,15 @@ ; headerless +\ XXX Assume no extra IPv6 headers : bad-udpv6-checksum? ( -- bad? ) - udp-checksum xw@ dup if ( checksum ) - calc-udpv6-checksum <> ( bad? ) - then ( bad? ) + udp-checksum xw@ dup if ( checksum ) + the-struct dup >r ( checksum ) ( R: udp ) + /ipv6-header - set-struct ( checksum ) ( R: udp ) + ipv6-source-addr ipv6-dest-addr ( checksum his-ipv6 my-ipv6 ) ( R: udp ) + r> set-struct ( checksum his-ipv6 my-ipv6 ) + calc-udpv6-checksum <> ( bad? ) + then ( bad? ) ; : lock-udpv6-address ( -- ) lock-ipv6-address ;

1 0

.bin?
by Duane Ryan 27 Aug '07

27 Aug '07

I'm looking for a .bin file for ppc for the purpose of using it as a qemu bios (openhackware is broken). However, there are a few problems. 1, there isn't an ppc target. You list it in your readme as a target, but the rules.xml/config.xml for ppc don't exist, and I can't build a cross compiler. So, is there a previously built openbios image? Cheers, -Duane

4 4

r578 - cpu/x86/build
by svn＠openbios.org 24 Aug '07

24 Aug '07

Author: wmb Date: 2007-08-24 02:08:52 +0200 (Fri, 24 Aug 2007) New Revision: 578 Modified: cpu/x86/build/builder.dic Log: Rebuilt builder.dic with the change in r576. Modified: cpu/x86/build/builder.dic =================================================================== (Binary files differ)

1 0

r577 - ofw/fs/fatfs
by svn＠openbios.org 24 Aug '07

24 Aug '07

Author: wmb Date: 2007-08-24 01:34:38 +0200 (Fri, 24 Aug 2007) New Revision: 577 Modified: ofw/fs/fatfs/partition.fth Log: Followup to r564 - Tighter heuristic for detecting the presence of a partition map; the old one was treating boot code as partition info. This new one also requires a couple of specific values (0 or 80) in the bootable byte. Modified: ofw/fs/fatfs/partition.fth =================================================================== --- ofw/fs/fatfs/partition.fth 2007-08-23 23:31:44 UTC (rev 576) +++ ofw/fs/fatfs/partition.fth 2007-08-23 23:34:38 UTC (rev 577) @@ -17,8 +17,12 @@ \ using fdisk and mkdosfs under Linux. It is too easy to run mkdosfs on \ the overall disk (not the partition). : unpartitioned? ( -- flag ) - sector-buf h# 1fe + le-w@ h# aa55 <> - sector-buf h# 1c6 + le-l@ 0= or + \ In partition maps, the status byte is 0 (not bootable) or 80 (bootable) + sector-buf h# 1be + c@ h# 7f and 0<> ( unpartitioned? ) + \ and the end of the sector contains a signature + sector-buf h# 1fe + le-w@ h# aa55 <> or ( unpartitioned?' ) + \ and the first partition entry has a non0 starting sector number + sector-buf h# 1c6 + le-l@ 0= or ( unpartitioned?' ) ; : ptable-bounds ( -- end start ) sector-buf h# 1be + h# 40 bounds ;

1 0