July 2010 - openfirmware - mail.coreboot.org

[commit] r1888 - in cpu/x86/pc/olpc: . via
by repository service July 20, 2010

July 20, 2010

Author: wmb Date: Tue Jul 20 01:32:54 2010 New Revision: 1888 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1888 Log: OLPC XO-1.5 - Implemented secure NANDblaster mode . Modified: cpu/x86/pc/olpc/nandcastui.fth cpu/x86/pc/olpc/nb15tx.fth cpu/x86/pc/olpc/via/blockfifo.fth cpu/x86/pc/olpc/via/fsupdate.fth cpu/x86/pc/olpc/via/mcnand-version.fth cpu/x86/pc/olpc/via/nbrx.fth cpu/x86/pc/olpc/wifichannel.fth Modified: cpu/x86/pc/olpc/nandcastui.fth ============================================================================== --- cpu/x86/pc/olpc/nandcastui.fth Mon Jul 19 23:55:55 2010 (r1887) +++ cpu/x86/pc/olpc/nandcastui.fth Tue Jul 20 01:32:54 2010 (r1888) @@ -20,17 +20,6 @@ ifd @ fclose ( adr len actual ) over <> abort" Can't read file" cr ( adr len ) ; -: load-read ( filename$ -- ) - open-dev dup 0= abort" Can't open file" >r ( r: ih ) - load-base " load" r@ $call-method !load-size - r> close-dev -; - -: secure$ ( -- adr len ) - secure? security-off? 0= and if " secure" else null$ then -; - -d# 20 value redundancy : #nb-clone ( channel# -- ) depth 1 < abort" Usage: channel# #nb-clone" Modified: cpu/x86/pc/olpc/nb15tx.fth ============================================================================== --- cpu/x86/pc/olpc/nb15tx.fth Mon Jul 19 23:55:55 2010 (r1887) +++ cpu/x86/pc/olpc/nb15tx.fth Tue Jul 20 01:32:54 2010 (r1888) @@ -28,24 +28,36 @@ 2drop then ; -: $nb15-tx ( redundancy$ filename$ channel$ -- ) + +: $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,%s %s %s 131072" sprintf eval + " boot rom:nb_tx thinmac:OLPC-NANDblaster,%d %s %d 131072" sprintf eval ; -: nb15-tx: ( "filename" [ "redundancy" ] -- ) - safe-parse-word ( filename$ ) - parse-word ( filename$ redundancy$ ) - dup 0= if 2drop " 20" then ( filename$ redundancy$' ) - 2swap ( redundancy$ filename$ ) - nb-auto-channel ( redundancy$ filename$ channel# ) + +: 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 %s 131072" sprintf eval + " 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-secure ( -- ) nb-auto-channel #nb-secure-def ; [ifdef] use-nb15-precomputed \ NANDblaster sender using thin firmware on XO-1.5, with precomputed Modified: cpu/x86/pc/olpc/via/blockfifo.fth ============================================================================== --- cpu/x86/pc/olpc/via/blockfifo.fth Mon Jul 19 23:55:55 2010 (r1887) +++ cpu/x86/pc/olpc/via/blockfifo.fth Tue Jul 20 01:32:54 2010 (r1888) @@ -11,6 +11,7 @@ 0 instance value write-index 0 instance value max-depth false instance value synchronous? +0 value debug? : #queued ( -- n ) write-index read-index - @@ -106,7 +107,9 @@ : drain-queue ( -- ) synchronous? 0= if - ." Max queue depth was " max-depth .d ." , current is " #queued .d cr + debug? if + ." Max queue depth was " max-depth .d ." , current is " #queued .d cr + then true to synchronous? then begin empty? 0= while poll repeat Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Mon Jul 19 23:55:55 2010 (r1887) +++ cpu/x86/pc/olpc/via/fsupdate.fth Tue Jul 20 01:32:54 2010 (r1888) @@ -92,12 +92,18 @@ ; : data: ( "filename" -- ) - safe-parse-word fn-buf place - " ${DN}${PN}\${CN}${FN}" expand$ image-name-buf place - image-name$ r/o open-file if + safe-parse-word ( filename$ ) + nb-zd-#sectors if ( filename$ ) + 2drop " /nb-updater" ( filename$' ) + else ( filename$ ) + fn-buf place ( ) + " ${DN}${PN}\${CN}${FN}" expand$ image-name-buf place + image-name$ ( filename$' ) + then ( filename$ ) + r/o open-file if ( fd ) drop ." Can't open " image-name$ type cr true " " ?nand-abort - then to filefd + then to filefd ( ) linefeed filefd force-line-delimiter true to secure-fsupdate? ; Modified: cpu/x86/pc/olpc/via/mcnand-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/mcnand-version.fth Mon Jul 19 23:55:55 2010 (r1887) +++ cpu/x86/pc/olpc/via/mcnand-version.fth Tue Jul 20 01:32:54 2010 (r1888) @@ -3,6 +3,6 @@ \ With a specific ID, mcastnand.bth will download a tarball without .git stuff. \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ \ is not already present, then you can modify the git subtree as needed. -macro: MCNAND_VERSION af0cadd1cbfb17ddfa7dcf299c4c3662ad7120a4 +macro: MCNAND_VERSION 506d22f97f71632efa353dc347646d24570024b1 \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD Modified: cpu/x86/pc/olpc/via/nbrx.fth ============================================================================== --- cpu/x86/pc/olpc/via/nbrx.fth Mon Jul 19 23:55:55 2010 (r1887) +++ cpu/x86/pc/olpc/via/nbrx.fth Tue Jul 20 01:32:54 2010 (r1888) @@ -10,7 +10,8 @@ : nandblaster ( -- ) false to already-go? -1 to nb-zd-#sectors - " boot rom:nb15_rx ssid:OLPC-NANDblaster" sprintf eval + secure$ + " boot rom:nb15_rx ssid:OLPC-NANDblaster %s" sprintf eval ; alias nb nandblaster Modified: cpu/x86/pc/olpc/wifichannel.fth ============================================================================== --- cpu/x86/pc/olpc/wifichannel.fth Mon Jul 19 23:55:55 2010 (r1887) +++ cpu/x86/pc/olpc/wifichannel.fth Tue Jul 20 01:32:54 2010 (r1888) @@ -320,6 +320,19 @@ : 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 + r> close-dev +; + +: secure$ ( -- adr len ) + secure? security-off? 0= and if " secure" else null$ then +; + +d# 20 value redundancy + + \ LICENSE_BEGIN \ Copyright (c) 2008 FirmWorks \

1 0

[commit] r1887 - cpu/x86/pc/olpc
by repository service July 19, 2010

July 19, 2010

Author: wmb Date: Mon Jul 19 23:55:55 2010 New Revision: 1887 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1887 Log: OLPC XO-1 - removed temporary support for NANDblaster sending to XO-1.5s. Modified: cpu/x86/pc/olpc/fw.bth Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Sat Jul 17 05:19:08 2010 (r1886) +++ cpu/x86/pc/olpc/fw.bth Mon Jul 19 23:55:55 2010 (r1887) @@ -467,7 +467,6 @@ 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/nb15tx.fth fload ${BP}/cpu/x86/pc/olpc/nbrx.fth fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth

1 0

[commit] r1886 - cpu/x86/pc/olpc/via
by repository service July 17, 2010

July 17, 2010

Author: quozl Date: Sat Jul 17 05:19:08 2010 New Revision: 1886 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1886 Log: Q3A43 redux 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 Sat Jul 17 04:53:35 2010 (r1885) +++ cpu/x86/pc/olpc/via/fw-version.fth Sat Jul 17 05:19:08 2010 (r1886) @@ -1,3 +1,3 @@ -\ The overall firmware revision. +\ The overall firmware revision macro: FW_MAJOR A macro: FW_MINOR 43

1 0

[commit] r1885 - dev/olpc/keyboard
by repository service July 17, 2010

July 17, 2010

Author: wmb Date: Sat Jul 17 04:53:35 2010 New Revision: 1885 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1885 Log: OLPC XO-1.5 keyboard test - fixed recently-broken SMT mode (buttons only) of keyboard selftest. Modified: dev/olpc/keyboard/selftest.fth Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Sat Jul 17 04:43:16 2010 (r1884) +++ dev/olpc/keyboard/selftest.fth Sat Jul 17 04:53:35 2010 (r1885) @@ -77,6 +77,19 @@ ; : make-button ( x y -- ) button-w button-h (make-key) ; +: make-buttons + d# 80 d# 30 make-button \ Rocker up 65 + d# 30 d# 80 make-button \ Rocker left 67 + d# 130 d# 80 make-button \ Rocker right 68 + d# 80 d# 130 make-button \ Rocker down 66 + d# 80 d# 230 make-button \ Rotate 69 + + d# 1080 d# 30 make-button \ O e0 65 + d# 1030 d# 80 make-button \ square e0 67 + d# 1130 d# 80 make-button \ check e0 68 + d# 1080 d# 130 make-button \ X e0 66 +; + : make-keys1 ( -- ) 0 to #keys top-key-row @@ -103,6 +116,8 @@ 3 0 do make-single-key loop make-space-key 5 0 do make-single-key loop + + make-buttons ; : make-narrower-key ( -- ) d# 65 make-key&gap ; : make-wider-key ( -- ) d# 83 make-key&gap ; @@ -134,18 +149,8 @@ make-wider-key make-wider-key make-narrower-key make-wider-key \ fn hand \ alt d# 330 make-key&gap \ space 7 0 do d# 60 make-key&gap loop \ altgr,+,",left,down,up,right -; -: make-buttons - d# 80 d# 30 make-button \ Rocker up 65 - d# 30 d# 80 make-button \ Rocker left 67 - d# 130 d# 80 make-button \ Rocker right 68 - d# 80 d# 130 make-button \ Rocker down 66 - d# 80 d# 230 make-button \ Rotate 69 - d# 1080 d# 30 make-button \ O e0 65 - d# 1030 d# 80 make-button \ square e0 67 - d# 1130 d# 80 make-button \ check e0 68 - d# 1080 d# 130 make-button \ X e0 66 + make-buttons ; 0 [if] @@ -223,25 +228,18 @@ ff c, ff c, ff c, 00 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-keys-bitmap ( -- adr ) keyboard-type 2 = if all-keys-bitmap2 else all-keys-bitmap1 then ; -: funny-map ( -- adr ) keyboard-type 2 = if funny-map2 else funny-map1 then ; - -defer all-tested? -: all-keys-tested? ( -- flag ) - key-bitmap @ funny-map and key-bitmap ! - key-bitmap all-keys-bitmap #key-bytes comp 0= -; -' all-keys-tested? to all-tested? - -: all-buttons-tested?1 ( -- flag ) - key-bitmap h# b + w@ h# 3fe and h# 3fe = -; -: all-buttons-tested?2 ( -- flag ) - key-bitmap h# 9 + w@ h# 3fe0 and h# 3fe0 = +: all-tested?0 ( -- flag ) \ Just buttons + key-bitmap w@ h# 1ff and h# 1ff = ; -: all-buttons-tested? ( -- flag ) - keyboard-type 2 = if all-buttons-tested?1 else all-buttons-tested?2 then +: all-tested?1 ( -- flag ) + key-bitmap @ funny-map1 and key-bitmap ! + key-bitmap all-keys-bitmap1 #key-bytes comp 0= +; +: all-tested?2 ( -- flag ) + key-bitmap @ funny-map2 and key-bitmap ! + key-bitmap all-keys-bitmap2 #key-bytes comp 0= ; +defer all-tested? \ This table is indexed by the (unescaped) scanset1 code, giving \ an IBM physical key number. @@ -343,10 +341,23 @@ if e0-scan1>ibm# else (scan1>ibm#) + c@ then ; +decimal +: ,game-buttons ( -- ) + \ Game buttons - key#s 0x59 - 0x61 (these IBM#s are made up just for this program) + 150 c, 151 c, 152 c, 153 c, \ Rocker up, left, right, down + 154 c, \ Rotate + 156 c, 157 c, 158 c, 159 c, \ Game O, square, check, X +; +hex + \ "key#" is a physical location on the screen \ "ibm#" is the key number as shown on the original IBM PC documents \ These keynum values are from the ALPS spec "CL1-matrix-20060920.pdf" decimal +create ibm#s0 + ,game-buttons +here ibm#s0 - constant /ibm#s0 + create ibm#s1 \ Top row, key#s 0x00-0x18 110 c, 135 c, \ ESC, view source @@ -370,17 +381,12 @@ \ Function row - key#s 0x50 - 0x58 59 c, 127 c, 60 c, 61 c, 62 c, 128 c, 79 c, 84 c, 89 c, \ Fn, lgrab, alt, space, altgr, rgrab, left, down, right - \ Game buttons - key#s 0x59 - 0x61 (these IBM#s are made up just for this program) - 150 c, 151 c, 152 c, 153 c, \ Rocker up, left, right, down - 154 c, \ Rotate - 156 c, 157 c, 158 c, 159 c, \ Game O, square, check, X + ,game-buttons here ibm#s1 - constant /ibm#s1 -hex \ "key#" is a physical location on the screen \ "ibm#" is the key number as shown on the original IBM PC documents \ The actual #s for F6 and F7 are 146 and 147, but the EC does some magic -decimal create ibm#s2 \ Top row, key#s 0x00-0x18 110 c, \ ESC @@ -404,16 +410,13 @@ \ Function row - fn grab \ alt space altgr .. left down up right 29 is really 152, 13>153, 41>154 59 c, 127 c, 29 c, 60 c, 61 c, 62 c, 13 c, 41 c, 79 c, 84 c, 83 c, 89 c, - \ Game buttons - key#s 0x59 - 0x61 (these IBM#s are made up just for this program) - 150 c, 151 c, 152 c, 153 c, \ Rocker up, left, right, down - 154 c, \ Rotate - 156 c, 157 c, 158 c, 159 c, \ Game O, square, check, X + ,game-buttons here ibm#s2 - constant /ibm#s2 hex -: make-keys ( -- ) keyboard-type 2 = if make-keys2 else make-keys1 then ; -: ibm#s ( -- adr ) keyboard-type 2 = if ibm#s2 else ibm#s1 then ; -: /ibm#s ( -- len ) keyboard-type 2 = if /ibm#s2 else /ibm#s1 then ; +defer make-keys ( -- ) +defer ibm#s ( -- adr ) +defer /ibm#s ( -- n ) : ibm#>key# ( ibm# -- true | key# false ) /ibm#s 0 ?do ( ibm# ) @@ -518,7 +521,7 @@ : draw-keyboard ( -- ) kbd-bc fill-screen #keys 0 ?do i key-up loop - 0 d# 13 at-xy ." X" + final-test? smt-test? or 0= if 0 d# 13 at-xy ." X" then ; false value verbose? @@ -578,32 +581,34 @@ : toss-keys ( -- ) begin key? while key drop repeat ; : set-keyboard-type ( -- ) - " KM" find-tag if ( adr len ) - -null ( adr' len' ) - " olpcm" $= if 2 else 1 then ( type ) - else ( ) - 1 ( type ) - then ( type ) + smt-test? if + 0 + else + " KM" find-tag if ( adr len ) + -null ( adr' len' ) + " olpcm" $= if 2 else 1 then ( type ) + else ( ) + 1 ( type ) + then ( type ) + then to keyboard-type + keyboard-type case + + 0 of ['] make-buttons ['] ibm#s0 ['] /ibm#s0 ['] all-tested?0 endof + 1 of ['] make-keys1 ['] ibm#s1 ['] /ibm#s1 ['] all-tested?1 endof + 2 of ['] make-keys2 ['] ibm#s2 ['] /ibm#s2 ['] all-tested?2 endof + ( default ) true abort" Unknown keyboard type" + endcase + to all-tested? to /ibm#s to ibm#s to make-keys ; + warning @ warning off : selftest ( -- error? ) open 0= if true exit then set-keyboard-type - \ Being able to open the keyboard is good enough in SMT mode -\ smt-test? if close false exit then - - smt-test? if - ['] all-buttons-tested? - else - make-keys - ['] all-keys-tested? - then - to all-tested? - - make-buttons + make-keys cursor-off draw-keyboard true to locked? \ Disable the keyboard alarm handler; it steals our scancodes

1 0

[commit] r1884 - cpu/x86/pc/olpc/via
by repository service July 17, 2010

July 17, 2010

Author: quozl Date: Sat Jul 17 04:43:16 2010 New Revision: 1884 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1884 Log: test commit access to repository add period to end of comment in version file 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 Sat Jul 17 02:36:20 2010 (r1883) +++ cpu/x86/pc/olpc/via/fw-version.fth Sat Jul 17 04:43:16 2010 (r1884) @@ -1,3 +1,3 @@ -\ The overall firmware revision +\ The overall firmware revision. macro: FW_MAJOR A macro: FW_MINOR 43

1 0

[commit] r1883 - cpu/x86/pc/olpc/via
by repository service July 17, 2010

July 17, 2010

Author: wmb Date: Sat Jul 17 02:36:20 2010 New Revision: 1883 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1883 Log: Q3A43 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 Fri Jul 16 21:44:16 2010 (r1882) +++ cpu/x86/pc/olpc/via/fw-version.fth Sat Jul 17 02:36:20 2010 (r1883) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 42 +macro: FW_MINOR 43

1 0

[commit] r1882 - dev/geode/ac97
by repository service July 16, 2010

July 16, 2010

Author: wmb Date: Fri Jul 16 21:44:16 2010 New Revision: 1882 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1882 Log: OLPC trac 10236 - in "test /audio" on XO-1.5, make the recorded sound play back on both speakers. Modified: dev/geode/ac97/selftest.fth Modified: dev/geode/ac97/selftest.fth ============================================================================== --- dev/geode/ac97/selftest.fth Thu Jul 15 20:38:18 2010 (r1881) +++ dev/geode/ac97/selftest.fth Fri Jul 16 21:44:16 2010 (r1882) @@ -18,14 +18,19 @@ d# 250 ms \ Settling time for DC offset filter ; +\ We record in stereo even thought there is probably only one mic. +\ For some systems (e.g. AD1888 AC97 CODEC on XO-1), the data from the one +\ mic appears in both left and right channels. For others (e.g. +\ Conexant HDaudio CODEC on XO-1.5), the mic data appears in only the +\ left channel. We take care of that later in "mic-test". : record ( -- ) - open-in establish-level + open-in stereo establish-level record-base record-len audio-in drop close-in ; : play ( -- ) - open-out + open-out stereo record-base record-len audio-out drop write-done ; @@ -169,11 +174,22 @@ d# -9 set-volume stereo play ; +\ Duplicate left channel data into the right channel +: copy-left-to-right ( adr len -- ) + bounds ?do i w@ i wa1+ w! /l +loop +; + +\ The recording data format is stereo, but usually there is only one mic. +\ Depending on the CODEC used, the right channel of the recording is either +\ the same as the left or quiet. In this test, we use copy-left-to-right +\ to propagate the left input into both channels for playback. + : mic-test ( -- ) ." Recording ..." cr - mono record + record + record-base record-len copy-left-to-right ." Playing ..." cr - d# -3 set-volume mono play + d# -3 set-volume play ; : selftest ( -- error? )

1 0

[commit] r1881 - cpu/x86/pc/olpc/via
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 20:38:18 2010 New Revision: 1881 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1881 Log: OLPC XO-1.5 - added crypto engine test to CPU node selftest as an early screen for Via chips with broken crypto. Modified: cpu/x86/pc/olpc/via/padlock.fth Modified: cpu/x86/pc/olpc/via/padlock.fth ============================================================================== --- cpu/x86/pc/olpc/via/padlock.fth Thu Jul 15 20:27:57 2010 (r1880) +++ cpu/x86/pc/olpc/via/padlock.fth Thu Jul 15 20:38:18 2010 (r1881) @@ -56,6 +56,20 @@ sha-buf h# 20 2dup lbflips ; +dev /cpu +warning off +: selftest ( -- ) + h# 100 0 do i load-base i + c! loop + load-base h# 100 sha-256 ( adr len ) + " "(40 af f2 e9 d2 d8 92 2e 47 af d4 64 8e 69 67 49 71 58 78 5f bd 1d a8 70 e7 11 02 66 bf 94 48 80)" + $= 0= if + ." The CPU's cryptographic hardware is broken" cr true exit + then + selftest +; +warning on +dend + \ LICENSE_BEGIN \ Copyright (c) 2009 FirmWorks \

1 0

[commit] r1880 - ofw/core
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 20:27:57 2010 New Revision: 1880 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1880 Log: Added sparse.c and sparseosfile.fth to svn. They are tools that can be loaded as needed to work on large but sparsely-populated disk images without using up huge amounts of disk space on the host. Added: ofw/core/sparse.c ofw/core/sparseosfile.fth Added: ofw/core/sparse.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ ofw/core/sparse.c Thu Jul 15 20:27:57 2010 (r1880) @@ -0,0 +1,47 @@ +// Create a sparse disk image file that can be accessed from OFW +// running under Linux using /sparseosfile, after loading sparseosfile.fth +#include <unistd.h> +#include <sys/stat.h> +#include <fcntl.h> + +#define BLKLEN 4096 +char buf[BLKLEN]; +int blen = BLKLEN; + +int allzero(char *buf, size_t len) +{ + long *p = (long *)buf; + len /= sizeof(long); + while (len--) + if(*p++) + return 0; + return 1; +} + +int blockmap[10000]; + +main(int argc, char **argv) +{ + int abs_blockno = 0; + int rel_blockno = 0; + int outfile; + + outfile = creat("outfile", 0666); + if (outfile < 0) { + perror("sparse"); + (void)exit(1); + } + + while(read(0, buf, BLKLEN) == BLKLEN) { + if (!allzero(buf, BLKLEN)) { + write(outfile, buf, BLKLEN); + blockmap[rel_blockno++] = abs_blockno; + } + abs_blockno++; + } + write(outfile, blockmap, rel_blockno*sizeof(int)); + write(outfile, &rel_blockno, sizeof(int)); + write(outfile, &abs_blockno, sizeof(int)); + write(outfile, &blen, sizeof(int)); + close(outfile); +} Added: ofw/core/sparseosfile.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ ofw/core/sparseosfile.fth Thu Jul 15 20:27:57 2010 (r1880) @@ -0,0 +1,313 @@ +purpose: Device tree node that accesses a host system file +\ See license at end of file + +\ Creates a device node named "/sparsefile", of device-type "block", which +\ accesses an operating system file named by its first argument. That +\ file contains a verbatim disk image in the following sparse format: +\ +\ Images: N block images +\ Map: N integers indicating the block number of the corresponding block image +\ N: integer denoting N +\ Max: integer denoting the maximum block number for the virtual disk +\ BlockSize: integer denoting the length of each block image + +\ Backslash (\) characters in the file name are translated to +\ the underlying operating system's directory delimiter. +\ Example: dir /osfile:\dev\rfd0,\boot\test.fth +\ Example: dir /osfile:\home\wmb\fs.img,\boot\test.fth +\ As an alternative to supplying the disk image filename in the device +\ specifier, you can set "osfile$" to return the name. This is +\ helpful for cases where the image filename would interfere with +\ the parsing of later parts of the device specifier. +\ Example: +\ dev /osfile +\ : disk-image$ " /tmp/disk.img" ; +\ ' disk-image$ to osfile$ +\ dend +\ dir /osfile:\boot\test.fth +\ When using the "osfile$" method, you can use either backslash (\) or +\ the system's native delimiter in the disk image filename. When using +\ the device specifier argument method, you must use backslash, because +\ forward slash delimits major device tree components in a device specifier. + +dev / +\ : open true ; : close ; + +new-device +" sparsefile" device-name +also +defer sparsefile$ ' null$ to sparsefile$ +0 value file# + +\ The deblocker converts a block/record-oriented interface to a byte-oriented +\ interface, using internal buffering. Disk and tape devices are usually +\ block or record oriented, but the Open Firmware external interface is +\ byte-oriented, in order to be independent of particular device block sizes. + +0 value deblocker +: init-deblocker ( -- okay? ) + " " " deblocker" $open-package is deblocker + deblocker if + true + else + ." Can't open deblocker package" cr false + then +; + +0 instance value label-package +0 instance value offset-low +0 instance value offset-high + +: init-label-package ( adr len -- okay? ) + 0 is offset-high 0 is offset-low +\ iso9660-file-system + " disk-label" $open-package is label-package + label-package if + 0 0 " offset" label-package $call-method is offset-high is offset-low + true + else + ." Can't open disk label package" cr false + then +; +: convert/ ( filename$ -- ) + bounds ?do + i c@ [char] \ = if [char] / i c! then + loop +; +: $fopen ( adr len -- fd ) $cstr 2 swap 8 syscall 2drop retval ; +: do-seek ( offset whence -- error? ) swap file# _lseek nip ; +: do-write ( adr len -- error? ) + file# ['] _fwrite catch if 3drop true else drop false then +; +: do-read ( adr len -- error? ) + file# ['] _fread catch if 3drop true else drop false then +; + +0 value #block-map +0 value block-map +0 value #blocks +0 value #active-blocks +0 value block-size +d# 12 buffer: params +: parse-sparse ( -- error? ) + 3 /n* negate 2 do-seek if true exit then + params 3 /n* do-read if true exit then + params @ to #active-blocks + params na1+ @ to #blocks + params 2 na+ @ to block-size + #active-blocks d# 1024 + to #block-map + #block-map /n* alloc-mem to block-map + #active-blocks /n* negate 3 /n* - 2 do-seek if true exit then + block-map #active-blocks /n* do-read if true exit then + false +; +: save-block-map ( -- ) + #active-blocks block-size * 0 do-seek if exit then ( ) + block-map #active-blocks /n* do-write if exit then ( ) + #active-blocks params ! + #blocks params na1+ ! + block-size params 2 na+ ! + params 3 /n* do-write drop +; + +0 value open-count +: open ( -- flag ) + my-args ( arg$ ) + sparsefile$ dup 0= if ( arg$ null$ ) + 2drop ( arg$ ) + ascii , left-parse-string ( arg$' img-filename$ ) + then ( arg$ img-filename$ ) + + open-count if ( arg$ img-filename$ ) + 2drop ( arg$ ) + else ( arg$ img-filename$ ) + 2dup convert/ ( arg$ img-filename$ ) + $fopen to file# ( arg$ ) + file# 0< if 2drop false exit then ( arg$ ) + + parse-sparse if 2drop false exit then ( arg$ ) + + init-deblocker 0= if false exit then ( arg$ ) + then ( arg$ ) + + init-label-package dup 0= if ( flag ) + open-count 0= if ( flag ) + deblocker close-package ( false ) + file# d# 16 syscall drop ( false ) + then ( flag ) + then ( flag ) + + dup if ( flag ) + open-count 1+ to open-count ( flag ) + then ( flag ) +; +[ifndef] lfind +[ifdef] 386-assembler + code lfind ( sought adr len -- false | index true ) + cx pop ( cx: len ) + bx pop ( bx: adr ) + dx pop ( dx: sought ) + si push + bx si mov ( si: adr ) + 2 # cx shr ( cx: longword count ) + begin + ax lods + ax dx cmp = if + bx si sub + 2 # si shr + si dec + si 0 [sp] xchg + + ax ax xor + ax dec + ax push + next + then + loopa + si pop \ Restore si + ax ax xor + ax push + c; +[then] +[ifndef] lfind + : lfind ( sought adr len -- false | index true ) + over >r ( sought adr len r: adr ) + over + search if ( loc r: adr ) + r> - /n / true ( index true ) + else ( r: adr ) + r> drop false ( false ) + then ( false | index true ) + ; +[then] +[then] +: >block-index ( block# -- ) + block-map #active-blocks /n* lfind +; +: read-stored-block ( adr index -- error? ) + block-size * 0 do-seek if drop true exit then ( adr ) + block-size do-read if true exit then ( ) + false +; + +: read-block ( adr block# -- error? ) +." R " dup .x + dup #blocks >= if 2drop true exit then + + >block-index if ( adr index ) +." I " dup . cr + read-stored-block ( error? ) + else ( adr ) +." Z" cr + block-size erase ( ) + false ( error? ) + then +; + +: read-blocks ( adr block# #blocks -- actual#blocks ) + -rot 2 pick ( #blocks adr block# ) + 0 do ( #blocks adr block# ) + 2dup read-block if ( #blocks adr block# ) + 3drop i unloop exit ( -- actual#blocks ) + then ( #blocks adr block# ) + swap block-size + swap 1+ ( #blocks adr' block#' ) + loop ( #blocks adr block# ) + 2drop ( actual#blocks ) +; + +: resize-block-map ( -- error? ) + block-map #block-map d# 1024 + /n* resize if ( buf-adr ) + drop true exit ( -- error? ) + then ( buf-adr ) + to block-map ( ) + #block-map d# 1024 + to #block-map ( ) + false ( error? ) +; +: write-stored-block ( adr index -- error? ) + block-size * 0 do-seek if drop true exit then ( adr ) + block-size do-write if true exit then ( ) + false +; + +: write-new-block ( adr block# -- error? ) + #active-blocks #block-map >= if ( adr block# ) + resize-block-map if 2drop true exit then ( adr block# ) + then ( adr block# ) + swap #active-blocks write-stored-block if ( block# ) + drop true exit ( -- error? ) + then ( block# ) + block-map #active-blocks na+ ! ( ) + #active-blocks 1+ to #active-blocks ( ) + false ( error? ) +; + +: write-block ( adr block# -- error? ) +." W " dup .x + dup #blocks >= if ( adr block# ) + 2drop true exit ( -- error? ) + then ( adr block# ) + + dup >block-index if ( adr block# index ) +." I " dup .x cr + nip write-stored-block ( error? ) + else ( adr block# ) +." N" cr + write-new-block ( error? ) + then ( error? ) +; + +: write-blocks ( adr block# #blocks -- actual#blocks ) + -rot 2 pick ( #blocks adr block# ) + 0 do ( #blocks adr block# ) + 2dup write-block if ( #blocks adr block# ) + 3drop i unloop exit ( -- actual#blocks ) + then ( #blocks adr block# ) + swap block-size + swap 1+ ( #blocks adr' block#' ) + loop ( #blocks adr block# ) + 2drop ( actual#blocks ) +; + +: close ( -- ) + open-count dup 1- 0 max to open-count ( prev-open-count ) + label-package close-package ( prev-open-count ) + 1 = if ( ) + deblocker close-package ( ) + save-block-map ( ) + file# d# 16 syscall drop ( ) + then ( ) +; + +: dma-alloc ( size -- adr ) alloc-mem ; +: dma-free ( adr size -- ) free-mem ; +: max-transfer ( -- n ) block-size ; + +: seek ( offset.low offset.high -- okay? ) + offset-low offset-high d+ " seek" deblocker $call-method +; +: read ( addr len -- actual-len ) " read" deblocker $call-method ; +: write ( addr len -- actual-len ) " write" deblocker $call-method ; +finish-device +device-end + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

[commit] r1879 - dev
by repository service July 15, 2010

July 15, 2010

Author: wmb Date: Thu Jul 15 20:02:06 2010 New Revision: 1879 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1879 Log: Libertas WLAN driver - added more support functions for the thinmac firmware, in particular a lightweight way to put the device back into fullmac mode after it has been in AP mode for NANDblaster sending. Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Thu Jul 15 19:59:50 2010 (r1878) +++ dev/libertas.fth Thu Jul 15 20:02:06 2010 (r1879) @@ -719,6 +719,7 @@ outbuf-wait drop ; 0 value ap-mode? +: set-fullmac-mode ( -- ) 3 set-mode false to ap-mode? ; \ Thin firmware only : set-ap-mode ( -- ) 2 set-mode true to ap-mode? ; \ Thin firmware only : set-sta-mode ( -- ) 1 set-mode false to ap-mode? ; \ Thin firmware only : set-passive-mode ( -- ) 0 set-mode false to ap-mode? ; \ Thin firmware only @@ -771,12 +772,16 @@ outbuf-wait drop ; -: set-radio-control ( -- ) +: (set-radio-control) ( arg -- ) 4 h# 1c ( CMD_802_11_RADIO_CONTROL ) prepare-cmd ACTION_SET +xw - preamble 1 or +xw \ Preamble, RF on + ( arg ) +xw outbuf-wait drop -; +; + +\ Preamble, RF on +: set-radio-control ( -- ) preamble 1 or (set-radio-control) ; +: radio-off ( -- ) 0 (set-radio-control) ; : (set-bss-type) ( bsstype -- ok? ) 6 d# 128 + h# 16 ( CMD_802_11_SNMP_MIB ) prepare-cmd @@ -1367,6 +1372,8 @@ : (associate) ( ch ssid$ target-mac$ -- ok? ) save-associate-params + set-radio-control \ In case of changes to preamble + h# 50 ( CMD_802_11_ASSOCIATE ) start-cmd resp-wait-long to resp-wait @@ -1452,6 +1459,8 @@ ; ' nandcast-mesh-modes to mesh-default-modes +\ The supplicant package invokes this via call-parent after setting up +\ various parameters via methods like set-atim . : associate ( ch ssid$ target-mac$ -- ok? ) 2over " olpc-mesh" $= if ( ch ssid$ target-mac$ ) 2drop 2drop mesh-start 0= ( ok? ) @@ -1587,6 +1596,20 @@ r> set-tx-ctrl ; +\ adr len is the BSSID (MAC ADDRESS) of the wlan when acting as an access point. +: set-bssid ( adr len -- ) + 7 h# cd ( CMD_802_11_SET_MODE ) prepare-cmd ( adr len ) + +x$ ( ) + 1 +xb \ activate ( ) + outbuf-wait drop +; +: deactivate-bssid ( -- ) + 7 h# cd ( CMD_802_11_SET_MODE ) prepare-cmd ( adr len ) + " "(00 00 00 00 00 00)" +x$ ( ) + 0 +xb \ deactivate ( ) + outbuf-wait drop +; + \ Howto set up access point: \ ok setenv wlan-fw u:\usb8388t.bin \ Thin firmware \ ok select /wlan:force @@ -1595,7 +1618,7 @@ : start-ap ( channel ssid$ -- ) rot to channel ( ssid$ ) to /ssid ( ssid-adr ) - ssid /ssid move ( ) + ssid$ move ( ) set-boot2-from-usb marvel-get-mac-address drop set-mac-control @@ -1605,13 +1628,22 @@ marvel-set-mac-address send-deauth make-beacon + mac-adr$ set-bssid d# 100 1 set-beacon ; -\ This is a bit heavy-handed, but I don't know a more precise recipe + : stop-ap ( -- ) - ds-not-ready to driver-state \ Forces firmware reload on next open - reset-host-bus \ Primes module to accept new firmware - false to ap-mode? + radio-off + 0 0 set-beacon + set-fullmac-mode + deactivate-bssid + 4 set-preamble set-radio-control + +\ This is a heavy-handed way to force the device back into baseline state +\ The recipe above is nicer. +\ ds-not-ready to driver-state \ Forces firmware reload on next open +\ reset-host-bus \ Primes module to accept new firmware +\ false to ap-mode? ; : get-log ( -- )

1 0