openfirmware January 2009

openfirmware@openfirmware.info

4 participants
42 discussions

r1085 - cpu/x86/pc/olpc
by svn＠openfirmware.info 28 Jan '09

28 Jan '09

Author: wmb Date: 2009-01-28 17:08:32 +0100 (Wed, 28 Jan 2009) New Revision: 1085 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC multiple key security - allow augmenting 0-suffix keys. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2009-01-28 00:17:24 UTC (rev 1084) +++ cpu/x86/pc/olpc/security.fth 2009-01-28 16:08:32 UTC (rev 1085) @@ -101,7 +101,7 @@ : PN pn-buf count ; previous definitions -0 0 2value pubkeylist$ \ adr,len of a concatenated sequence of keys +0 0 2value pubkey$ \ adr,len of a concatenated sequence of keys 0 value pubkeylen \ Length of each key in the list \ Copy a string to allocated memory @@ -117,12 +117,15 @@ 2 buffer: tagname : find-key-tag ( n -- false | value$ true ) [char] 0 + tagname 1+ c! - tagname 2 find-tag -; - -: ?bad-tag-len ( explen actlen -- ) - <> if - ." Warning - override key length mismatch for tag " tagname 2 type cr + tagname 2 find-tag if ( value$ ) + dup pubkeylen <> if ( value$ ) + ." Warning - ignoring key with bad length: " tagname 2 type cr + 2drop false ( false ) + else ( value$ ) + true ( true ) + then + else ( ) + false ( false ) then ; @@ -131,8 +134,7 @@ : #augment-keys ( keylen -- n ) 0 d# 10 1 do ( len n ) i find-key-tag if ( len n value$ ) - nip 2 pick ?bad-tag-len ( len n ) - 1+ ( len n' ) + 2drop 1+ ( len n' ) then ( len n ) loop ( len n ) nip @@ -142,32 +144,33 @@ \ manufacturing data. : augment-key$ ( olpc-key$ mfg-data$ -- key$' ) - tagname swap move ( key$ ) + tagname swap move ( olpc-key$ ) - 0 find-key-tag if ( key$ value$ ) - \ If we have an override key with tag suffix 0, replace the OLPC key - 2 pick over ?bad-tag-len ( key$ value$ ) + \ Determine how much memory to allocate - 2swap free-mem ( value$ ) - preserve$ ( key$' ) - exit - then ( key$ ) + dup #augment-keys 1+ ( olpc-key$ #extra ) + over * dup alloc-mem swap ( olpc-key$ list$ ) - \ Otherwise add augment keys to the list ( key$ ) - \ First determine how much memory to allocate - dup #augment-keys 1+ ( key$ #extra ) - over * dup alloc-mem swap ( key$ total$ ) - 2over 2over drop ( key$ total$ key$ total-adr ) - swap move ( key$ total$ ) - 2swap tuck free-mem ( total$ keylen ) - 2 pick over + ( total$ keylen curadr ) - d# 10 1 do ( total$ keylen curadr ) - i find-key-tag if ( total$ keylen curadr value$ ) - drop over 3 pick move ( total$ keylen curadr ) - over + ( total$ keylen curadr' ) - then ( total$ keylen curadr ) - loop ( total$ keylen curadr ) - 2drop ( total$ ) + \ If there is an override key, use it instead of the OLPC key + 0 find-key-tag 0= if ( olpc-key$ list$ ) + 2over ( olpc-key$ list$ first-key$ ) + then ( olpc-key$ list$ first-key$ ) + + \ Install the first key in the list + 3 pick swap move ( olpc-key$ list$ ) + + \ Free the memory used by olpc-key$ (it came from find-drop-in) + 2swap free-mem ( list$ ) + + \ Add additional keys to the list + over pubkeylen tuck + ( list$ keylen curadr ) + d# 10 1 do ( list$ keylen curadr ) + i find-key-tag if ( list$ keylen curadr value$ ) + drop over 3 pick move ( list$ keylen curadr ) + over + ( list$ keylen curadr' ) + then ( list$ keylen curadr ) + loop ( list$ keylen curadr ) + 2drop ( list$ ) ; \ key: is a defining word whose children return key strings. @@ -207,10 +210,10 @@ " develpubkey,d" key: develkey$ " leasepubkey,a" key: leasekey$ -\ pubkey$ is a global variable that points to the currently-selected +\ thiskey$ is a global variable that points to the currently-selected \ public key string. It simplifies the stack manipulations for other \ words, since the same key string is often used multiple times. -0 0 2value pubkey$ +0 0 2value thiskey$ \ sig-buf is used for storing the binary version of signature strings \ that have been decoded from the hex representation. @@ -291,7 +294,7 @@ \ attacks based on reuse of the same (presumably compromized) hash. \ invalid? checks the validity of data$ against the ASCII signature -\ record sig01$, using the public key that pubkey$ points to. +\ record sig01$, using the public key that thiskey$ points to. \ It also verifies that the hashname contained in sig01$ is the \ expected one. @@ -308,7 +311,7 @@ 4drop 2drop true exit then ( data$ sig$ hashname$ ) - pubkey$ 2swap signature-bad? ( error? ) + thiskey$ 2swap signature-bad? ( error? ) dup if " Signature invalid" ?lease-error-cr else @@ -338,15 +341,15 @@ \ True if short$ matches the end of long$ : tail$= ( short$ long$ -- flag ) 2 pick - + swap comp 0= ; -: key-in-list? ( key$ -- flag ) \ Sets pubkey$ as an important side effect +: key-in-list? ( key$ -- flag ) \ Sets thiskey$ as an important side effect 2>r ( r: key$ ) - pubkeylist$ begin dup while ( rem$ r: key$ ) - pubkeylen break$ ( rem$' pubkey$ r: key$ ) - 2r@ 2over tail$= if ( rem$ pubkey$ r: key$ ) - to pubkey$ ( rem$ r: key$ ) + pubkey$ begin dup while ( rem$ r: key$ ) + pubkeylen break$ ( rem$' thiskey$ r: key$ ) + 2r@ 2over tail$= if ( rem$ thiskey$ r: key$ ) + to thiskey$ ( rem$ r: key$ ) 2r> 4drop true ( true ) exit - then ( rem$' pubkey$ r: key$ ) + then ( rem$' thiskey$ r: key$ ) 2drop ( rem$' r: key$ ) repeat ( rem$' r: key$ ) 2r> 4drop false @@ -359,7 +362,7 @@ : our-pubkey? ( sig01$ -- flag ) sig01$>key$ if false exit then ( key$ ) - pubkey$ tail$= ( flag ) + thiskey$ tail$= ( flag ) ; \ Look for a line that starts with "sig01: " whose key signature @@ -607,7 +610,7 @@ " lease.sig" open-security? if drop false exit then >r ( r: ih ) " Lease " ?lease-debug load-started - leasekey$ to pubkeylist$ + leasekey$ to pubkey$ begin sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) 2drop r> close-file drop false exit @@ -743,7 +746,7 @@ " develop.sig" open-security? if drop false exit then >r ( r: ih ) " Devel key " ?lease-debug load-started - develkey$ to pubkeylist$ + develkey$ to pubkey$ begin sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) 2drop r> close-file drop false exit @@ -843,11 +846,11 @@ : ?disable-indexed-io ( -- ) debug-security? >r false to debug-security? - pubkeylist$ 2>r fwkey$ to pubkeylist$ + pubkey$ 2>r fwkey$ to pubkey$ img$ sig$ fw-valid? 0= if ec-indexed-io-off then - 2r> to pubkeylist$ + 2r> to pubkey$ r> to debug-security? ; @@ -864,7 +867,7 @@ else " minus" show-icon " new - " ?lease-debug - fwkey$ to pubkeylist$ + fwkey$ to pubkey$ img$ sig$ fw-valid? if img$ do-firmware-update then @@ -878,7 +881,7 @@ d# 16 0 +icon-xy show-dot " os" bundle-present? if " OS found - " ?lease-debug - oskey$ to pubkeylist$ + oskey$ to pubkey$ img$ sig$ sha-valid? if \ ?disable-indexed-io img$ tuck load-base swap move !load-size

1 0

r1084 - cpu/x86/pc/olpc
by svn＠openfirmware.info 28 Jan '09

28 Jan '09

Author: wmb Date: 2009-01-28 01:17:24 +0100 (Wed, 28 Jan 2009) New Revision: 1084 Modified: cpu/x86/pc/olpc/fsupdate.fth cpu/x86/pc/olpc/security.fth cpu/x86/pc/olpc/setwp.fth Log: OLPC trac 9045 - added multiple key support as defined by http://wiki.laptop.org/go/Firmware_security Modified: cpu/x86/pc/olpc/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/fsupdate.fth 2009-01-23 21:57:21 UTC (rev 1083) +++ cpu/x86/pc/olpc/fsupdate.fth 2009-01-28 00:17:24 UTC (rev 1084) @@ -169,7 +169,7 @@ null$ cn-buf place ( rem$ ) " fs" bundle-present? if ( rem$ ) " Filesystem image found - " ?lease-debug - fskey$ to pubkey$ ( rem$ ) + fskey$ to pubkeylist$ ( rem$ ) img$ sig$ sha-valid? if ( rem$ ) 2drop ( ) show-unlock ( ) Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2009-01-23 21:57:21 UTC (rev 1083) +++ cpu/x86/pc/olpc/security.fth 2009-01-28 00:17:24 UTC (rev 1084) @@ -101,30 +101,111 @@ : PN pn-buf count ; previous definitions +0 0 2value pubkeylist$ \ adr,len of a concatenated sequence of keys +0 value pubkeylen \ Length of each key in the list + +\ Copy a string to allocated memory +: preserve$ ( $ -- $' ) + >r ( adr1 r: len ) + r@ alloc-mem ( adr1 adr2 ) + tuck r@ move r> ( $' ) +; + +\ find-key-tag finds a tag like "s0" or "s8". The caller sets tagname[0] +\ to 's' and then calls find-key-tag with different "n" arguments. + +2 buffer: tagname +: find-key-tag ( n -- false | value$ true ) + [char] 0 + tagname 1+ c! + tagname 2 find-tag +; + +: ?bad-tag-len ( explen actlen -- ) + <> if + ." Warning - override key length mismatch for tag " tagname 2 type cr + then +; + +\ Count the number of additional keys, so we know how much memory to allocate + +: #augment-keys ( keylen -- n ) + 0 d# 10 1 do ( len n ) + i find-key-tag if ( len n value$ ) + nip 2 pick ?bad-tag-len ( len n ) + 1+ ( len n' ) + then ( len n ) + loop ( len n ) + nip +; + +\ Amend the key list string with alternative or additional keys from +\ manufacturing data. + +: augment-key$ ( olpc-key$ mfg-data$ -- key$' ) + tagname swap move ( key$ ) + + 0 find-key-tag if ( key$ value$ ) + \ If we have an override key with tag suffix 0, replace the OLPC key + 2 pick over ?bad-tag-len ( key$ value$ ) + + 2swap free-mem ( value$ ) + preserve$ ( key$' ) + exit + then ( key$ ) + + \ Otherwise add augment keys to the list ( key$ ) + \ First determine how much memory to allocate + dup #augment-keys 1+ ( key$ #extra ) + over * dup alloc-mem swap ( key$ total$ ) + 2over 2over drop ( key$ total$ key$ total-adr ) + swap move ( key$ total$ ) + 2swap tuck free-mem ( total$ keylen ) + 2 pick over + ( total$ keylen curadr ) + d# 10 1 do ( total$ keylen curadr ) + i find-key-tag if ( total$ keylen curadr value$ ) + drop over 3 pick move ( total$ keylen curadr ) + over + ( total$ keylen curadr' ) + then ( total$ keylen curadr ) + loop ( total$ keylen curadr ) + 2drop ( total$ ) +; + \ key: is a defining word whose children return key strings. \ Each child word has the name of its key stored in the dictionary. \ The first time that a child word executes, it uses the key name \ to find the key value and caches the key value in RAM so subsequent \ uses are faster. +\ The key name includes both the name that is used in the dropin +\ module list (e.g. "fspubkey") and the prefix letter for mfg data +\ tags (e.g. "s"). + : key: ( name$ "name" -- key$ ) create 0 , 0 , ", \ adr len name does> ( apf -- key$ ) dup @ if 2@ exit then ( apf ) dup 2 na+ count ( apf name$ ) - 2dup find-drop-in if ( apf name$ key$ ) - 2nip - else ( apf name$ ) - ." Can't load key " type cr + [char] , left-parse-string ( apf mfg-data$ dropin-name$ ) + 2dup find-drop-in if ( apf mfg-data$ name$ key$ ) + 2nip ( apf mfg-data$ key$ ) + else ( apf mfg-data$ name$ ) + ." Can't load key " type cr ( apf mfg-data$ ) + 2drop ( apf ) " Missing Key" ( apf bad-key$ ) - then + dup to pubkeylen ( apf bad-key$ ) + rot >r 2dup r> 2! ( key$ ) + exit + then ( apf mfg-data$ key$ ) + dup to pubkeylen ( apf mfg-data$ key$ ) + 2swap ( apf key$ mfg-data$ ) + augment-key$ ( apf key$' ) rot >r 2dup r> 2! ( key$ ) ; -" fspubkey" key: fskey$ -" ospubkey" key: oskey$ -" fwpubkey" key: fwkey$ -" develpubkey" key: develkey$ -" leasepubkey" key: leasekey$ +" fspubkey,s" key: fskey$ +" ospubkey,o" key: oskey$ +" fwpubkey,w" key: fwkey$ +" develpubkey,d" key: develkey$ +" leasepubkey,a" key: leasekey$ \ pubkey$ is a global variable that points to the currently-selected \ public key string. It simplifies the stack manipulations for other @@ -235,29 +316,79 @@ then ; -: our-pubkey? ( sig01$ -- flag ) - bl left-parse-string " sig01:" $= 0= if 2drop false exit then ( rem$ ) +\ break$ splits a string into an initial substring of length n +\ (head$) and the residual substring (tail$). If the input +\ string is shorter than n, head$ is the input string and tail$ is +\ the null string. + +: break$ ( $ n -- tail$ head$ ) + 2dup < if drop null$ 2swap exit then + dup >r /string ( tail$ ) + over r@ - r> ( tail$ head$ ) +; + +: sig01$>key$ ( sig01$ -- true | binary-key$ false ) + bl left-parse-string " sig01:" $= 0= if 2drop true exit then ( rem$ ) bl left-parse-string 2drop \ Discard hash name ( rem$ ) bl left-parse-string 2nip \ Get key signature ( key$ ) - /sig 2* min hex-decode if 2drop false exit then ( binary-key$ ) - pubkey$ dup 3 pick - 0 max /string $= ( flag ) + /sig 2* min hex-decode if 2drop true exit then ( binary-key$ ) + false ; -\ Look for a line that starts with "sig01: " and whose key signature +\ True if short$ matches the end of long$ +: tail$= ( short$ long$ -- flag ) 2 pick - + swap comp 0= ; + +: key-in-list? ( key$ -- flag ) \ Sets pubkey$ as an important side effect + 2>r ( r: key$ ) + pubkeylist$ begin dup while ( rem$ r: key$ ) + pubkeylen break$ ( rem$' pubkey$ r: key$ ) + 2r@ 2over tail$= if ( rem$ pubkey$ r: key$ ) + to pubkey$ ( rem$ r: key$ ) + 2r> 4drop true ( true ) + exit + then ( rem$' pubkey$ r: key$ ) + 2drop ( rem$' r: key$ ) + repeat ( rem$' r: key$ ) + 2r> 4drop false +; + +: in-pubkey-list? ( sig01$ -- flag ) + sig01$>key$ if false exit then ( key$ ) + key-in-list? ( flag ) +; + +: our-pubkey? ( sig01$ -- flag ) + sig01$>key$ if false exit then ( key$ ) + pubkey$ tail$= ( flag ) +; + +\ Look for a line that starts with "sig01: " whose key signature +\ matches the trailing bytes of a public key in our current list. +: next-sig01-in-list$ ( sig$ -- true | rem$ sig01$ false ) + begin dup while ( rem$ ) + newline left-parse-string ( rem$' line$ ) + 2dup in-pubkey-list? if false exit then ( rem$ line$ ) + 2drop ( rem$ ) + repeat ( rem$ ) + " No signature for our key list" ?lease-error-cr + 2drop true +; + +\ Look for a line that starts with "sig01: " whose key signature \ matches the trailing bytes of our currently-selected public key. : next-sig01$ ( sig$ -- true | rem$ sig01$ false ) - begin dup while ( rem$ ) - newline left-parse-string ( rem$' line$ ) - 2dup our-pubkey? if false exit then ( rem$ line$ ) - 2drop ( rem$ ) - repeat ( rem$ ) + begin dup while ( rem$ ) + newline left-parse-string ( rem$' line$ ) + 2dup our-pubkey? if false exit then ( rem$ line$ ) + 2drop ( rem$ ) + repeat ( rem$ ) " No signature for our key" ?lease-error-cr 2drop true ; \ Find a sig01: line and check its sha256/rsa signature : sha-valid? ( data$ sig01$ -- okay? ) - next-sig01$ if 2drop false exit then ( data$ rem$ sig01$ ) + next-sig01-in-list$ if 2drop false exit then ( data$ rem$ sig01$ ) 2nip " sha256" invalid? 0= ; @@ -265,7 +396,7 @@ \ and check their signatures : fw-valid? ( data$ sig$ -- okay? ) 2swap 2>r ( sig$ r: data$ ) - next-sig01$ if 2r> 2drop false exit then ( rem$ sig01$ ) + next-sig01-in-list$ if 2r> 2drop false exit then ( rem$ sig01$ ) 2r@ 2swap sha-valid? 0= if ( rem$ r: data$ ) 2r> 4drop false exit then ( rmd-sig$ r: data$ ) @@ -273,17 +404,6 @@ 2nip 2r> 2swap " rmd160" invalid? 0= ; -\ break$ splits a string into an initial substring of length n -\ (head$) and the residual substring (tail$). If the input -\ string is shorter than n, head$ is the input string and tail$ is -\ the null string. - -: break$ ( $ n -- tail$ head$ ) - 2dup < if drop null$ 2swap exit then - dup >r /string ( tail$ ) - over r@ - r> ( tail$ head$ ) -; - \ numfield is a factor used for parsing 2-digit fields from date/time strings. : numfield ( exp$ min max -- exp$' ) >r >r ( exp$ r: max min ) @@ -417,7 +537,7 @@ \ doesn't match our pubkey. : check-machine-signature ( sig$ expiration$ -- -1|1 ) - 2over our-pubkey? if ( sig$ exp$ ) + 2over in-pubkey-list? if ( sig$ exp$ ) machine-id-buf d# 51 + swap move ( sig$ ) machine-id-buf d# 67 2swap ( id$ sig$ ) " sha256" invalid? if -1 else 1 then ( -1|1 ) @@ -487,7 +607,7 @@ " lease.sig" open-security? if drop false exit then >r ( r: ih ) " Lease " ?lease-debug load-started - leasekey$ to pubkey$ + leasekey$ to pubkeylist$ begin sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) 2drop r> close-file drop false exit @@ -497,7 +617,8 @@ 1 of r> close-file drop " unlock" show-icon true exit endof -1 of r> close-file drop " lock" show-icon false exit endof endcase - repeat + repeat ( actual ) + drop ( ) " No matching records" ?lease-error-cr r> close-file drop false ; @@ -622,7 +743,7 @@ " develop.sig" open-security? if drop false exit then >r ( r: ih ) " Devel key " ?lease-debug load-started - develkey$ to pubkey$ + develkey$ to pubkeylist$ begin sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) 2drop r> close-file drop false exit @@ -717,6 +838,19 @@ " Reflash returned, unexpectedly" .security-failure ; +\ Turn off indexed I/O unless the OS is signed with the firmware +\ key in addition to the OS key. + +: ?disable-indexed-io ( -- ) + debug-security? >r false to debug-security? + pubkeylist$ 2>r fwkey$ to pubkeylist$ + + img$ sig$ fw-valid? 0= if ec-indexed-io-off then + + 2r> to pubkeylist$ + r> to debug-security? +; + : load-from-device ( devname$ -- done? ) d# 16 0 +icon-xy show-dot @@ -730,7 +864,7 @@ else " minus" show-icon " new - " ?lease-debug - fwkey$ to pubkey$ + fwkey$ to pubkeylist$ img$ sig$ fw-valid? if img$ do-firmware-update then @@ -744,8 +878,9 @@ d# 16 0 +icon-xy show-dot " os" bundle-present? if " OS found - " ?lease-debug - oskey$ to pubkey$ + oskey$ to pubkeylist$ img$ sig$ sha-valid? if +\ ?disable-indexed-io img$ tuck load-base swap move !load-size show-unlock true exit @@ -794,7 +929,8 @@ ['] secure-load-ramdisk to load-ramdisk " init-program" $find if set-cmdline - execute show-going go + execute + show-going go then show-x security-failure Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2009-01-23 21:57:21 UTC (rev 1083) +++ cpu/x86/pc/olpc/setwp.fth 2009-01-28 00:17:24 UTC (rev 1084) @@ -173,3 +173,18 @@ r> r> h# ff fill ( ) put-mfg-data ; + +: delete-tag ( "name" -- ) safe-parse-word $delete-tag ; + +: add-tag-from-file ( "name" "filename" -- ) + safe-parse-word 2>r ( r: name$ ) + reading ( r: name$ ) + ifd @ fsize >r ( r: name$ len ) + r@ alloc-mem ( adr r: name$ len ) + dup r@ ifd @ fgets ( adr actual r: name$ len ) + ifd @ fclose ( adr actual r: name$ len ) + r@ <> abort" File read error" ( adr r: name$ len ) + r> 2dup 2r> ( data$ data$ name$ ) + $add-tag ( data$ ) + free-mem +;

1 0

r1083 - cpu/x86/pc/olpc
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 22:57:21 +0100 (Fri, 23 Jan 2009) New Revision: 1083 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E28 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-01-23 21:17:41 UTC (rev 1082) +++ cpu/x86/pc/olpc/versions.fth 2009-01-23 21:57:21 UTC (rev 1083) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 27 +macro: FW_MINOR 28 \ The EC microcode macro: EC_VERSION e21

1 0

r1082 - cpu/x86/pc/olpc
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 22:17:41 +0100 (Fri, 23 Jan 2009) New Revision: 1082 Added: cpu/x86/pc/olpc/whichcsum.fth Log: OLPC - checked in "whichcsum.fth", a diagnostic that's not included in the ROM build. Added: cpu/x86/pc/olpc/whichcsum.fth =================================================================== --- cpu/x86/pc/olpc/whichcsum.fth (rev 0) +++ cpu/x86/pc/olpc/whichcsum.fth 2009-01-23 21:17:41 UTC (rev 1082) @@ -0,0 +1,21 @@ +\ This is a diagnostic used when checksum-test is enabled in resume.bth +\ Usage: which-all .s (ignore the first two numbers) +code which-all ( -- .. ) + si push di push sp dx mov + \ Checksum memory from 1M to top (excluding framebuffer) + h# 0010.0000 # si mov + resume-data h# 10 - #) di mov \ Save checksum base address + begin + bx bx xor + h# 10.0000 2 rshift # cx mov \ Word count for 1MB + begin ax lods ax bx add loopa + ax 0 [di] cmp + <> if + si push + then + 4 [di] di lea + \ h# ec0.0000 # si cmp + h# 300.0000 # si cmp + = until + 0 [dx] di mov 4 [dx] si mov +c;

1 0

r1081 - cpu/x86/pc/olpc dev/geode dev/geode/display dev/olpc/kb3700
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 22:15:58 +0100 (Fri, 23 Jan 2009) New Revision: 1081 Modified: cpu/x86/pc/olpc/acpi.fth cpu/x86/pc/olpc/biosresume.fth cpu/x86/pc/olpc/dsdt.dsl cpu/x86/pc/olpc/resume.bth dev/geode/display/gxfb.fth dev/geode/smi.fth dev/olpc/kb3700/ecio.fth Log: OLPC trac 9211 - multiple fixes for issues discovered in Windows testing, including standby flakiness, device testing framework failures due to some extant I/O ports not being reported via ACPI, and display partial turn-on when keys are typed during standby, Modified: cpu/x86/pc/olpc/acpi.fth =================================================================== --- cpu/x86/pc/olpc/acpi.fth 2009-01-23 20:24:20 UTC (rev 1080) +++ cpu/x86/pc/olpc/acpi.fth 2009-01-23 21:15:58 UTC (rev 1081) @@ -192,6 +192,7 @@ ; h# 6000 constant xp-smbus-base +defer more-platform-fixup ' noop to more-platform-fixup : rm-platform-fixup ( -- ) xp-smbus-base h# f001 h# 5140.000b 3dup msr! find-msr-entry 2! xp-smbus-base 1+ h# 10 isa-hdr >hdr-value l! @@ -201,4 +202,5 @@ h# 4e sci-mask! \ Include in the mask only events we care about 0 h# 40 pm! \ Restore long delay for power-off button + more-platform-fixup ; Modified: cpu/x86/pc/olpc/biosresume.fth =================================================================== --- cpu/x86/pc/olpc/biosresume.fth 2009-01-23 20:24:20 UTC (rev 1080) +++ cpu/x86/pc/olpc/biosresume.fth 2009-01-23 21:15:58 UTC (rev 1081) @@ -61,13 +61,36 @@ " enable-scan" kbd-ih $call-method \ Restart keyboard ; +: enable-uoc ( -- ) + uoc-pci-base h# 1000 4 h# 5151.0020 set-p2d-bm + h# 5120.000b msr@ 2 or h# 5120.000b msr! +; +: disable-uoc ( -- ) + h# 5120.000b msr@ 2 invert and h# 5120.000b msr! + h# 5101.0020 p2d-bm-off +; +' disable-uoc to more-platform-fixup +: video-refresh-off ( -- ) + h# 1000.002a msr@ drop d# 12 lshift ( dc-base ) + h# 4758 over l! 0 swap 4 + l! + d# 25 ms +; + : (suspend-devices) ( -- ) - dcon-power-off + dcon-power-off video-refresh-off + wlan-freeze suspend-ps2 [ifdef] setup-lid-wakeup setup-lid-wakeup [then] + sci-inhibit \ This prevents SCIs during a critical period + 0 sci-mask! \ No SCIs during sleep + enable-uoc \ So resume can turn on USB power + h# 99 h# 34 cmos! ; : (resume-devices) ( -- ) + disable-uoc \ Because Windows doesn't want to see the UOC + h# 4e sci-mask! + sci-uninhibit [ifdef] cleanup-lid-wakeup cleanup-lid-wakeup [then] resume-ps2 wlan-reset Modified: cpu/x86/pc/olpc/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/dsdt.dsl 2009-01-23 20:24:20 UTC (rev 1080) +++ cpu/x86/pc/olpc/dsdt.dsl 2009-01-23 21:15:58 UTC (rev 1081) @@ -201,7 +201,7 @@ } Name (_S0, Package (0x04) { Zero, Zero, Zero, Zero }) // Values for PM1a,b_CNT.SLP_TYP registers - Name (_S1, Package (0x04) { One, One, Zero, Zero }) +// Name (_S1, Package (0x04) { One, One, Zero, Zero }) Name (_S3, Package (0x04) { 0x03, 0x03, Zero, Zero }) Name (_S5, Package (0x04) { 0x05, 0x05, Zero, Zero }) Name (SLPS, Zero) // Current state - see _SST page 298 for values @@ -779,6 +779,9 @@ Memory32Fixed (ReadOnly, 0xFFF00000, 0x00100000, ) // GeodeROM has f0000000,10000000 IO (Decode16, 0x0092, 0x0092, 0x00, 0x01, ) + + IO (Decode16, 0x0030, 0x0030, 0x00, 0x10, ) // I/O ports to fake out SMI interrupts + IO (Decode16, 0x03c0, 0x03c0, 0x00, 0x20, ) // Claim VGA I/O ports }) CreateDWordField (MBRB, \_SB.PCI0.SBF0.MEM._CRS._Y06._LEN, EM1L) Store (MEMK, Local0) // Memory size in Kbytes (from EBDA) @@ -822,8 +825,39 @@ }) } -// Elided UART + Device (UAR1) + { + Name (_HID, EisaId ("PNP0501")) + Name (_UID, One) + Name (_DDN, "COM1") + Name (_STA, 3) // Present and decoding resources, but shouldn't be shown + Name (_CRS, ResourceTemplate () { + IO (Decode16, 0x03F8, 0x03F8, 0x00, 0x08, ) + IRQNoFlags () {4} + }) + } + Device(EC0) { + Name (_HID, EISAID("PNP0C09")) + Name (_CRS, ResourceTemplate() { + IO (Decode16, 0x62, 0x62, 0, 1) + IO (Decode16, 0x66, 0x66, 0, 1) + IO (Decode16, 0x61, 0x61, 0, 1) + IO (Decode16, 0x68, 0x68, 0, 1) + IO (Decode16, 0x6c, 0x6c, 0, 1) + IO (Decode16, 0x380, 0x380, 0, 4) + }) + +// // Define that the EC SCI is bit 0 of the GP_STS register +// Name(_GPE, 0) { +// OperationRegion(ECOR, EmbeddedControl, 0, 0xFF) +// Field(ECOR, ByteAcc, Lock, Preserve) { +// // Field definitions go here +// } +// } + + } + // Elided superio // XXX ??? Maybe this should be moved out a level so it's not under SB F0 @@ -831,8 +865,8 @@ Name (_HID, EisaId ("PNP0303")) Name (_CID, 0x0B03D041) - // Return this one if can wake from keyboard - XXX maybe need to be 3 instead of One - Name (_PRW, Package (0x02) { Zero, One }) + // Return this one if can wake from keyboard +// Name (_PRW, Package (0x02) { Zero, 3 }) Method (_PSW, 1, NotSerialized) { } @@ -849,7 +883,7 @@ Device (PS2M) { Name (_HID, EisaId ("PNP0F03")) // ALPS Pointing device Name (_CID, 0x130FD041) - Name (_PRW, Package (0x02) { Zero, One }) +// Name (_PRW, Package (0x02) { Zero, 3 }) Method (_PSW, 1, NotSerialized) { } Name (_CRS, ResourceTemplate () { IRQNoFlags () {12} }) Name (_STA, 0x0F ) @@ -865,14 +899,14 @@ Name (_STR, Unicode ("CS553x USB Controller 0")) Name (_STA, 0x0F) - Name (_PRW, Package (0x02) { 0x06, One }) +// Name (_PRW, Package (0x02) { 0x06, 3 }) } Device (USB1) { Name (_ADR, 0x000F0005) Name (_STR, Unicode ("CS553x USB Controller 1")) Name (_STA, 0x0F) - Name (_PRW, Package (0x02) { 0x06, One }) +// Name (_PRW, Package (0x02) { 0x06, 3 }) } // Device (USB2) { Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2009-01-23 20:24:20 UTC (rev 1080) +++ cpu/x86/pc/olpc/resume.bth 2009-01-23 21:15:58 UTC (rev 1081) @@ -291,23 +291,25 @@ h# 6010 config-rl ax stos \ NAND BAR ax bx mov \ Base address - 6 h# 6004 config-ww \ Enable access + h# 6004 config-rw ax stos \ NAND enables + 2 h# 6004 config-ww \ Enable access h# 24 [bx] ax mov ax stos \ NAND Timing1 h# 28 [bx] ax mov ax stos \ NAND Timing2 h# 2c [bx] ax mov ax stos \ NAND Timing3 - h# 6004 config-rw op: ax stos \ NAND enables + 0 h# 6004 config-ww \ Disable access - h# 6104 config-rw op: ax stos \ SDHCI enables + h# 6104 config-rw ax stos \ SDHCI enables h# 0 h# 618c config-ww \ Set power state to 0 so reads will work h# 6110 config-rl ax stos \ SDHCI BAR ax bx mov \ Base address - 6 h# 6104 config-ww \ Enable access + 2 h# 6104 config-ww \ Enable access op: h# 3004 [bx] ax mov op: ax stos \ Clock config h# 300c [bx] ax mov ax stos \ Interrupt config h# 3038 [bx] ax mov ax stos \ GPIO Config h# 315c [bx] ax mov ax stos \ GPIO Data h# 610d config-rb al stos \ SDHCI latency timer h# 613c config-rb al stos \ SDHCI IRQ + 0 h# 6104 config-ww \ Disable access h# 6210 config-rl ax stos \ Camera BAR h# 6204 config-rw ax stos \ Camera enables @@ -323,15 +325,33 @@ h# 5140.000c rmsr h# 30 [ax] dx lea \ GPIO data port d# 50,000 # cx mov forget-msr \ 50K spins is about 40 mS begin dx ax in h# e0 # al and h# c0 # al cmp loopne + +[ifdef] ineffective + \ XXX this doesn't work as-is because you have to wait a frame time + \ afterwards before the accesses will actually stop. I suppose that + \ it might be possible to turn it off just in time, but that would + \ require careful verification. + + \ Stop video refresh + h# 1000.002a rmsr d# 12 # ax shl ax bx mov \ DC PCI base address + h# 4758 # 0 [bx] mov \ Unlock DC registers + 0 # 4 [ax] mov \ Turn off access to display memory [then] +[then] + [ifdef] checksum-test \ Checksum memory from 1M to top (excluding framebuffer) - bx bx xor h# 0010.0000 # si mov - h# 0ef0.0000 2 rshift # cx mov forget-msr \ Word count - begin ax lods ax bx add loopa - bx resume-data h# 10 - #) mov \ Save checksum + h# 4d534b43 # ax mov ax stos \ Marker 'CKSM' + di resume-data h# 10 - #) mov \ Save checksum base address + begin + bx bx xor + h# 10.0000 2 rshift # cx mov forget-msr \ Word count for 1MB + begin ax lods ax bx add loopa + ax stos + h# ec0.0000 # si cmp + = until [then] [ifdef] measure-suspend @@ -339,10 +359,6 @@ rdtsc ax h# 18 #) mov dx h# 1c #) mov [then] - \ Stop video refresh - h# 4758 # dc-pci-base #) mov \ Unlock DC registers - h# 0 # dc-pci-base 4 + #) mov \ Turn off access to display memory - h# 4000.0e00 h# 1410 port-wl \ Assert SLP_CLK_EN# 1 mS after SUSPA# \ This is pointless because register 14 is in the working power domain \ and does not retain the value across the suspend @@ -433,11 +449,20 @@ [ifdef] checksum-test \ Checksum memory from 1M to top (excluding framebuffer) - bx bx xor h# 0010.0000 # si mov - h# 0ef0.0000 2 rshift # cx mov forget-msr \ Word count - begin ax lods ax bx add loopa - bx resume-data h# 10 - #) cmp <> if ret then + resume-data h# 10 - #) di mov \ Save checksum base address + begin + bx bx xor + h# 10.0000 2 rshift # cx mov forget-msr \ Word count for 1MB + begin ax lods ax bx add loopa + ax 0 [di] cmp + <> if + char C 3f8 port-wb begin 3fd port-rb 20 bitand 0<> until + ret + then + 4 [di] di lea + h# ec0.0000 # si cmp + = until [then] h# 38 [bp] si lea \ Save area @@ -787,13 +812,14 @@ h# 6010 config-setup ax lods ax dx out \ NAND BAR ax bx mov \ Base address + ax lods ax cx mov forget-msr \ NAND enables - save for later 6 h# 6004 config-ww \ Enable access ax lods ax h# 24 [bx] mov \ NAND Timing 1 ax lods ax h# 28 [bx] mov \ NAND Timing 2 ax lods ax h# 2c [bx] mov \ NAND Timing 3 - h# 6004 config-setup op: ax lods op: ax dx out \ NAND enables + h# 6004 config-setup cx ax mov op: ax dx out \ NAND enables - op: ax lods ax cx mov forget-msr \ SDHCI enables - save for later + ax lods ax cx mov forget-msr \ SDHCI enables - save for later h# 6110 config-setup ax lods ax dx out \ SDHCI BAR ax bx mov \ Base address 6 h# 6104 config-ww \ Enable access Modified: dev/geode/display/gxfb.fth =================================================================== --- dev/geode/display/gxfb.fth 2009-01-23 20:24:20 UTC (rev 1080) +++ dev/geode/display/gxfb.fth 2009-01-23 21:15:58 UTC (rev 1081) @@ -352,6 +352,7 @@ drop \ video-state - /l / . cr + unlock 0 4 dc! \ Turn off video memory access d# 25 ms \ Wait for a frame time to make sure the display is quiet ; Modified: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth 2009-01-23 20:24:20 UTC (rev 1080) +++ dev/geode/smi.fth 2009-01-23 21:15:58 UTC (rev 1081) @@ -402,11 +402,10 @@ h# 11 h# 4c00.2002 msr-clr \ h# 10 h# 4c00.2002 msr-clr - 0. h# 1000.0083 msr! \ Enable ASMIs in LX GLIU0 - 0. h# 5101.0083 msr! \ Enable ASMIs in 5536 GLIU0 + h# ff00 h# 1000.0083 msr-clr \ Enable ASMIs in LX GLIU0 + h# ff00 h# 4000.0083 msr-clr \ Enable ASMIs in LX GLIU1 + h# ff00 h# 5101.0083 msr-clr \ Enable ASMIs in 5536 GLIU0 - h# ff00 h# 1000.0082 msr-clr h# ff00 h# 1000.0083 msr-clr - h# ff00 h# 4000.0082 msr-clr h# ff00 h# 4000.0083 msr-clr h# 38. h# 1301 msr! ; @@ -783,6 +782,48 @@ enable-io-smis ; +[ifdef] notdef \ We don't need this, but it's nice to have the recipe +: disable-virtual-pci ( -- ) + \ Virtualize devices f and 1, or all devices if debugging + h# 5000.2012 msr@ swap h# ffff invert and swap h# 5000.2012 msr! + h# 5000.2002 msr@ swap 8 or swap h# 5000.2002 msr! \ Disable SSMI for config accesses +; +: disable-io-smis ( -- ) + h# 1301 msr@ swap h# 20 invert and swap h# 1301 msr! + + \ XXX these settings need to be folded into the MSR table for resume + h# 0000.00ff.fff00000. h# 5101.00e4 msr! \ Unvirtualize ACPI registers + 1. h# 5101.0002 msr! \ Disable SSMI in GLIU_GLD_MSR_SMI + 0. h# 5100.0002 msr! \ Enable SSMI in GLPCI_GLD_MSR_SMI + + \ Virtual registers + 0. h# 1000.00e3 msr! \ AC1C..AC1F + h# ff.fff00000. h# 1000.00e2 msr! \ 30..3f - for bouncing INTs to SMIs + 0. h# 5140.0002 msr! \ Port 92 INIT (bit 0 - reset) + + 1. h# 1000.2002 msr! \ AC1C generates SMI + 0. h# 1000.2003 msr! \ AC1C does not generate ERR + 1. h# 4000.2002 msr! + + h# 1f. h# 4c00.2002 msr! \ h# 10 h# 4c00.2002 msr-clr + + h# ff00. h# 1000.0083 msr! \ Enable ASMIs in LX GLIU0 + h# ff00. h# 4000.0084 msr! \ Enable AERRSs in LX GLIU0 + h# ff00. h# 5101.0083 msr! \ Enable ASMIs in 5536 GLIU0 +; +: unsetup-smi ( -- ) + disable-io-smis + disable-virtual-pci + + 0. h# 1301 msr! \ Disable IO and software SMI + + 0. h# 132b msr! \ Offset of SMM Header + 0. h# 133b msr! + + h# 00000.0.01.00000.0.01. h# 180e msr! \ Default value +; +[then] + defer suspend-devices ' noop to suspend-devices defer resume-devices ' noop to resume-devices Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2009-01-23 20:24:20 UTC (rev 1080) +++ dev/olpc/kb3700/ecio.fth 2009-01-23 21:15:58 UTC (rev 1081) @@ -156,6 +156,8 @@ : ebook-mode? ( -- b ) h# 2a ec-cmd-b@ ; : wlan-freeze ( -- ) h# 35 ec-cmd ; : sci-queue@ ( -- b ) h# 84 ec-cmd-b@ ; +: sci-inhibit ( -- ) h# 32 ec-cmd ; +: sci-uninhibit ( -- ) h# 34 ec-cmd ; : ec-indexed-io-off ( -- ) h# fe95 ec@ h# 40 invert and h# fe95 ec! ;

1 0

r1080 - ofw/fs/cdfs
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 21:24:20 +0100 (Fri, 23 Jan 2009) New Revision: 1080 Added: ofw/fs/cdfs/cdfs.bth Log: Checked in cdfs.bth - build script for ISO9660 file system package. Added: ofw/fs/cdfs/cdfs.bth =================================================================== --- ofw/fs/cdfs/cdfs.bth (rev 0) +++ ofw/fs/cdfs/cdfs.bth 2009-01-23 20:24:20 UTC (rev 1080) @@ -0,0 +1,12 @@ +purpose: Build script for demand-loaded ISO 9660 file system package + +command: &native &this +build-now + +start-inclusion +fload ${BP}/ofw/fs/cdfs/loadpkg.fth +end-inclusion + +writing cdfs.di +inclusion " iso9660-file-system" write-deflated-dropin +ofd @ fclose

1 0

r1079 - dev/geode/display
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 21:21:20 +0100 (Fri, 23 Jan 2009) New Revision: 1079 Modified: dev/geode/display/gxfb.fth Log: OLPC - The selftest method for the Geode display driver was using only part of the screen due to a scoping problem with the width and height values. Modified: dev/geode/display/gxfb.fth =================================================================== --- dev/geode/display/gxfb.fth 2009-01-23 20:00:12 UTC (rev 1078) +++ dev/geode/display/gxfb.fth 2009-01-23 20:21:20 UTC (rev 1079) @@ -5,8 +5,11 @@ headers -d# 1024 instance value width \ Frame buffer line width -d# 768 instance value height \ Screen height +\ width and height are global instead of instance values because +\ the seltest method needs to get their values in a fresh instance +\ with re-running the open method. +d# 1024 ( instance ) value width \ Frame buffer line width +d# 768 ( instance ) value height \ Screen height d# 16 instance value depth \ Bits per pixel d# 1024 instance value /scanline \ Frame buffer line width

1 0

r1078 - cpu/x86/Linux
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 21:00:12 +0100 (Fri, 23 Jan 2009) New Revision: 1078 Added: cpu/x86/Linux/make_with_tcc Log: Added a script so you can use TCC to build the wrapper. Added: cpu/x86/Linux/make_with_tcc =================================================================== --- cpu/x86/Linux/make_with_tcc (rev 0) +++ cpu/x86/Linux/make_with_tcc 2009-01-23 20:00:12 UTC (rev 1078) @@ -0,0 +1,9 @@ +#!/bin/sh +# This script demonstrates the ability to build the wrapper with tcc +# (Tiny C Compiler) + +BP=../../.. +W=${BP}/forth/wrapper +Z=${W}/zip + +tcc -DTARGET_X86 -o forth ${W}/wrapper.c ${W}/logger.c ${Z}/zipmem.c ${Z}/deflate.c ${Z}/trees.c ${Z}/bits.c ${Z}/util.c ${Z}/inflate.c

1 0

r1077 - in cpu: arm/Linux x86/Linux
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 20:49:13 +0100 (Fri, 23 Jan 2009) New Revision: 1077 Modified: cpu/arm/Linux/Makefile cpu/x86/Linux/Makefile Log: Removed copyrights on a couple of short Makefiles. Modified: cpu/arm/Linux/Makefile =================================================================== --- cpu/arm/Linux/Makefile 2009-01-23 19:45:08 UTC (rev 1076) +++ cpu/arm/Linux/Makefile 2009-01-23 19:49:13 UTC (rev 1077) @@ -1,6 +1,5 @@ # Wrapper makefile for ARM Linux -# Copyright 2008 FirmWorks. All rights reserved. -# + BP=../../.. CFLAGS = -DARM -mlittle-endian Modified: cpu/x86/Linux/Makefile =================================================================== --- cpu/x86/Linux/Makefile 2009-01-23 19:45:08 UTC (rev 1076) +++ cpu/x86/Linux/Makefile 2009-01-23 19:49:13 UTC (rev 1077) @@ -1,6 +1,5 @@ # Wrapper makefile for x86 Unix: FreeBSD, Linux, etc. -# Copyright 1997 FirmWorks. All rights reserved. -# + BP=../../.. CFLAGS = -O -g -m32 -DTARGET_X86

1 0

r1076 - cpu/x86/pc/olpc
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 20:45:08 +0100 (Fri, 23 Jan 2009) New Revision: 1076 Added: cpu/x86/pc/olpc/iflash.fth cpu/x86/pc/olpc/usbpwr.fth Log: Biosload build - Checked in olpc/iflash.fth and olpc/usbpwr.fth, needed by "biosload/config-olpc.fth" build version. Added: cpu/x86/pc/olpc/iflash.fth =================================================================== --- cpu/x86/pc/olpc/iflash.fth (rev 0) +++ cpu/x86/pc/olpc/iflash.fth 2009-01-23 19:45:08 UTC (rev 1076) @@ -0,0 +1,71 @@ +\ Reflasher that merges Insyde BIOS with manufacturing data + +h# 300 constant /mfg-data-merge +mfg-data-end-offset /mfg-data-merge - constant mfg-data-merge-offset + +: $get-insyde ( filename$ -- ) + $read-open + flash-buf /flash ifd @ fgets ( len ) + ifd @ fclose + + /flash <> abort" Image file is the wrong length" + + flash-buf mfg-data-merge-offset + /mfg-data-merge 0 bskip ( residue ) + abort" Firmware image has data in the manufacturing data block" + + true to file-loaded? +; + +: merge-mfg-data ( -- ) + flash-base mfg-data-merge-offset + + flash-buf mfg-data-merge-offset + + /mfg-data-merge move +; + +: get-insyde ( ["filename"] -- ) + parse-word ( adr len ) + dup 0= if 2drop " u:\insyde.rom" then ( adr len ) + ." Reading " 2dup type cr ( adr len ) + $get-insyde +; + +: write-insyde ( -- ) + flash-buf /flash 0 write-flash-range +; + +: ireflash ( -- ) \ Flash from data already in memory + ?file + flash-write-enable + + merge-mfg-data + + write-insyde + + spi-us d# 20 < if + ['] verify catch if + ." Verify failed. Retrying once" cr + spi-identify + write-insyde + verify + then + flash-write-disable + else + .verify-msg + then +; + +: iflash ( ["filename"] -- ) get-insyde ?enough-power ireflash ; + +: save-insyde ( -- ) + " u:\insyde.rom" $write-open + + \ Get the FLASH data into a buffer, slowly to avoid locking out the EC + slow-flash-read + + \ Zap the manufacturing data + flash-buf mfg-data-merge-offset + /mfg-data-merge 0 fill + + flash-buf /flash ofd @ fputs + + ofd @ fclose +; Added: cpu/x86/pc/olpc/usbpwr.fth =================================================================== --- cpu/x86/pc/olpc/usbpwr.fth (rev 0) +++ cpu/x86/pc/olpc/usbpwr.fth 2009-01-23 19:45:08 UTC (rev 1076) @@ -0,0 +1,27 @@ +purpose: Bounce USB power to reset devices + +\ This is used by the biosload build for OLPC to reset USB +\ devices. Insyde BIOS / GeodeROM leaves some USB sticks in +\ funny state in which reads fail. Power cycling fixes them. + +: power-cycle-usb ( -- ) + " /pci/usb@f,4" open-dev >r \ OHCI controller + + \ Configure the OHCI controller for global power switching + " hc-rh-desa@" r@ $call-method ( desA ) + h# 300 invert and ( desA' ) + " hc-rh-desa!" r@ $call-method ( desA ) + + \ Turn off the power from the OHCI point of view, leaving the + \ EHCI in control (the power switches are the logical OR + \ of the OHCI and EHCI controls) + 1 " hc-rh-stat!" r@ $call-method + r> close-dev + d# 100 ms + + " /pci/usb@f,5" open-dev ( ih ) \ EHCI controller + 4 0 do 0 i " portsc!" 4 pick $call-method loop ( ih ) + d# 100 ms + 4 0 do i " power-port" 3 pick $call-method loop ( ih ) + close-dev +;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware January 2009