OpenBIOS January 2008

openbios@openbios.org

11 participants
52 discussions

r777 - cpu/x86
by svn＠openbios.org 17 Jan '08

17 Jan '08

Author: wmb Date: 2008-01-17 10:17:08 +0100 (Thu, 17 Jan 2008) New Revision: 777 Modified: cpu/x86/assem.fth cpu/x86/disassem.fth Log: x86 assembler/disassembler - Fixed several bugs in 16-bit mode. Modified: cpu/x86/assem.fth =================================================================== --- cpu/x86/assem.fth 2008-01-12 17:22:24 UTC (rev 776) +++ cpu/x86/assem.fth 2008-01-17 09:17:08 UTC (rev 777) @@ -119,7 +119,7 @@ 10 2 32REGS [EAX] [ECX] [EDX] [EBX] [ESP] [EBP] [ESI] [EDI] 3 2 pmREGS [AX] [CX] [DX] - 2 4 pmreg [SP] + 2 4 32reg [SP] 6 3 REGS ES CS SS DS FS GS 3 4 REGS # #) S#) @@ -240,7 +240,7 @@ \ Assemble mod-r/m byte and s-i-b byte if necessary : SOP, ( mr rmid mod -- ) - protected? if + 16bit? 0= if 2 pick [SIB] = if ( [SIB] rmid mod ) [ESP] -rot mod-rm, ( [SIB] ) \ Scaled index mode drop ( ) @@ -263,11 +263,11 @@ \ (nonexistent) "<no-displacement> [EBP]" mode. OVER #) = IF - protected? if 5 else 6 then + 16bit? if 6 else 5 then swap 0 mod-rm, DROP ADR, EXIT THEN ( disp mr rmid ) - protected? if + 16bit? 0= if \ Special case for "0 [EBP]" ; use short 0 displacement \ instead of [EBP] (there is no [EBP] addressing mode \ because that encoding is used for 32-bit displacement.) @@ -329,6 +329,8 @@ \ 2MI define ascii adjust instructions. : 2MI CREATE C, DOES> C@ ASM8, 12 ASM8, normal ; +: prefix-0f h# 0f asm8, ; + \ 3MI define branch instructions, with one or two bytes of offset. : 3MI \ conditional branches ( op -- ) create c, @@ -337,7 +339,7 @@ dup small? if ( op disp8 ) swap asm8, asm8, else ( op disp ) - h# 0f asm8, swap h# 10 + asm8, + prefix-0f swap h# 10 + asm8, real? if 2 else 4 then - adr, then normal @@ -345,7 +347,7 @@ \ 4MI define LDS, LEA, LES instructions. : 4MI CREATE C, - DOES> C@ dup h# b2 h# b5 between if h# 0f asm8, then ASM8, MEM, + DOES> C@ dup h# b2 h# b5 between if prefix-0f then ASM8, MEM, normal ; @@ -455,7 +457,7 @@ ELSE ( dst apf ) 1+ OVER SEG? IF ( dst apf' ) \ Segment register OVER FS >= IF ( dst apf' ) \ FS or GS - H# 0F ASM8, 3 + C@ ( dst opcode ) + prefix-0f 3 + C@ ( dst opcode ) SWAP GS = IF 10 OR THEN ( opcode' ) ASM8, ( ) ELSE ( dst apf' ) \ CS, DS, ES, or SS @@ -528,7 +530,7 @@ 2 1 15mi lgdt 3 1 15mi lidt 2 0 15mi lldt 3 0 15mi ltr \ LSS, LFS, LGS -: 16MI CREATE C, DOES> C@ H# 0F ASM8, ASM8, MEM, normal ; +: 16MI CREATE C, DOES> C@ prefix-0f ASM8, MEM, normal ; \ TEST bits in dest : TEST (S source dest -- ) @@ -580,7 +582,7 @@ \ 0x22 for normal->special direction, 0x20 for special->normal direction \ or with 0 for CRx, 1 for DRx, 4 for TRx : special-mov ( s d -- ) - h# 0f asm8, + prefix-0f [ also forth ] dup spec? if h# 22 else swap h# 20 then ( norm-reg spec-reg opcode ) over o# 7000 and case @@ -634,6 +636,10 @@ ; : MOV (MOV) normal ; +\ Use "byte movsx" for the r8 form, "movsx" for the r16 form +: movsx ( r/m r -- ) prefix-0f h# be size, r/m, ; +: movzx ( r/m r -- ) prefix-0f h# b6 size, r/m, ; + \ Most instructions are defined here. Those mnemonics in \ parenthetic comments are defined earlier or not at all. @@ -681,12 +687,12 @@ 9B 1MI WAIT ( XCHG ) D7 1MI XLAT 30 13MI XOR C2 14MI +RET -: invd ( -- ) h# 0f asm8, h# 08 asm8, ; -: wbinvd ( -- ) h# 0f asm8, h# 09 asm8, ; -: 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 +: invd ( -- ) prefix-0f h# 08 asm8, ; +: wbinvd ( -- ) prefix-0f h# 09 asm8, ; +: wrmsr ( -- ) prefix-0f h# 30 asm8, ; +: rdtsc ( -- ) prefix-0f h# 31 asm8, ; +: rdmsr ( -- ) prefix-0f h# 32 asm8, ; +: cpuid ( -- ) prefix-0f h# a2 asm8, ; \ Arg in %eax, results in ax,bx,dx,cx \ Structured Conditionals \ single pass forces fixed size. optimize for small, fast structures: @@ -720,7 +726,7 @@ drop here 2+ + ( addr ) #) jmp else - h# 0f asm8, h# 10 + asm8, ( offset ) + prefix-0f h# 10 + asm8, ( offset ) real? if 2 else 4 then - adr, then then @@ -739,7 +745,7 @@ dup h# eb = if drop h# e9 asm8, else - h# 0f asm8, h# 10 + asm8, + prefix-0f h# 10 + asm8, then real? if 0 asm16, else 0 asm32, then else Modified: cpu/x86/disassem.fth =================================================================== --- cpu/x86/disassem.fth 2008-01-12 17:22:24 UTC (rev 776) +++ cpu/x86/disassem.fth 2008-01-17 09:17:08 UTC (rev 777) @@ -28,7 +28,7 @@ true value op32? : opv@ ( -- l | w ) op32? if op32@ else op16@ then ; true value ad32? -: adv@ ( -- l | w ) ad32? if op32@ else op16@ wext then ; +: adv@ ( -- l | w ) ad32? if op32@ else op16@ then ; : dis16 ( -- ) false is op32? false is ad32? ; : dis32 ( -- ) true is op32? true is ad32? ; \ XXX We should also change the register names e.g. from "eax" to "ax" @@ -60,7 +60,7 @@ case 0 of " " exit endof 1 of op8@ bext dup 0>= if ?+ then endof - 2 of ?+ adv@ endof + 2 of ?+ adv@ wext endof endcase (u.) disp-buf pack count ; @@ -80,7 +80,7 @@ ," eax" ," ecx" ," edx" ," ebx" ," esp" ," ebp" ," esi" ," edi" end-string-array -: >reg ( -- adr len ) >regw count ; +: >reg ( -- adr len ) >regw count op32? 0= if 1 /string then ; : >greg ( -- adr len ) wbit if >reg else >reg8 count then ; @@ -101,8 +101,10 @@ >scale count $add-text ( ) then ( ) ; +: .[ " [" $add-text ; +: .] " ]" $add-text ; : add-disp ( sib? reg mod -- ) - " [" $add-text ( sib? reg mod ) + .[ ( sib? reg mod ) 2dup 0<> swap 5 <> or if ( sib? reg mod ) \ D32 swap >reg $add-text ( sib? mod ) else ( sib? reg mod ) @@ -110,9 +112,53 @@ then ( sib? mod ) swap if get-scaled then ( mod ) get-disp $add-text ( ) - " ]" $add-text ( ) + .] ( ) ; +: .ea32 ( reg mod -- ) + >r ( reg r: mod ) + dup 4 = if ( reg ) \ s-i-b + drop get-op true lowbits ( true reg ) + else ( reg ) \ displaced + false swap ( false reg ) + then ( sib? reg ) + r> add-disp +; + +string-array modes16 + ," [bx+si]" + ," [bx+di]" + ," [bp+si]" + ," [bp+di]" + ," [si]" + ," [di]" + ," [bp]" + ," [bx]" +end-string-array + +: add-disp16 ( disp -- ) + h# ffff and (u.) disp-buf pack count $add-text +; +: +disp16 ( disp -- ) + dup 0< if + " -" $add-text negate + else + " +" $add-text + then + add-disp16 +; + +: .ea16 ( reg mod -- ) + over 6 = over 0= and if ( reg mod ) + \ disp16 only, takes the place of the [bp] mode + 2drop op16@ .[ add-disp16 .] exit + then ( reg mod ) + swap modes16 count $add-text ( mod ) + case + 1 of op8@ +disp16 endof + 2 of op16@ +disp16 endof + endcase +; : .ea ( -- ) " " ea-text place lowbits hibits >r ( reg ) ( r: mod ) @@ -120,12 +166,7 @@ >greg $add-text ( ) r> drop ea-text ". exit then ( reg ) - dup 4 = if ( reg ) \ s-i-b - drop get-op true lowbits ( true reg ) - else ( reg ) \ displaced - false swap ( false reg ) - then ( sib? reg ) - r> add-disp + r> ad32? if .ea32 else .ea16 then ea-text ". ; : ,ea ( -- ) ., .ea ; @@ -133,7 +174,7 @@ \ Display formatting variable start-column -: op-col ( -- ) start-column @ d# 8 + #out @ - 0 max spaces ; +: op-col ( -- ) start-column @ d# 9 + #out @ - 1 max spaces ; string-array >segment ," es" ," cs" ," ss" ," ds" ," fs" ," gs" @@ -164,7 +205,7 @@ : iub ( -- ) op8@ (.) type ; : iw ( -- ) op16@ (.) type ; : iv ( -- ) opv@ (.) type ; -: iuv ( -- ) opv@ (u.) type ; +: iuv ( -- ) adv@ (u.) type ; : ,ib/v ( -- ) ., wbit if opv@ else op8@ then (u.) type ; : al/x ( -- ) wbit if ." eax" else ." al" then ; : ,al/x ( -- ) ., al/x ; @@ -186,8 +227,18 @@ ," s" ," ns" ," pe" ," po" ," l" ," ge" ," le" ," g" end-string-array -: jb ( -- ) op8@ bext pc @ + dup branch-target ! showaddr ; -: jv ( -- ) adv@ pc @ + dup branch-target ! showaddr ; +: showbranch ( offset -- ) + pc @ ad32? if ( offset pc ) + + ( pc' ) + else ( offset pc ) + lwsplit -rot ( pc.high offset pc.low ) + + h# ffff and ( pc.high pc.low' ) + swap wljoin ( pc' ) + then ( pc' ) + dup branch-target ! showaddr +; +: jb ( -- ) op8@ bext showbranch ; +: jv ( -- ) adv@ showbranch ; : .jcc ( -- ) ." j" low4bits >cond ". op-col jb ; : ea,g ( -- ) get-ea .ea ., gb/v ; @@ -404,7 +455,12 @@ endcase ; -: ap ( -- ) adv@ ." far " op16@ .x ." :" showaddr ; +: .4x ( n -- ) push-hex <# u# u# u# u# u#> type pop-base ; +: ap ( -- ) + adv@ ." far " + op16@ push-hex (.) type pop-base + ." :" ad32? if showaddr else .4x then +; string-array >8line-ops ," cwde" ," cdq" ," call" ," wait" ," pushfd" ," popfd" ," sahf" ," lahf"

1 0

r776 - clients/lib/x86
by svn＠openbios.org 12 Jan '08

12 Jan '08

Author: wmb Date: 2008-01-12 18:22:24 +0100 (Sat, 12 Jan 2008) New Revision: 776 Modified: clients/lib/x86/makefile Log: Client demo "hello" makefile - added cc flags to force 32 bit compilation. Modified: clients/lib/x86/makefile =================================================================== --- clients/lib/x86/makefile 2008-01-07 09:31:33 UTC (rev 775) +++ clients/lib/x86/makefile 2008-01-12 17:22:24 UTC (rev 776) @@ -3,7 +3,7 @@ # -fno-builtin has the effect of suppressing some warnings about # functions that conflict with gcc builtins CC=gcc -CFLAGS=-g -fno-builtin +CFLAGS=-g -m32 -fno-builtin -fno-stack-protector all: libobp.a hello hello.elf start.o @@ -56,13 +56,16 @@ # Hello is a demo program that uses the stdio library hello.elf: libobp.a start.o hello.o - ld -Bstatic -N -Ttext 0x100000 -o $@ start.o hello.o libobp.a -lc + ld -melf_i386 -Bstatic -N -Ttext 0x100000 -o $@ start.o hello.o libobp.a -lc cp hello.elf hello.syms strip hello.elf hello.o: ../../hello/hello.c ${CC} ${CFLAGS} -c ../../hello/hello.c +hello: hello.o + ${CC} -m32 $< -o $@ + # Binary to ELF converter program bintoelf: ../bintoelf.c

1 0

open BIOS for SM722 Graphics controller(Linux)
by mahendra varman 10 Jan '08

10 Jan '08

Hi I have a SM722 graphics controller based PMC card . At present Iam using the card with a base board which contains Powerpc processor. The card need to be mounted with a BIOS chip.. I have contacted Siliconmotion they have only Bios file of x86 based .. Is there any open bios available which supports SM722 basic bios setup and that supports powerpc processor for Linux? Help me on the above Thanks

2 2

r775 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Jan '08

07 Jan '08

Author: wmb Date: 2008-01-07 10:31:33 +0100 (Mon, 07 Jan 2008) New Revision: 775 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D08 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-01-07 09:10:33 UTC (rev 774) +++ cpu/x86/pc/olpc/versions.fth 2008-01-07 09:31:33 UTC (rev 775) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 07 +macro: FW_MINOR 08 \ The EC microcode macro: EC_VERSION test4e @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.20.p42 +macro: WLAN_VERSION 5.110.20.p49 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

r774 - cpu/x86/pc/olpc dev/olpc/cafenand ofw/core
by svn＠openbios.org 07 Jan '08

07 Jan '08

Author: wmb Date: 2008-01-07 10:10:33 +0100 (Mon, 07 Jan 2008) New Revision: 774 Modified: cpu/x86/pc/olpc/gamekeys.fth dev/olpc/cafenand/selftest.fth ofw/core/ofwcore.fth Log: OLPC trac 5853 - more improvements in selftest display: 1) Added the ability to pause the test-all progress by holding down the "rotate" game button 2) Noted in the nandflash test that a few bad blocks is normal Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2008-01-05 23:48:04 UTC (rev 773) +++ cpu/x86/pc/olpc/gamekeys.fth 2008-01-07 09:10:33 UTC (rev 774) @@ -44,3 +44,20 @@ then ; : game-key? ( mask -- flag ) game-key-mask and 0<> ; + +: (hold-message) ( ms -- ) + d# 100 / ( decisecs ) + begin dup while ( decisecs ) + dup d# 10 /mod swap if drop else (cr .d then ( decisecs ) + d# 100 ms ( decisecs ) + 1- ( decisecs ) + button-rotate game-key@ and if ( decisecs ) + (cr ." Release the game button to continue" + begin button-rotate game-key@ and while d# 100 ms repeat + (cr kill-line + drop exit + then + repeat + drop (cr kill-line +; +' (hold-message) to hold-message Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2008-01-05 23:48:04 UTC (rev 773) +++ dev/olpc/cafenand/selftest.fth 2008-01-07 09:10:33 UTC (rev 774) @@ -17,9 +17,10 @@ : #fixbbt++ ( -- ) #fixbbt 1+ to #fixbbt ; : .#fixbbt ( -- ) - (cr ." # bad blocks " - fixbbt? if ." marked" else ." found" then - ." = " #fixbbt .d cr + (cr + #fixbbt ?dup if .d else ." No " then + ." new bad blocks " + fixbbt? if ." marked" else ." found" then cr ; : record-err ( error? -- ) noop @@ -305,6 +306,7 @@ : selftest ( -- error? ) open 0= if true exit then get-msecs rn ! + ." Note: a few bad blocks is normal - these are already known:" cr show-bbt cr (selftest) close Modified: ofw/core/ofwcore.fth =================================================================== --- ofw/core/ofwcore.fth 2008-01-05 23:48:04 UTC (rev 773) +++ ofw/core/ofwcore.fth 2008-01-07 09:10:33 UTC (rev 774) @@ -3193,6 +3193,9 @@ ['] do-method? scan-subtree ; +defer hold-message +' ms to hold-message + : most-tests ( -- ) method-name 2@ current-device (search-wordlist) if ( xt ) @@ -3212,19 +3215,20 @@ execute-phandle-method if ( result ) ?dup if red-letters - ??cr ." Selftest failed. Return code = " .d cr cr - d# 10000 ms + ??cr ." Selftest failed. Return code = " .d cr black-letters + d# 10000 hold-message else green-letters - ." Okay" cr cr d# 3000 ms + ." Okay" cr black-letters + d# 2000 hold-message then else red-letters ." Selftest failed due to abort" cr - d# 10000 ms black-letters + d# 10000 hold-message then then ( ) ;

1 0

r773 - ofw/inet
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:48:04 +0100 (Sun, 06 Jan 2008) New Revision: 773 Modified: ofw/inet/pop3.fth Log: UI improvements in the POP3 demonstration code (not used by most builds). Modified: ofw/inet/pop3.fth =================================================================== --- ofw/inet/pop3.fth 2008-01-05 23:45:20 UTC (rev 772) +++ ofw/inet/pop3.fth 2008-01-05 23:48:04 UTC (rev 773) @@ -33,13 +33,24 @@ : send-one ( $ -- ok? ) >mail-buffer " +OK" send ( ok? ) ; : send-two ( $2 $1 -- ok? ) >mail-buffer mail-append " +OK" send ( ok? ) ; -: send-user-name ( -- ok? ) - " pop-user" $getenv drop ( adr len ) - " USER " send-two ( ok? ) +: get-password ( -- adr len ) + pad 0 + begin ( adr len ) + key case + carret of exit then + bs of 1- 0 max 2dup + 0 swap c! then + + \ default ( adr len char ) + over d# 32 >= abort" Password too long" ( adr len char ) + 3dup -rot + c! ( adr len char ) + swap 1+ swap ( adr len' char ) + endcase ( adr len ) + again ; : send-password ( -- ok? ) - " pop-password" $getenv drop ( adr len ) - " PASS " send-two ( ok? ) + ." Password: " get-password ( adr len ) + 2dup " PASS " send-two ( adr len ok? ) + -rot erase \ Don't leak password ( ok? ) ; : number? ( b -- ascii? ) @@ -73,12 +84,12 @@ while d# 10 * pop3-buf tbuf-ptr + c@ h# 0f and + - +pop3-buf + +tbuf repeat ( # ) ; : get-num ( -- ) - 0 to pop3-buf-ptr + 0 to tbuf-ptr begin begin key? until key dup emit ( key ) @@ -166,61 +177,36 @@ quit-mail drop ; -: rmail ( -- ) +: open-rmail-connection ( server$ -- ) + debug-mail? if ." Opening TCP stack..." cr then ( server$ ) - false + " tcp" open-dev to tcp-ih ( server$ ) + tcp-ih 0= abort" Failed to open tcp stack!" ( server$ ) - " pop-server" $getenv if - cr - ." Missing pop-server environment variable" cr - ." Use ""$setenv"" to set the pop-server name:" cr - ." "" <servername>"" "" pop-server"" $setenv" cr - drop true - else 2drop then - - " pop-user" $getenv if - cr - ." Missing pop-user environment variable" cr - ." Use ""$setenv"" to set the pop-user name:" cr - ." "" <username>"" "" pop-user"" $setenv" cr - drop true - else 2drop then - - " pop-password" $getenv if - cr - ." Missing pop-password environment variable" cr - ." Use ""$setenv"" to set the pop-password name:" cr - ." "" <password>"" "" pop-password"" $setenv" cr - drop true - else 2drop then - - if exit then - - debug-mail? if ." Opening TCP stack..." cr then - - " tcp" open-dev to tcp-ih - tcp-ih 0= if ." Failed to open tcp stack!" exit then - - allocate-mail-buffer + allocate-mail-buffer ( server$ ) - " pop-server" $getenv drop open-pop3-connection 0= if - close-pop3 exit + open-pop3-connection 0= if ( ) + ." Can't connect to POP3 server" + close-pop3 abort then debug-mail? if ." Connection established" cr then verify-pop3 0= if debug-mail? if ." Connection did not verify" cr then - close-pop3 exit + close-pop3 abort then +; +: authenticate-rmail ( user$ -- ) debug-mail? if ." Sending USER name..." cr then - send-user-name if + + " USER " send-two if debug-mail? if ." USER accepted" cr then else debug-mail? if ." Bad USER" cr then close-pop3 - exit + abort then debug-mail? if ." Sending password..." cr then @@ -229,9 +215,14 @@ else debug-mail? if ." Bad Password" cr then close-pop3 - exit + abort then +; +: (rmail) ( user$ server$ -- ) + open-rmail-connection ( user$ ) + authenticate-rmail ( ) + debug-mail? if ." Getting status..." cr then 0 to #messages get-status if @@ -247,17 +238,10 @@ close-pop3 ; -: (show-pop3) ( adr len -- ) - 2dup $getenv if missing-var else - 2swap type ." : " type cr - then +: rmail ( "server" "user" -- ) + safe-parse-word safe-parse-word 2swap (rmail) ; -: show-pop3 ( -- ) - " pop-server" (show-pop3) - " pop-user" (show-pop3) - " pop-password" (show-pop3) -; \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r772 - dev/usb2/device/wlan
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:45:20 +0100 (Sun, 06 Jan 2008) New Revision: 772 Modified: dev/usb2/device/wlan/usb8388.fth Log: OLPC wireless LAN driver - added some status report message text for previously-undefined message codes. Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2008-01-05 23:43:26 UTC (rev 771) +++ dev/usb2/device/wlan/usb8388.fth 2008-01-05 23:45:20 UTC (rev 772) @@ -392,8 +392,12 @@ : process-ind ( adr len -- ) drop 4 + le-l@ case - h# 03 of " Link Loss" .event process-disconnect endof + h# 00 of " Tx PPA Free" .event endof \ n + h# 01 of " Tx DMA Done" .event endof \ n + h# 02 of " Link Loss with scan" .event process-disconnect endof + h# 03 of " Link Loss no scan" .event process-disconnect endof h# 04 of " Link Sensed" .event endof + h# 05 of " CMD Finished" .event endof h# 06 of " MIB Changed" .event endof h# 07 of " Init Done" .event endof h# 08 of " Deauthenticated" .event process-disconnect endof @@ -402,6 +406,7 @@ h# 0b of " Sleep" .event process-wakeup endof h# 0d of " Multicast MIC error" .event process-gmic-failure endof h# 0e of " Unicast MIC error" .event process-pmic-failure endof + h# 0e of " WM awake" .event endof \ n h# 11 of " HWAC - adhoc BCN lost" .event endof h# 19 of " RSSI low" .event endof h# 1a of " SNR low" .event endof @@ -410,6 +415,7 @@ h# 1d of " SNR high" .event endof h# 23 of endof \ Suppress this; the user doesn't need to see it \ h# 23 of ." Mesh auto-started" endof + h# 30 of " Firmware ready" .event endof ( default ) ." Unknown " dup u. endcase ; @@ -1057,7 +1063,7 @@ outbuf-bulk-out if false exit then wait-cmd-resp if false exit then - respbuf >fw-data 2 + le-w@ ?dup if + respbuf >fw-data 2 + le-w@ ?dup if \ This is the IEEE Status Code ." Failed to associate: " u. cr false else

1 0

r771 - cpu/x86/pc/olpc
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:43:26 +0100 (Sun, 06 Jan 2008) New Revision: 771 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC security - Guard some game-key functions against unexpected aborts, just in case. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-05 23:41:28 UTC (rev 770) +++ cpu/x86/pc/olpc/fw.bth 2008-01-05 23:43:26 UTC (rev 771) @@ -512,19 +512,26 @@ : ?games ( -- ) rocker-right game-key? if ec-indexed-io-off - time&date 5drop 1 and if pong else life-demo then + time&date 5drop 1 and if + ['] pong guarded + else + ['] life-demo guarded + then + power-off then ; : ?diags ( -- ) rocker-left game-key? if ec-indexed-io-off - text-on " test-all" eval + text-on " test-all" ['] eval guarded ." Tests complete - powering off" cr d# 5000 ms power-off then ; : ?scan-nand ( -- ) - rocker-up game-key? if ec-indexed-io-off text-on scan-nand then + rocker-up game-key? if + ec-indexed-io-off text-on ['] scan-nand guarded + then ; : ?fs-update ( -- ) button-check button-x or button-o or button-square or ( mask )

1 0

r770 - dev/olpc/cafenand
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:41:28 +0100 (Sun, 06 Jan 2008) New Revision: 770 Modified: dev/olpc/cafenand/cafenand.fth dev/olpc/cafenand/selftest.fth Log: OLPC trac 5868 - Preserve extra (non-ECC) out of band data when restoring tested blocks in the /nandflash selftest. Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2008-01-05 23:37:48 UTC (rev 769) +++ dev/olpc/cafenand/cafenand.fth 2008-01-05 23:41:28 UTC (rev 770) @@ -260,14 +260,13 @@ ; [then] -: dma-write-raw ( adr len page# offset -- ) +: dma-write-raw ( adr len page# offset -- error? ) write-enable ( adr len page# offset ) set-page ( adr len ) dup false dma-setup ( ) write-cmd h# 110 cmd wait-cmd ( ) wait-write-done ( error? ) dma-release ( error? ) - drop ; : dma-write-page ( adr page# -- error? ) \ Size is fixed @@ -283,14 +282,15 @@ : write-bytes ( adr len page# offset -- error? ) pio-write-raw ; 3 value #erase-adr-bytes \ Chip dependent -: erase-block ( page# -- ) +: (erase-block) ( page# -- error? ) write-enable set-erase-page h# 20.0060 0 #erase-adr-bytes >cmd h# 1d0 cmd wait-write-done ( error? ) - drop ; +: erase-block ( page# -- ) (erase-block) drop ; + : read-id ( -- adr ) 8 0 0 h# c420.0090 0 generic-read ; : send-reset-cmd ( -- ) Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2008-01-05 23:37:48 UTC (rev 769) +++ dev/olpc/cafenand/selftest.fth 2008-01-05 23:41:28 UTC (rev 770) @@ -13,6 +13,8 @@ false value fixbbt? \ Flag to determine whether to mark bad eblocks false value selftest-err? \ Selftest result +: /oobbuf ( -- n ) /oob pages/eblock * ; + : #fixbbt++ ( -- ) #fixbbt 1+ to #fixbbt ; : .#fixbbt ( -- ) (cr ." # bad blocks " @@ -32,11 +34,13 @@ then ; +0 value oobbuf \ Original content of OOB 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 + /oobbuf alloc-mem to oobbuf erase-size alloc-mem to sbuf erase-size alloc-mem to obuf erase-size alloc-mem to ibuf @@ -44,6 +48,7 @@ ; : free-test-bufs ( -- ) sbuf if + oobbuf /oobbuf free-mem 0 to oobbuf sbuf erase-size free-mem 0 to sbuf obuf erase-size free-mem 0 to obuf ibuf erase-size free-mem 0 to ibuf @@ -54,10 +59,70 @@ dup if ." SAVE" cr then ; : write-eblock ( adr page# -- error? ) - dup erase-block - pages/eblock write-blocks pages/eblock <> - dup if ." RESTORE" cr then + dup (erase-block) if 2drop true exit then ( adr page# ) + over /eblock erased? if ( adr page# ) + 2drop false + else ( adr page# ) + pages/eblock write-blocks pages/eblock <> + dup if ." RESTORE" cr then + then ; + +: read-raw-eblock ( adr page# -- error? ) + pages/eblock bounds ?do ( adr ) + dup /dma-buf i 0 dma-write-raw if ( adr ) + drop true unloop exit + then + /dma-buf + + loop ( adr ) + drop false +; + +: save-eblock ( page# -- error? ) + sbuf over read-eblock dup record-err if ( page# ) + drop true exit + then ( page# ) + oobbuf swap ( adr page# ) + pages/eblock bounds ?do ( adr ) + dup /oob i /page pio-read ( adr ) + /oob + ( adr' ) + loop ( adr ) + drop false +; +: berased? ( adr len -- flag ) + bounds ?do + i c@ h# ff <> if false unloop exit then + loop + true +; +: restore-eblock ( page# -- ) + sbuf over write-eblock dup record-err if ( page# ) + drop exit ( page# ) + then ( page# ) + + oobbuf /ecc + swap ( adr page# ) + pages/eblock bounds ?do ( adr ) + dup /oob /ecc - berased? 0= if ( adr ) + dup /oob /ecc - i /page /ecc + ( adr adr len page# offset ) + pio-write-raw record-err ( adr ) + then ( adr ) + /oob + ( adr' ) + loop ( adr ) + drop ( ) +; + + + +: write-raw-eblock ( adr page# -- error? ) + dup (erase-block) if 2drop true exit then ( adr page# ) + pages/eblock bounds ?do ( adr ) + dup /dma-buf i 0 dma-write-raw if ( adr ) + drop true unloop exit + then + /dma-buf + + loop ( adr ) + drop false +; : test-eblock ( page# pattern -- error? ) obuf erase-size 2 pick fill ibuf erase-size rot invert fill @@ -98,20 +163,22 @@ 0 of 0 endof 1 of usable-page-limit 1- endof ( default ) random-page swap - endcase ( block# ) - pages/eblock 1- invert and ( block#' ) + endcase ( page# ) + pages/eblock 1- invert and ( page#' ) - dup block-bad? if ( block#' ) + dup block-bad? if ( page#' ) 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 - dup h# aa test-eblock record-err - dup h# ff test-eblock record-err - then - sbuf swap write-eblock record-err + else ( page#' ) + dup to cur-eblock ( page#' ) + (cr dup . ( page#' ) + dup save-eblock if ( page# ) + drop ( ) + else ( page# ) + dup h# 55 test-eblock record-err ( page# ) + dup h# aa test-eblock record-err ( page# ) + dup h# ff test-eblock record-err ( page# ) + restore-eblock ( ) + then ( ) then loop @@ -146,18 +213,18 @@ 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 - i to cur-eblock - (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 + pages/eblock * swap 1+ pages/eblock * ( page# stride ) + usable-page-limit rot ?do ( stride ) + i block-bad? 0= if ( stride ) + i to cur-eblock ( stride ) + (cr i . ( stride ) + i save-eblock 0= if ( stride ) + i h# 55 test-eblock record-err ( stride ) + i h# aa test-eblock record-err ( stride ) + restore-eblock ( stride ) + then ( stride ) + then ( stride ) + dup +loop drop ( ) .#fixbbt ;

1 0

r769 - dev/olpc/cafenand
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:37:48 +0100 (Sun, 06 Jan 2008) New Revision: 769 Modified: dev/olpc/cafenand/badblock.fth dev/olpc/cafenand/redboot.fth Log: OLPC trac 5870 - More NAND error handling improvements. Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2008-01-05 22:43:38 UTC (rev 768) +++ dev/olpc/cafenand/badblock.fth 2008-01-05 23:37:48 UTC (rev 769) @@ -27,6 +27,7 @@ \ Returns true if the block containing page# is bad : block-bad? ( page# -- flag ) + bbt 0= if drop false exit then >bbt ( adr mask ) tuck swap c@ and ( mask masked-byte ) <> @@ -184,6 +185,9 @@ bbt0 if bbt0 read-bbt-pages 0= if exit then then bbt1 if bbt1 read-bbt-pages 0= if exit then then + bbt0 bbt1 or if + ." Both bad block tables are unreadable" cr + then release-bbt ; @@ -234,7 +238,7 @@ \ Get the existing bad block table, or make a new one if necessary : get-bbt ( -- ) get-existing-bbt - bbt 0= if + bbt0 bbt1 or 0= if ." No bad block table; making one" cr make-bbt then @@ -306,7 +310,7 @@ : (wipe) ( 'show-bad 'show-erased 'show-bbt -- ) partition# 0= if get-existing-bbt - bbt 0= if + bbt0 bbt1 or 0= if \ If there is no existing bad block table, make one from factory info make-bbt then ( 'show-bad 'show-erased 'show-bbt ) Modified: dev/olpc/cafenand/redboot.fth =================================================================== --- dev/olpc/cafenand/redboot.fth 2008-01-05 22:43:38 UTC (rev 768) +++ dev/olpc/cafenand/redboot.fth 2008-01-05 23:37:48 UTC (rev 769) @@ -17,23 +17,12 @@ d# 256 constant /partition-entry d# 8 constant max#partitions -: partition-map-page# ( -- page# ) -[ifdef] notdef - bbt1 if - bbt1 bbt0 if bbt0 min then ( bbtn ) - else ( ) - bbt0 dup 0= abort" No Bad Block Table" ( bbt0 ) - then ( last-bbt-page# ) - begin pages/eblock - dup while ( part-page# ) - dup block-bad? 0= if exit then ( part-page# ) - repeat -[else] +: partition-map-page# ( -- true | page# false ) h# 10 pages/eblock * 0 do - i block-bad? 0= if i unloop exit then + i block-bad? 0= if i false unloop exit then pages/eblock +loop -[then] - - true abort" No place for partition map" + ." No place for partition map" + true ; : (#partitions) ( adr -- n ) @@ -55,11 +44,11 @@ 0 instance value #partitions : read-partmap ( -- ) - part-buf partition-map-page# + part-buf partition-map-page# if exit then partition-start >r 0 to partition-start read-page r> to partition-start - if true exit then + if exit then part-buf (#partitions) to #partitions ;

1 0