openfirmware August 2010

openfirmware@openfirmware.info

1 participants
48 discussions

[commit] r1916 - dev/mmc/sdhci
by repository service 05 Aug '10

05 Aug '10

Author: wmb Date: Thu Aug 5 02:47:11 2010 New Revision: 1916 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1916 Log: SD driver - improved implementation of app-get-status and wrote a decoder for its information. Modified: dev/mmc/sdhci/sdhci.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Thu Aug 5 02:46:03 2010 (r1915) +++ dev/mmc/sdhci/sdhci.fth Thu Aug 5 02:47:11 2010 (r1916) @@ -467,17 +467,41 @@ \ This sends back 512 bits (64 bytes) in a single data block. See sdstatbits \ It contains things like the allocation unit size and the speed class. -: app-get-status ( -- buf ) \ ACMD13 R1 +0 value sd-status-buf +: app-get-status ( -- ) \ ACMD13 R1 intstat-on - scratch-buf d# 64 dup (dma-setup) + sd-status-buf d# 64 dup (dma-setup) app-prefix 0 h# 0d3a h# 13 cmd - response h# 20 and 0= abort" ACMD13 not implemented!" - 2 wait + response h# 20 and if 2 wait then dma-release - scratch-buf intstat-off ; +\ Decoder for the result of ACMD13 - app-get-status +: sdstatbit ( bit# -- b ) + d# 511 swap - ( bit#' ) + dup 3 rshift sd-status-buf + c@ ( bit-offset byte ) + swap 7 and 7 xor rshift 1 and +; +: sdstatbits ( high low -- bits ) + swap 0 -rot do 2* i sdstatbit or -1 +loop +; + +\ This would be more useful if more cards bothered to report the information correctly +: show-sd-status ( -- ) + d# 64 " dma-alloc" $call-parent to sd-status-buf + app-get-status + base @ >r + decimal + ." Class: " d# 447 d# 440 sdstatbits 2* . +\ ." AU size: " d# 431 d# 428 sdstatbits 8 swap lshift . ." KiB" +\ ." EraseSize: " d# 423 d# 408 sdstatbits . ." AU" +\ ." EraseTimeout: " d# 407 d# 402 sdstatbits . " sec" +\ ." EraseOffset: " d# 401 d# 400 sdstatbits . " sec" + r> base ! + sd-status-buf d# 64 " dma-free" $call-parent +; + : get-#write-blocks ( -- n ) app-prefix 0 h# 161a 0 cmd response ; \ ACMD22 R1 UNTESTED \ Using this before a write-multiple command speeds up the write by @@ -995,17 +1019,6 @@ swap 0 -rot do 2* i csdbit or -1 +loop ; -\ Decoder for the result of ACMD13 - app-get-status -: sdstatbit ( bit# -- b ) - d# 511 swap - ( bit#' ) - dup 3 rshift scratch-buf + c@ ( bit-offset byte ) - swap 7 and 7 xor rshift 1 and -; -: sdstatbits ( high low -- bits ) - swap 0 -rot do 2* i sdstatbit or -1 +loop -; - - \ The calculation below is shown on page 81 of the \ SD Physical Layer Simplified Specification Version 2.00. : size ( -- d.bytes )

1 0

[commit] r1915 - in cpu/x86: . pc/olpc pc/olpc/via
by repository service 05 Aug '10

05 Aug '10

Author: wmb Date: Thu Aug 5 02:46:03 2010 New Revision: 1915 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1915 Log: OLPC - new ".speed" command for measuring read/write speeds of mass storage devices. Added: cpu/x86/pc/olpc/diskspeed.fth Modified: cpu/x86/acpitimer.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/fw.bth cpu/x86/tsc.fth Modified: cpu/x86/acpitimer.fth ============================================================================== --- cpu/x86/acpitimer.fth Thu Aug 5 02:37:12 2010 (r1914) +++ cpu/x86/acpitimer.fth Thu Aug 5 02:46:03 2010 (r1915) @@ -71,8 +71,9 @@ \ Subtracting 10 accounts for the time it takes to read the ACPI timer, \ which is an I/O port and therefore slow to read : ))t1 ( -- d.ticks ) get-timer timestamp 2@ d- d# 10. d- 0. dmax ; +: ))t-usecs ( -- usec ) ))t1 acpi-ticks>usecs ; : )t ( -- ) - ))t1 acpi-ticks>usecs ( microseconds ) + ))t-usecs ( microseconds ) push-decimal <# u# u# u# [char] , hold u# u#s u#> type ." uS " pop-base Added: cpu/x86/pc/olpc/diskspeed.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/diskspeed.fth Thu Aug 5 02:46:03 2010 (r1915) @@ -0,0 +1,77 @@ +\ See license at end of file +purpose: Disk raw read/write speed test + +\ Example: ok .speed ext:0 +\ +\ The test is non-destructive unless a write failure occurs. +\ It reads first, then writes the same data back. + +0 value disk-ih +0 value disk-speed-transfer +0 value disk-speed-#blocks +0 value disk-speed-/block +0 value disk-speed-total-blocks +h# 200.0000 constant disk-speed-len \ 32 MB + +: .mb/sec ( usecs -- ) + disk-speed-len d# 20 rot */ ( 20*mb/sec ) + 1+ 2/ ( 10*mb/sec-rounded ) + push-decimal + <# u# [char] . hold u#s u#> type + pop-base + ." Mb/sec" +; +: .speed ( "devname" -- ) + safe-parse-word open-dev to disk-ih + disk-ih 0= abort" Can't open device" + " block-size" disk-ih $call-method to disk-speed-/block + + " max-transfer" disk-ih $call-method to disk-speed-transfer + disk-speed-transfer disk-speed-/block / to disk-speed-#blocks + + disk-speed-len disk-speed-/block / to disk-speed-total-blocks + + ." Read speed: " + t( + disk-speed-total-blocks 0 do + load-base i disk-speed-/block * + ( adr ) + i disk-speed-#blocks " read-blocks" disk-ih $call-method drop + disk-speed-#blocks +loop + ))t-usecs ( usecs ) + .mb/sec space + + ." Write speed: " + t( + disk-speed-total-blocks 0 do + load-base i disk-speed-/block * + ( adr ) + i disk-speed-#blocks " write-blocks" disk-ih $call-method drop + disk-speed-#blocks +loop + ))t-usecs ( usecs ) + .mb/sec cr + + disk-ih close-dev +; + +\ LICENSE_BEGIN +\ Copyright (c) 2010 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Thu Aug 5 02:37:12 2010 (r1914) +++ cpu/x86/pc/olpc/fw.bth Thu Aug 5 02:46:03 2010 (r1915) @@ -679,6 +679,8 @@ \ Fancy battery charge logger. fload ${BP}/cpu/x86/pc/olpc/charge.fth +fload ${BP}/cpu/x86/pc/olpc/diskspeed.fth \ Mass storage speed test + \ This helps with TeraTerm, which sends ESC-O as the arrow key prefix also hidden also keys-forth definitions warning @ warning off Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Thu Aug 5 02:37:12 2010 (r1914) +++ cpu/x86/pc/olpc/via/fw.bth Thu Aug 5 02:46:03 2010 (r1915) @@ -748,6 +748,8 @@ \ Fancy battery charge logger. fload ${BP}/cpu/x86/pc/olpc/charge.fth +fload ${BP}/cpu/x86/pc/olpc/diskspeed.fth \ Mass storage speed test + \ This helps with TeraTerm, which sends ESC-O as the arrow key prefix also hidden also keys-forth definitions warning @ warning off Modified: cpu/x86/tsc.fth ============================================================================== --- cpu/x86/tsc.fth Thu Aug 5 02:37:12 2010 (r1914) +++ cpu/x86/tsc.fth Thu Aug 5 02:46:03 2010 (r1915) @@ -46,8 +46,9 @@ : t-update ; : t( ( -- ) tsc@ timestamp 2! ; : ))t ( -- d.ticks ) tsc@ timestamp 2@ d- ; +: ))t-usecs ( -- usecs ) ))t us-factor um/mod nip ; : )t ( -- ) - ))t us-factor um/mod nip ( microseconds ) + ))t-usecs ( microseconds ) push-decimal <# u# u# u# [char] , hold u# u#s u#> type ." uS " pop-base

1 0

[commit] r1914 - dev/olpc/keyboard
by repository service 05 Aug '10

05 Aug '10

Author: wmb Date: Thu Aug 5 02:37:12 2010 New Revision: 1914 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1914 Log: OLPC keyboard selftest - faster/simpler version of stuck key sensing code. Modified: dev/olpc/keyboard/selftest.fth Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Wed Aug 4 19:08:23 2010 (r1913) +++ dev/olpc/keyboard/selftest.fth Thu Aug 5 02:37:12 2010 (r1914) @@ -196,17 +196,7 @@ ; [then] -: key-stuck? ( -- flag ) - ukey? if debug-me then - #keys 0 do - i key-adr >key-time @ ?dup if ( msecs ) - d# 3,000 + get-msecs - 0< if ( ) - true unloop exit - then - then - loop - false -; +0 value key-stuck? d# 128 8 / constant #key-bytes #key-bytes buffer: key-bitmap @@ -519,7 +509,7 @@ : set-key-time ( timestamp key-adr -- ) over 0<> over >key-time @ 0<> and if ( timestamp key-adr ) \ If both timestamp and old key time are nonzero, then we preserve the old key time - 2drop + >key-time @ d# 3,000 + - 0> to key-stuck? else \ If either timestamp or old key time is 0, we set the key time >key-time ! @@ -640,6 +630,7 @@ make-keys + 0 to key-stuck? cursor-off draw-keyboard true to locked? \ Disable the keyboard alarm handler; it steals our scancodes selftest-keys

1 0

[commit] r1913 - in cpu/x86/pc/olpc: . via
by repository service 04 Aug '10

04 Aug '10

Author: wmb Date: Wed Aug 4 19:08:23 2010 New Revision: 1913 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1913 Log: OLPC NANDblaster - renamed some source files so the naming scheme is consistent between XO-1 and XO-1.5 Added: cpu/x86/pc/olpc/nbtx.fth - copied unchanged from r1912, cpu/x86/pc/olpc/nandcastui.fth cpu/x86/pc/olpc/via/nbtx.fth - copied unchanged from r1912, cpu/x86/pc/olpc/nb15tx.fth Deleted: cpu/x86/pc/olpc/nandcastui.fth cpu/x86/pc/olpc/nb15tx.fth Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/fw.bth Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Wed Aug 4 18:51:00 2010 (r1912) +++ cpu/x86/pc/olpc/fw.bth Wed Aug 4 19:08:23 2010 (r1913) @@ -466,7 +466,7 @@ create use-mesh fload ${BP}/cpu/x86/bootascall.fth fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth -fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth +fload ${BP}/cpu/x86/pc/olpc/nbtx.fth fload ${BP}/cpu/x86/pc/olpc/nbrx.fth fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth Copied: cpu/x86/pc/olpc/nbtx.fth (from r1912, cpu/x86/pc/olpc/nandcastui.fth) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/nbtx.fth Wed Aug 4 19:08:23 2010 (r1913, copy of r1912, cpu/x86/pc/olpc/nandcastui.fth) @@ -0,0 +1,98 @@ +purpose: User interface for NAND multicast updater - transmission +\ See license at end of file + +: mesh-ssids ( -- $ ) + " olpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh"nolpc-mesh" +; + +: select-mesh-mode ( -- ) + \ Check for already set because re-setting it will force rescanning + ['] mesh-ssids to default-ssids + wifi-cfg >wc-ssid pstr@ " olpc-mesh" $= 0= if + " olpc-mesh" $essid + then +; + +: $file-to-mem ( filename$ -- adr len ) + $read-open + ifd @ fsize dup alloc-mem swap ( adr len ) + 2dup ifd @ fgets ( adr len actual ) + ifd @ fclose ( adr len actual ) + over <> abort" Can't read file" cr ( adr len ) +; + +: #nb-clone ( channel# -- ) + depth 1 < abort" Usage: channel# #nb-clone" + redundancy swap + " rom:nb_tx ether:%d nand: %d" sprintf boot-load go +; +: #nb-copy ( image-filename$ channel# -- ) + depth 3 < abort" #nb-copy - too few arguments" + >r 2>r ( placement-filename$ r: channel# image-filename$ ) + redundancy 2r> r> ( redundancy image-filename$ channel# ) + " rom:nb_tx ether:%d %s %d 131072" sprintf boot-load go +; +: #nb-update ( placement-filename$ image-filename$ channel# -- ) + depth 5 < abort" #nb-update - too few arguments" + >r 2>r ( placement-filename$ r: channel# image-filename$ ) + $file-to-mem ( spec$ r: channel# image-filename$ ) + swap redundancy 2r> r> ( speclen specadr redundancy image-filename$ channel# ) + " rom:nb_tx ether:%d %s %d 131072 %d %d" sprintf boot-load go +; +: #nb-secure ( zip-filename$ image-filename$ channel# -- ) + depth 5 < abort" #nb-secure-update - too few arguments" + >r 2>r ( placement-filename$ r: channel# image-filename$ ) + load-read sig$ ?save-string swap ( siglen sigadr r: channel# image-filename$ ) + img$ ?save-string swap ( siglen sigadr speclen specadr r: channel# image-filename$ ) + redundancy 2r> r> ( siglen sigadr speclen specadr redundancy image-filename$ channel# ) + " rom:nb_tx ether:%d %s %d 131072 %d %d %d %d" sprintf boot-load go +; + +: #nb-update-def ( channel# -- ) >r " u:\fs.plc" " u:\fs.img" r> #nb-update ; +: #nb-secure-def ( channel# -- ) >r " u:\fs.zip" " u:\fs.img" r> #nb-secure ; + +: nb-clone ( -- ) nb-auto-channel #nb-clone ; +: nb-secure ( -- ) nb-auto-channel #nb-secure-def ; +: nb-update ( -- ) nb-auto-channel #nb-update-def ; + +: nb-clone1 ( -- ) 1 #nb-clone ; +: nb-clone6 ( -- ) 6 #nb-clone ; +: nb-clone11 ( -- ) d# 11 #nb-clone ; + +: nb-update1 ( -- ) 1 #nb-update-def ; +: nb-update6 ( -- ) 6 #nb-update-def ; +: nb-update11 ( -- ) d# 11 #nb-update-def ; + +: nb-secure1 ( -- ) 1 #nb-secure-def ; +: nb-secure6 ( -- ) 6 #nb-secure-def ; +: nb-secure11 ( -- ) d# 11 #nb-secure-def ; + +: mesh-clone + select-mesh-mode + false to already-go? + redundancy " boot rom:nb_tx udp:239.255.1.2 nand: %d" sprintf eval +; + +\ LICENSE_BEGIN +\ Copyright (c) 2008 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Wed Aug 4 18:51:00 2010 (r1912) +++ cpu/x86/pc/olpc/via/fw.bth Wed Aug 4 19:08:23 2010 (r1913) @@ -517,7 +517,7 @@ create use-thinmac fload ${BP}/cpu/x86/bootascall.fth fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth -fload ${BP}/cpu/x86/pc/olpc/nb15tx.fth +fload ${BP}/cpu/x86/pc/olpc/via/nbtx.fth fload ${BP}/cpu/x86/pc/olpc/via/nbrx.fth fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth Copied: cpu/x86/pc/olpc/via/nbtx.fth (from r1912, cpu/x86/pc/olpc/nb15tx.fth) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/via/nbtx.fth Wed Aug 4 19:08:23 2010 (r1913, copy of r1912, cpu/x86/pc/olpc/nb15tx.fth) @@ -0,0 +1,110 @@ +purpose: User interface for NAND multicast updater - transmission to XO-1.5 +\ See license at end of file + +\ This sender is for multicast operation over a wired network. +\ It is rarely used, because the wired multicast mode is primarily +\ used in the factory with a big server as the sender. +\ Example: wired-nb-tx: u:\os201.zd 224.0.0.2 +: wired-nb-tx: ( "filename" "multicast-ip-address" -- ) + false to already-go? + safe-parse-word safe-parse-word + " boot rom:nb_tx udp:%s %s 20 131072" sprintf eval +; + +\ This sends to XO-1.5 receivers, but the sender itself can run on either XO-1 or XO-1.5. +\ On XO-1, you must load the special "thin" firmware from a USB stick. +: ?load-thin-wlan-fw ( -- ) + " /wlan" find-package 0= abort" No /wlan device" ( phandle ) + + " thin" rot get-package-property if ( ) + \ Absence of "thin" property means we need to get special firmware + " u:\usb8388t.bin" " wlan-fw" $setenv + \ We have to reset the device and driver to force it to reload + \ the thin firmware, in case firmware has already been loaded. + wlan-reset + " dev /wlan ds-not-ready to driver-state dend" evaluate + else ( adr len ) + \ Presence of "thin" property means we are good to go + 2drop + then +; + +: $nb-tx ( filename$ channel# -- ) + >r 2>r redundancy 2r> r> + ?load-thin-wlan-fw + false to already-go? + + " boot rom:nb_tx thinmac:OLPC-NANDblaster,%d %s %d 131072" sprintf eval +; + +: nb-tx: ( "filename" -- ) + redundancy ( redundancy ) + safe-parse-word ( redundancy filename$ ) + nb-auto-channel ( redundancy filename$ channel# ) + + ?load-thin-wlan-fw + false to already-go? + + " boot rom:nb_tx thinmac:OLPC-NANDblaster,%d %s %d 131072" sprintf eval +; + +: #nb-secure ( zip-filename$ image-filename$ channel# -- ) + depth 5 < abort" #nb-secure-update - too few arguments" + >r 2>r ( placement-filename$ r: channel# image-filename$ ) + load-read sig$ ?save-string swap ( siglen sigadr r: channel# image-filename$ ) + img$ ?save-string swap ( siglen sigadr speclen specadr r: channel# image-filename$ ) + redundancy 2r> r> ( siglen sigadr speclen specadr redundancy image-filename$ channel# ) + " rom:nb_tx thinmac:OLPC-NANDblaster,%d %s %d 131072 %d %d %d %d" sprintf boot-load go +; +: #nb-secure-def ( channel# -- ) >r " u:\fs.zip" " u:\fs.zd" r> #nb-secure ; + +: #nb-update-def ( channel# -- ) >r " u:\fs.zd" r> $nb-tx ; +: nb-update1 ( -- ) 1 #nb-update-def ; +: nb-update6 ( -- ) 6 #nb-update-def ; +: nb-update11 ( -- ) d# 11 #nb-update-def ; + +: nb-secure1 ( -- ) 1 #nb-secure-def ; +: nb-secure6 ( -- ) 6 #nb-secure-def ; +: nb-secure11 ( -- ) d# 11 #nb-secure-def ; + +: nb-secure ( -- ) nb-auto-channel #nb-secure-def ; +: nb-update ( -- ) nb-auto-channel #nb-update-def ; + +[ifdef] use-nb15-precomputed +\ NANDblaster sender using thin firmware on XO-1.5, with precomputed +\ packet data. This turns out to be useless because the packets can +\ be computed on-the-fly faster than the module can send. +: nb15-precomputed: ( "filename" ["delay"]-- ) + false to already-go? + safe-parse-word ( name$ ) + safe-parse-word 2>r ( name$ r: channel$ ) + parse-word 2swap ( delay$ name$ r: channel$ ) + 2r> + " u:\usb8388t.bin" " wlan-fw" $setenv + " boot rom:blaster thinmac:OLPC-NANDblaster,%s %s %s" sprintf eval +; +[then] + +\ LICENSE_BEGIN +\ Copyright (c) 2010 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

[commit] r1912 - cpu/x86/pc/olpc
by repository service 04 Aug '10

04 Aug '10

Author: wmb Date: Wed Aug 4 18:51:00 2010 New Revision: 1912 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1912 Log: OLPC NANDblaster - added nb-update and related words to make the XO-1.5 syntax for NANDblasting very similar to the XO-1 syntax. Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/nandcastui.fth cpu/x86/pc/olpc/nb15tx.fth cpu/x86/pc/olpc/wifichannel.fth Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Wed Aug 4 11:08:59 2010 (r1911) +++ cpu/x86/pc/olpc/fw.bth Wed Aug 4 18:51:00 2010 (r1912) @@ -465,8 +465,8 @@ create use-mesh fload ${BP}/cpu/x86/bootascall.fth -fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth +fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth fload ${BP}/cpu/x86/pc/olpc/nbrx.fth fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth Modified: cpu/x86/pc/olpc/nandcastui.fth ============================================================================== --- cpu/x86/pc/olpc/nandcastui.fth Wed Aug 4 11:08:59 2010 (r1911) +++ cpu/x86/pc/olpc/nandcastui.fth Wed Aug 4 18:51:00 2010 (r1912) @@ -51,6 +51,10 @@ : #nb-update-def ( channel# -- ) >r " u:\fs.plc" " u:\fs.img" r> #nb-update ; : #nb-secure-def ( channel# -- ) >r " u:\fs.zip" " u:\fs.img" r> #nb-secure ; +: nb-clone ( -- ) nb-auto-channel #nb-clone ; +: nb-secure ( -- ) nb-auto-channel #nb-secure-def ; +: nb-update ( -- ) nb-auto-channel #nb-update-def ; + : nb-clone1 ( -- ) 1 #nb-clone ; : nb-clone6 ( -- ) 6 #nb-clone ; : nb-clone11 ( -- ) d# 11 #nb-clone ; Modified: cpu/x86/pc/olpc/nb15tx.fth ============================================================================== --- cpu/x86/pc/olpc/nb15tx.fth Wed Aug 4 11:08:59 2010 (r1911) +++ cpu/x86/pc/olpc/nb15tx.fth Wed Aug 4 18:51:00 2010 (r1912) @@ -47,6 +47,7 @@ " boot rom:nb_tx thinmac:OLPC-NANDblaster,%d %s %d 131072" sprintf eval ; + : #nb-secure ( zip-filename$ image-filename$ channel# -- ) depth 5 < abort" #nb-secure-update - too few arguments" >r 2>r ( placement-filename$ r: channel# image-filename$ ) @@ -57,7 +58,17 @@ ; : #nb-secure-def ( channel# -- ) >r " u:\fs.zip" " u:\fs.zd" r> #nb-secure ; +: #nb-update-def ( channel# -- ) >r " u:\fs.zd" r> $nb-tx ; +: nb-update1 ( -- ) 1 #nb-update-def ; +: nb-update6 ( -- ) 6 #nb-update-def ; +: nb-update11 ( -- ) d# 11 #nb-update-def ; + +: nb-secure1 ( -- ) 1 #nb-secure-def ; +: nb-secure6 ( -- ) 6 #nb-secure-def ; +: nb-secure11 ( -- ) d# 11 #nb-secure-def ; + : nb-secure ( -- ) nb-auto-channel #nb-secure-def ; +: nb-update ( -- ) nb-auto-channel #nb-update-def ; [ifdef] use-nb15-precomputed \ NANDblaster sender using thin firmware on XO-1.5, with precomputed Modified: cpu/x86/pc/olpc/wifichannel.fth ============================================================================== --- cpu/x86/pc/olpc/wifichannel.fth Wed Aug 4 11:08:59 2010 (r1911) +++ cpu/x86/pc/olpc/wifichannel.fth Wed Aug 4 18:51:00 2010 (r1912) @@ -314,12 +314,6 @@ d# 4000 ms ; -[ifdef] use-mesh -: nb-clone ( -- ) nb-auto-channel #nb-clone ; -: nb-secure ( -- ) nb-auto-channel #nb-secure-def ; -: nb-update ( -- ) nb-auto-channel #nb-update-def ; -[then] - : load-read ( filename$ -- ) open-dev dup 0= abort" Can't open file" >r ( r: ih ) load-base " load" r@ $call-method !load-size

1 0

[commit] r1911 - cpu/x86/pc/olpc/via
by repository service 04 Aug '10

04 Aug '10

Author: quozl Date: Wed Aug 4 11:08:59 2010 New Revision: 1911 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1911 Log: Q3A49 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Wed Aug 4 10:37:50 2010 (r1910) +++ cpu/x86/pc/olpc/via/fw-version.fth Wed Aug 4 11:08:59 2010 (r1911) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 48 +macro: FW_MINOR 49

1 0

[commit] r1910 - dev/olpc/keyboard
by repository service 04 Aug '10

04 Aug '10

Author: wmb Date: Wed Aug 4 10:37:50 2010 New Revision: 1910 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1910 Log: OLPC keyboard selftest - fixed all-keys bitmap for the mechanical keyboard and added a test for stuck keys, as requested by manufacturing. Modified: dev/olpc/keyboard/selftest.fth Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Wed Aug 4 07:05:19 2010 (r1909) +++ dev/olpc/keyboard/selftest.fth Wed Aug 4 10:37:50 2010 (r1910) @@ -23,6 +23,7 @@ /n field >key-y /n field >key-w /n field >key-h + /n field >key-time constant /key /key d# 128 * buffer: keys @@ -54,7 +55,8 @@ : add-key-gap ( -- ) key-gap ++key-x ; : (make-key) ( x y w h -- ) #keys key-adr >r - r@ >key-h ! r@ >key-w ! r@ >key-y ! r> >key-x ! + r@ >key-h ! r@ >key-w ! r@ >key-y ! r@ >key-x ! + 0 r> >key-time ! #keys++ ; : make-key ( w -- ) dup key-x key-y rot single-key-h (make-key) ++key-x ; @@ -194,6 +196,18 @@ ; [then] +: key-stuck? ( -- flag ) + ukey? if debug-me then + #keys 0 do + i key-adr >key-time @ ?dup if ( msecs ) + d# 3,000 + get-msecs - 0< if ( ) + true unloop exit + then + then + loop + false +; + d# 128 8 / constant #key-bytes #key-bytes buffer: key-bitmap : set-key-bit ( key# -- ) @@ -223,9 +237,9 @@ \ The mechanical keyboard has no slider keys. All displayed button locations are \ activated by pressing single keystrokes, so the map is dense -h# ffffff constant funny-map2 +h# ffffffff constant funny-map2 create all-keys-bitmap2 -ff c, ff c, ff c, 00 c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, 3f c, 00 c, 00 c, 00 c, 00 c, 00 c, : all-tested?0 ( -- flag ) \ Just buttons @@ -502,19 +516,29 @@ ibm#>key# ; -: draw-key ( key# color -- ) - swap - key-adr >r ( color# r: key-adr ) - r@ >key-w @ hidden-key-w = if - r> 2drop +: set-key-time ( timestamp key-adr -- ) + over 0<> over >key-time @ 0<> and if ( timestamp key-adr ) + \ If both timestamp and old key time are nonzero, then we preserve the old key time + 2drop else - r@ >key-x @ r@ >key-y @ r@ >key-w @ r> >key-h @ - " fill-rectangle" $call-screen + \ If either timestamp or old key time is 0, we set the key time + >key-time ! + then +; + +: draw-key ( key# color timestamp -- ) + rot key-adr >r ( color# timestamp r: key-adr ) + r@ set-key-time ( color# r: key-adr ) + r@ >key-w @ hidden-key-w = if ( color# r: key-adr ) + r> 2drop ( ) + else ( color# r: key-adr ) + r@ >key-x @ r@ >key-y @ r@ >key-w @ r> >key-h @ ( color# x y w h ) + " fill-rectangle" $call-screen ( ) then ; -: key-tested ( key# -- ) tested-key-color draw-key ; -: key-down ( key# -- ) down-key-color draw-key ; -: key-up ( key# -- ) idle-key-color draw-key ; +: key-tested ( key# -- ) tested-key-color 0 draw-key ; +: key-down ( key# -- ) down-key-color get-msecs draw-key ; +: key-up ( key# -- ) idle-key-color 0 draw-key ; : fill-screen ( color -- ) 0 0 " dimensions" $call-screen " fill-rectangle" $call-screen @@ -567,6 +591,9 @@ clear-key-bitmap get-msecs to last-timestamp begin + final-test? smt-test? or if + key-stuck? if exit then + then get-data? if ( scancode ) process-raw ( exit? ) get-msecs to last-timestamp @@ -623,8 +650,17 @@ close final-test? smt-test? or if - all-tested? 0= - dup if ." Some keys were not pressed" cr then + key-stuck? if + ." Stuck key" cr + true exit + then + + all-tested? if + false + else + ." Some keys were not pressed" cr + true + then else confirm-selftest? then

1 0

[commit] r1909 - cpu/x86/pc/olpc/via dev/mmc/sdhci/mv8686
by repository service 04 Aug '10

04 Aug '10

Author: wmb Date: Wed Aug 4 07:05:19 2010 New Revision: 1909 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1909 Log: XO-1.5 WLAN - reduced the length of the WLAN reset pulse from 10 mS to 10 uS to comply with the stipulations in Marvell AN-20017. Modified: cpu/x86/pc/olpc/via/devices.fth dev/mmc/sdhci/mv8686/quirk.fth Modified: cpu/x86/pc/olpc/via/devices.fth ============================================================================== --- cpu/x86/pc/olpc/via/devices.fth Wed Aug 4 06:47:17 2010 (r1908) +++ cpu/x86/pc/olpc/via/devices.fth Wed Aug 4 07:05:19 2010 (r1909) @@ -256,7 +256,7 @@ : wlan-reset ( -- ) h# 4c acpi-l@ ( old ) dup h# 800 invert and h# 4c acpi-l! ( old ) - d# 10 ms ( old ) + d# 10 us ( old ) h# 800 or h# 4c acpi-l! ( ) ; warning ! Modified: dev/mmc/sdhci/mv8686/quirk.fth ============================================================================== --- dev/mmc/sdhci/mv8686/quirk.fth Wed Aug 4 06:47:17 2010 (r1908) +++ dev/mmc/sdhci/mv8686/quirk.fth Wed Aug 4 07:05:19 2010 (r1909) @@ -4,7 +4,7 @@ \ it might not reset correctly. : mv8686-reset-quirk ( -- ) - d# 50 ms + 5 ms " wlan-reset" evaluate ; ' mv8686-reset-quirk to ?mv8686-quirk

1 0

[commit] r1908 - in dev/mmc/sdhci: . mv8686
by repository service 04 Aug '10

04 Aug '10

Author: wmb Date: Wed Aug 4 06:47:17 2010 New Revision: 1908 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1908 Log: SD driver - added quirk for Marvell 88W8686 reset issue as described in Marvell AppNote AN-20017. It is possible that, without this workaround, the XO-1.5 WLAN module might fail to reset properly. Added: dev/mmc/sdhci/mv8686/quirk.fth Modified: dev/mmc/sdhci/sdhci.fth dev/mmc/sdhci/sdhcixo.bth Added: dev/mmc/sdhci/mv8686/quirk.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/mmc/sdhci/mv8686/quirk.fth Wed Aug 4 06:47:17 2010 (r1908) @@ -0,0 +1,10 @@ +\ This is a workaround for a reset problem with the Marvell 88W8686 +\ as described in Marvell AppNote AN-20017. Basically, you have to +\ pulse the external reset pin after powering up the module, otherwise +\ it might not reset correctly. + +: mv8686-reset-quirk ( -- ) + d# 50 ms + " wlan-reset" evaluate +; +' mv8686-reset-quirk to ?mv8686-quirk Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Wed Aug 4 06:44:34 2010 (r1907) +++ dev/mmc/sdhci/sdhci.fth Wed Aug 4 06:47:17 2010 (r1908) @@ -23,6 +23,8 @@ h# 200 constant /block \ 512 bytes +defer ?mv8686-quirk ' noop to ?mv8686-quirk + external : set-address ( rca slot -- ) to slot to rca map-regs ; : get-address ( -- rca ) rca ; @@ -749,6 +751,7 @@ card-power-off d# 500 ms card-power-on d# 50 ms \ This delay is just a guess (20 was barely too slow for a Via board) card-inserted? 0= if card-power-off intstat-off false true exit then + ?mv8686-quirk card-clock-slow d# 50 ms \ This delay is just a guess reset-card \ Cmd 0 false Modified: dev/mmc/sdhci/sdhcixo.bth ============================================================================== --- dev/mmc/sdhci/sdhcixo.bth Wed Aug 4 06:44:34 2010 (r1907) +++ dev/mmc/sdhci/sdhcixo.bth Wed Aug 4 06:47:17 2010 (r1908) @@ -10,7 +10,7 @@ FCode-version2 fload ${BP}/dev/mmc/sdhci/pciregs.fth fload ${BP}/dev/mmc/sdhci/sdhci.fth - +fload ${BP}/dev/mmc/sdhci/mv8686/quirk.fth init : populate-children ( -- )

1 0

[commit] r1907 - dev/mmc/sdhci
by repository service 04 Aug '10

04 Aug '10

Author: wmb Date: Wed Aug 4 06:44:34 2010 New Revision: 1907 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1907 Log: SD driver - added "show-cid" command. Modified: dev/mmc/sdhci/sdhci.fth dev/mmc/sdhci/sdmmc.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Tue Aug 3 21:52:21 2010 (r1906) +++ dev/mmc/sdhci/sdhci.fth Wed Aug 4 06:44:34 2010 (r1907) @@ -408,7 +408,7 @@ \ Get Card-specific data : get-csd ( -- ) rca h# 0909 0 cmd csd get-response136 ; \ CMD9 R2 -: get-cid ( -- ) rca h# 0a09 0 cmd cid get-response136 ; \ CMD10 R2 UNTESTED +: get-cid ( -- ) rca h# 0a09 0 cmd cid get-response136 ; \ CMD10 R2 : stop-transmission ( -- ) rca h# 0c1b 0 cmd ; \ CMD12 R1b UNTESTED @@ -824,6 +824,7 @@ card-clock-25 get-csd \ Cmd 9 - Get card-specific data + get-cid \ Cmd 10 - Get card ID select-card \ Cmd 7 - Select @@ -962,6 +963,21 @@ unmap-regs ; +: cid@ ( offset -- byte ) cid + c@ ; +: .nospace <# u#s u#> type ; +: show-cid ( -- ) + base @ >r hex + ." Mfg ID: " d# 14 cid@ ." 0x" .nospace + ." OEM ID: " d# 13 cid@ emit d# 12 cid@ emit + ." Name: " 7 d# 11 do i cid@ emit -1 +loop + ." Rev: " 6 cid@ dup 4 rshift .nospace ." ." h# f and .nospace + decimal + ." Date: " 0 cid@ 1 cid@ bwjoin dup 4 rshift d# 2000 + .nospace ." -" h# f and .nospace + hex + ." SN: " 2 cid@ 3 cid@ 4 cid@ 5 cid@ bljoin ." 0x" .nospace + r> base ! +; + \ The bit numbering follows the table on page 78 of the \ SD Physical Layer Simplified Specification Version 2.00. Modified: dev/mmc/sdhci/sdmmc.fth ============================================================================== --- dev/mmc/sdhci/sdmmc.fth Tue Aug 3 21:52:21 2010 (r1906) +++ dev/mmc/sdhci/sdmmc.fth Wed Aug 4 06:44:34 2010 (r1907) @@ -105,6 +105,8 @@ : load ( addr -- size ) " load" label-package $call-method ; : size ( -- d.size ) " size" label-package $call-method ; + +: show-cid ( -- ) " show-cid" $call-parent ; headers \ LICENSE_BEGIN

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware August 2010