openfirmware June 2012

openfirmware@openfirmware.info

1 participants
34 discussions

[commit] r3017 - dev
by repository service 27 Jun '12

27 Jun '12

Author: quozl Date: Wed Jun 27 10:56:28 2012 New Revision: 3017 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3017 Log: OLPC - libertas antenna switching test Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Thu Jun 21 02:03:09 2012 (r3016) +++ dev/libertas.fth Wed Jun 27 10:56:28 2012 (r3017) @@ -1672,11 +1672,80 @@ respbuf .log ; -: get-rssi ( -- ) +: get-rssi ( -- avg_nf avg_snr nf snr ) 2 h# 1f ( CMD_802_11_RSSI ) prepare-cmd - 8 +xw \ Value used for exp averaging + 8 +xw \ number of beacons (N) to average the SNR and NF over outbuf-wait drop - \ XXX What to do with the result? + \ cmd_ds_802_11_rssi, observed response + \ __le16 snr; /* most recent SNR */ + \ __le16 nf; /* most recent noise floor */ + \ __le16 avg_snr; /* average SNR weighted by N from request */ + \ __le16 avg_nf; /* average noise floor weighted by N from request */ + respbuf >fw-data >r + r@ 6 + le-w@ ( avg_nf ) + r@ 4 + le-w@ ( avg_nf avg_snr ) + r@ 2 + le-w@ ( avg_nf avg_snr nf ) + r@ le-w@ ( avg_nf avg_snr nf snr ) + r> drop +; + +: rf-antenna ( antenna action -- ) + swap >r >r + 4 h# 20 ( CMD_802_11_RF_ANTENNA ) prepare-cmd + r> +xw + r> +xw + outbuf-wait drop +; + +: set-antenna ( rx tx -- ) + 2 ( ACT_SET_TX ) rf-antenna ( rx ) + 1 ( ACT_SET_RX ) rf-antenna ( ) +; + +: set-antenna-diversity ( -- ) + h# ffff 2 ( ACT_SET_TX ) rf-antenna + d# 1000 ms + h# ffff 1 ( ACT_SET_RX ) rf-antenna +; + +: get-antenna ( -- rx tx ) + h# 0 4 ( ACT_GET_RX ) rf-antenna respbuf >fw-data 2+ le-w@ ( rx ) + h# 0 8 ( ACT_GET_TX ) rf-antenna respbuf >fw-data 2+ le-w@ ( rx tx ) +; + +: .antenna + base @ decimal + get-rssi + ." snr:" 3 .r ." nf:" 3 .r ." avg_snr:" 3 .r ." avg_nf:" 3 .r + hex + get-antenna swap ." rx:" 4 .r ." tx:" 4 .r + ." " + base ! +; + +: test-antenna + ." keys: (0,1,2,l,r,d,q)" cr + begin + .antenna + key? if + cr + .antenna + key + case + h# 71 ( q ) of cr exit endof + h# 1b ( esc ) of cr exit endof + h# 30 ( 0 ) of ." rx/tx to 0/0" 0 0 set-antenna endof + h# 31 ( 1 ) of ." rx/tx to 1/1" 1 1 set-antenna endof + h# 32 ( 2 ) of ." rx/tx to 2/2" 2 2 set-antenna endof + h# 6c ( l ) of ." rx/tx to 1/2" 1 2 set-antenna endof + h# 72 ( r ) of ." rx/tx to 2/1" 2 1 set-antenna endof + h# 64 ( d ) of ." diversity" cr h# ffff dup set-antenna endof + endcase + then + d# 100 ms + (cr + false + until ; : .hw-spec ( -- )

1 0

[commit] r3016 - cpu/x86/pc/olpc
by repository service 21 Jun '12

21 Jun '12

Author: wmb Date: Thu Jun 21 02:03:09 2012 New Revision: 3016 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3016 Log: OLPC - checked in oatstime.fth - a script that can be signed and used to set the Real Time Clock on secure machines. Added: cpu/x86/pc/olpc/oatstime.fth Added: cpu/x86/pc/olpc/oatstime.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/oatstime.fth Thu Jun 21 02:03:09 2012 (r3016) @@ -0,0 +1,392 @@ +\ OLPC boot script to set the XO system time from an OATS server +\ This can be signed and booted on secure machines to fix their clocks + +\ Set this to the name or IP address of the deployment's OATS server +: server$ " 192.168.200.57" ; \ DNS name or IP address + +\ Replace this key with a deployment-specific one +create oats-pubkey + " "(30 82 01 0a 02 82 01 01 00 cf 2c 9a 49 81 a9 dd)" $, + " "(0e 39 e6 02 dc 9a 77 2e 9e cb 24 0c 1d 94 ec d3)" $, + " "(e9 0a 86 58 fb c4 a1 f7 dd 06 d4 87 03 c3 04 8f)" $, + " "(43 25 a9 27 62 9b 58 71 e2 39 f6 d5 55 35 37 d4)" $, + " "(23 14 2a 10 fa b7 2f ad 4c d1 5c 9f c8 87 10 25)" $, + " "(28 fd 72 b1 c6 87 8e 55 bd 77 a8 a4 84 d6 4a 41)" $, + " "(7d 36 f2 7b 8e c3 67 3f d8 78 a5 69 10 86 b8 48)" $, + " "(08 17 74 f9 7a 17 e3 9e c6 8a 41 bc 21 b8 1f 9d)" $, + " "(02 e3 82 31 96 28 b8 92 b4 2b c0 10 c6 c5 8d d5)" $, + " "(1b 2b 4b e1 cd 3d 21 76 1d 83 0a 65 88 ce 49 ad)" $, + " "(8f 85 40 7a 16 d7 99 24 6b 72 5c f9 eb af b8 f9)" $, + " "(d5 3d ed 90 5f 95 b0 51 8a b3 ed 16 8a 07 2a 89)" $, + " "(ae 7f da 04 c8 14 01 86 04 ce 33 a6 3f 39 ce 79)" $, + " "(bf af d4 81 e3 c6 1f 57 06 25 4f 3f 24 f7 28 38)" $, + " "(6d 8b 34 5e fe da 86 cd 0f 9a 17 99 a7 c6 b2 57)" $, + " "(ab 76 47 54 cb 11 a4 47 e0 9c 5e fa f1 2c 59 68)" $, + " "(26 73 1e 7b 20 e8 9c 89 ab 02 03 01 00 01)" $, +here oats-pubkey - constant oats-pubkey-len + +\ Canonical JSON parser + +\ Look at the next character in the JSON stream, leaving it in the stream +: json-look ( rem$ -- rem$ char ) + dup 0<= abort" Unexpected end of CJSON data" + over c@ +; + +\ Discard the next character in the JSON stream +: json-skip ( rem$ -- rem$' ) ( over c@ emit ) 1 /string ; + +\ Get the next character from the JSON stream +: json-get ( rem$ -- rem$' char ) json-look >r json-skip r> ; + +\ Get the next JSON character and abort if is not the expected one +: json-expect ( rem$ char -- rem$' ) + >r json-get r> <> abort" Unexpected character in CJSON stream" +; + +\ True if there is another object element +: json-element? ( rem$ -- rem$' flag ) + json-look case + [char] ] of false endof + [char] , of json-skip true endof + ( default ) true swap + endcase +; + +: json-[ ( rem$ -- rem$' ) [char] [ json-expect ; \ Expect [ - start of array +: json-] ( rem$ -- rem$' ) [char] ] json-expect ; \ Expect ] - end of array +: json-, ( rem$ -- rem$' ) [char] , json-expect ; \ Expect , - another array element + +\ Collect digits to form a nonnegative number +: json-digits ( rem$ -- rem$' n ) + 0 begin + >r + json-look dup [char] 0 [char] 9 between if + [char] 0 - r> d# 10 * + >r + json-skip + else + drop r> exit + then + r> + again +; + +\ Collect a (possibly negative) number +: json-number ( rem$ -- rem$' n ) + json-look [char] - = if + json-skip json-digits negate + else + json-digits + then +; + +: cjson-copy-escaped ( adr len dest-adr -- dest$ ) + 0 2swap bounds ?do ( dest-adr dest-len ) + i c@ dup [char] \ = if ( dest-adr dest-len char ) + drop ( dest-adr dest-len ) + else ( dest-adr dest-len char ) + 2 pick 2 pick + c! ( dest-adr dest-len ) + 1+ ( dest-adr dest-len' ) + then ( dest-adr dest-len ) + loop ( dest-adr dest-len ) +; + +\ Collect a string. Escape sequences are left in place - not converted - +\ to avoid the need for memory allocation. Use cjson-copy-escaped if +\ you need to process escapes. +: json-" ( rem$ -- rem$' $ ) + [char] " json-expect ( rem$ ) + over 0 ( rem$ $ ) + begin ( rem$ $ ) + 2>r + json-look ( rem$ char r: $ ) + case + [char] " of ( rem$ ) + json-skip ( rem$' ) + 2r> exit + endof + [char] \ of ( rem$ ) + json-skip + json-get + 2r> 1+ 2>r + endof + ( default ) >r json-skip r> + endcase + 2r> 1+ + again +; + +: json-{ ( rem$ -- rem$' ) [char] { json-expect ; \ Expect { - start of object +: json-} ( rem$ -- rem$' ) [char] } json-expect ; \ Expect } - end of object +: json-: ( rem$ -- rem$' ) [char] : json-expect ; \ Expect : - object value + +\ True if there is another object pair +: json-pair? ( rem$ -- rem$ flag ) + json-look case + [char] } of false endof + [char] , of json-skip true endof + ( default ) true swap + endcase +; + +\ Expect a literal string - implementation factor +: json$ ( rem$ $ -- rem$' ) bounds ?do i c@ json-expect loop ; + +: json-true ( rem$ -- rem$' ) " true" json$ ; \ Expect literal 'true' +: json-false ( rem$ -- rem$' ) " false" json$ ; \ Expect literal 'false' +: json-null ( rem$ -- rem$' ) " null" json$ ; \ Expect literal 'null' + +\ Parse and discard a value - useful for skipping the value portion of uninteresting pairs +\ Forward referenced because arrays can contain values and values can be arrays +defer discard-json-value + +\ Parse and discard an array - factor of discard-json-value +: discard-json-array ( rem$ -- rem$' ) + json-[ ( rem$' ) + begin json-element? while ( rem$' ) + discard-json-value ( rem$' ) + repeat ( rem$' ) + json-] ( rem$' ) +; + +\ Parse and discard an object - factor of discard-json-value +: discard-json-object ( -- ) + json-{ ( rem$' ) + begin json-pair? while ( rem$' ) + json-" 2drop ( rem$' ) + json-: ( rem$' ) + discard-json-value ( rem$' ) + repeat ( rem$' ) + json-} ( rem$' ) +; + +\ Helper function used with Forth case statement to match a range of values +: range ( selector low high -- selector n ) + 2>r dup 2r> between if dup else dup invert then ( selector n ) +; + +\ Final implementation of the forward-referenced "discard-json-value" +: (discard-json-value) ( rem$ -- rem$' ) + json-look case + [char] " of json-" 2drop endof + [char] t of json-true endof + [char] f of json-false endof + [char] n of json-null endof + [char] [ of discard-json-array endof + [char] { of discard-json-object endof + [char] - of json-number drop endof + [char] 0 [char] 9 range of json-number endof + ( default ) + true abort" Invalid first character in JSON value" + endcase +; +' (discard-json-value) to discard-json-value + +\ End of generic canonical JSON code + +\ Expect an envelope of the given name and version, leaving the CJSON +\ stream remainder at the enveloped contents +: envelope( ( rem$ name$ version -- rem$' ) + >r 2>r ( rem$ r: version name$ ) + json-[ ( rem$' r: version name$ ) + json-" ( rem$' $ r: version name$ ) + 2r> $= 0= abort" Wrong envelope" ( rem$' r: version ) + json-, + json-number ( rem$' n r: version ) + r> <> abort" Wrong envelope version" ( rem$' ) + json-, ( rem$ ) + \ remainder starts with the envelope data +; + +\ Expect the end of an envelope +: )envelope ( rem$ -- rem$' ) json-] ; + + +d# 256 buffer: nonce-data +: save-nonce ( rem$ -- rem$' ) + json-" ( rem$' value$ ) + d# 255 min nonce-data 1+ cjson-copy-escaped ( rem$ $ ) + nonce-data c! drop ( rem$ ) +; + +d# 32 buffer: time-data +: save-time ( rem$ -- rem$' ) + json-" ( rem$' value$ ) + d# 31 min time-data 1+ cjson-copy-escaped ( rem$ $ ) + time-data c! drop ( rem$ ) +; + +: decode-oats-key ( rem$ name$ -- rem$' ) + json-" ( rem$ name$ ) + 2dup " nonce" $= if ( rem$ name$ ) + 2drop ( rem$ ) + json-: ( rem$' ) + save-nonce ( rem$' ) + exit ( -- rem$ ) + then ( rem$ name$ ) + 2dup " time" $= if ( rem$ name$ ) + 2drop ( rem$ ) + json-: ( rem$' ) + save-time ( rem$' ) + exit ( -- rem$ ) + then ( rem$ name$ ) + 2drop ( rem$ ) + json-: ( rem$' ) + discard-json-value ( rem$' ) +; +: decode-oats-data ( rem$ -- rem$' ) + " oatc-resp" 1 envelope( ( rem$' ) + + \ Enveloped data is an object { "nonce":value, "time":value, ... } + json-{ ( rem$' ) + begin json-pair? while ( rem$' ) + decode-oats-key ( rem$' ) + repeat ( rem$ ) + json-} ( rem$' ) + + )envelope ( rem$' ) +; + +0 0 2value the-signature$ +: decode-oats-credential ( rem$ -- rem$' ) + " sig" 1 envelope( ( rem$' ) + + \ Enveloped data is an array of signatures - [ "sig01 ...", ... ] + json-[ ( rem$' ) + begin json-element? while ( rem$' ) + json-" ( rem$ sig$ ) + to the-signature$ ( rem$' ) + repeat ( rem$ ) + json-] ( rem$' ) + + )envelope ( rem$' ) +; + +: decode-oats-response ( rem$ -- rem$' ) + " oatc-signed-resp" 1 envelope( ( rem$' ) + \ Enveloped data is a 2-element array - [data,credential] + + json-[ ( rem$' ) + over >r ( rem$ r: data-adr ) + decode-oats-data ( rem$' r: data-adr ) + r> 2 pick over - to signed-data$ ( rem$' ) + json-, ( rem$' ) + decode-oats-credential ( rem$' ) + json-] ( rem$' ) + + )envelope ( rem$' ) +; + +0 [if] \ Example request +POST /antitheft/1/ HTTP/1.1 +Host: antitheft.laptop.org +Content-Type: application/x-www-form-urlencoded +Content-Length: 43 + +serialnum=SHC12900018&version=1&nonce=12345678 +[then] + +0 [if] \ Example response +["oatc-signed-resp",1,[["oatc-resp",1,{"nonce":"12345678 +","time":"20120619T144129Z"}],["sig",1,["sig01: sha256 b257ab764754cb11a447e09c5efaf12c596826731e7b20e89c89ab0203010001 8200ecb1b71df1119fceba00e8cca7b29b6e2870c7ab6224ca49e8a4a57b295edc733646ec5ae36767a403ebd43217185a46bb6d41c32f2d7ce4c33de6c4718a5e87e28349e9f72be719d6fcea35a37a3b68afc3b8a42d58333e7c6e78e1bb6f87dd106dce69dc191e1598514b63645f17a77be36128601950146c87b8702ba3474fc2289a589e38929f532cae683d6094171f7afa2c1765592216bdaa6c975916810b61db83a4a6f0a1b17f3f69559d45aebf64bb1c324fda2e97a044840556bfa688097ae77823447b07cdd5fce2f96bf990b11d7e6c409df2c42272d33805fb6fcdaa0ffd4d1b1ebeef44f458f1201fb484a43b4d10932862a3eba0b021e5 +"]]]] +[then] + +0 value http-ih +: $call-http http-ih $call-method ; +dev /http +\needs flush-writes : flush-writes " flush-writes" $call-parent ; +\needs connect : connect " connect" $call-parent ; +dend +: http-write " tcp-write" $call-http ; +: http-write-line ( adr len -- ) http-write " "r"n" http-write ; +: http-read-line ( -- adr len ) " get-line" $call-http ; + +: oats-send ( msg$ -- ) + server$ " set-server" $call-http + d# 80 " connect" $call-http 0= abort" Can't connect to server" + " POST /antitheft/1/ HTTP/1.1" http-write-line + " Host: antitheft.laptop.org" http-write-line + " Content-Type: application/x-www-form-urlencoded" http-write-line + dup " Content-Length: %d" sprintf http-write-line ( msg$ ) + " " http-write-line ( msg$ ) + http-write + " flush-writes" $call-http +; +0 value the-nonce +: oats-msg$ ( -- msg$ ) + random-long abs dup to the-nonce ( nonce ) + " SN" find-tag 0= abort" Machine has no serial number" ?-null ( nonce sn$ ) + " serialnum=%s&version=1&nonce=%d" sprintf +; +h# 10000 buffer: oats-buf +: tread + oats-buf h# 10000 " wait-read" $call-http dup 0> if oats-buf swap list else drop then +; +: open-http http-ih 0= if " http:" open-dev to http-ih then ; +: close-http http-ih if http-ih close-dev 0 to http-ih then ; + +: decimal-number ( $ -- n ) + push-decimal $number abort" Bad number" pop-base +; + +: (parse-time) ( $ -- s m h d m y ) + d# 20 d# 20 numfield >r ( rem$ r: century ) + d# 12 d# 40 numfield r> d# 100 * + >r ( rem$ r: y ) + d# 1 d# 12 numfield >r ( rem$ r: y m ) + d# 1 d# 31 numfield >r ( rem$ r: y m d ) + + 1 cut$ " T" $= 0= abort" Expecting T in time" + d# 0 d# 24 numfield >r ( rem$ r: y m d h ) + d# 0 d# 59 numfield >r ( rem$ r: y m d h m ) + d# 0 d# 59 numfield >r ( rem$ r: y m d h m s ) + + 1 cut$ " Z" $= 0= abort" Expecting T in time" ( rem$ r: y m d h m s ) + 0<> abort" Junk after time" drop ( r: y m d h m s ) + r> r> r> r> r> r> +; +: parse-time ( $ -- s m h d m y ) + push-decimal ['] (parse-time) catch pop-base throw +; +: verify-oats ( rem$ -- ) + dup if ." Extra stuff after OATS response: " list cr else 2drop then ( ) + + nonce-data count decimal-number the-nonce <> abort" Nonce mismatch" + + oats-pubkey-len to pubkeylen + oats-pubkey oats-pubkey-len to pubkey$ + " sha256" to exp-hashname$ + the-signature$ begin dup while ( rem$ ) + newline left-parse-string ( rem$ line$ ) + this-sig-line-good? 0= abort" Bad signature" + repeat ( rem$ ) + 2drop +; + +: time-from-oats + load-crypto abort" Crypto load failed" + open-http + oats-msg$ ?save-string oats-send + " check-header" ['] $call-http catch if + ." Bad HTTP header" cr + close-http + abort + then + " image-size" $call-http ( len ) + + oats-buf over " wait-read" $call-http ( len actual ) + close-http ( len actual ) + + 2dup <> if ( len actual ) + ." Wrong HTTP content length - Expected " swap .d ." got " .d cr + abort + then ( len actual ) + + nip oats-buf swap decode-oats-response ( adr len ) + verify-oats + + time-data count parse-time " set-time" clock-node @ $call-method + + cr ." Set clock to " .clock +; +time-from-oats

1 0

[commit] r3015 - in dev/usb2/hcd: . ehci
by repository service 20 Jun '12

20 Jun '12

Author: wmb Date: Wed Jun 20 10:18:56 2012 New Revision: 3015 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3015 Log: Reinstate the USB probing change, but fixed so it works with USB 1.1 devices. Modified: dev/usb2/hcd/device.fth dev/usb2/hcd/ehci/probe.fth Modified: dev/usb2/hcd/device.fth ============================================================================== --- dev/usb2/hcd/device.fth Tue Jun 19 04:18:40 2012 (r3014) +++ dev/usb2/hcd/device.fth Wed Jun 20 10:18:56 2012 (r3015) @@ -392,26 +392,38 @@ \ Executed in root hub node context : get-str-descriptors ( -- ) language ( lang ) - dup dev-desc-buf d# 14 + c@ v$-desc-buf get-string to /v$-desc-buf - dup dev-desc-buf d# 15 + c@ d$-desc-buf get-string to /d$-desc-buf - dev-desc-buf d# 16 + c@ s$-desc-buf get-string to /s$-desc-buf + dup d# 14 dev-desc@ v$-desc-buf get-string to /v$-desc-buf + dup d# 15 dev-desc@ d$-desc-buf get-string to /d$-desc-buf + d# 16 dev-desc@ s$-desc-buf get-string to /s$-desc-buf ; \ Executed in root hub node context : refresh-desc-bufs ( dev -- ) set-target - dev-desc-buf 12 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf + dev-desc-buf d# 18 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf get-str-descriptors ; -\ Executed in root hub node context -: get-initial-descriptors ( dev -- ) +: get-initial-dev-desc ( dev -- ) + dev-desc-buf d# 18 erase ( dev ) + + \ Until we know the size of the control endpoint, we must be + \ conservative about the transfer size. dev-desc-buf /pipe0 get-dev-desc if ( dev ) - dev-desc-buf 7 + c@ 0 rot di-maxpayload! ( ) + 7 dev-desc@ ( dev maxtransfer ) + tuck 0 rot di-maxpayload! ( maxtransfer ) + d# 18 >= if ( ) + dev-desc-buf d# 18 get-dev-desc drop ( ) + then ( ) else ( dev ) drop ( ) then ( ) +; + +\ Executed in root hub node context +: get-initial-descriptors ( dev -- ) + get-initial-dev-desc ( ) cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) ; @@ -453,7 +465,15 @@ tuck di-speed! ( port dev ) 0 set-target ( port dev ) \ Address it as device 0 - over reset-port ( port dev ) \ Some devices want to be reset here + + \ Some devices (e.g. Lexar USB-to-SD and at least one USB FLASH drive) fail + \ on set-address unless you first read the device descriptor from address 0. + \ On other devices, this will fail, but it won't cause problems, and the + \ descriptor will be re-read later by make-device-node + dup get-initial-dev-desc ( port dev ) + +\ over reset-port ( port dev ) \ Some devices want to be reset here + dup set-address if ( port dev ) \ Assign it usb addr dev ." Retrying with a delay" cr over reset-port d# 5000 ms Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Tue Jun 19 04:18:40 2012 (r3014) +++ dev/usb2/hcd/ehci/probe.fth Wed Jun 20 10:18:56 2012 (r3015) @@ -7,10 +7,10 @@ 0 value port-speed : make-root-hub-node ( port -- ) - \ Some devices (e.g. Lexar USB-to-SD) fail unless you get the cfg desc from device 0 first 0 set-target \ First address it as device 0 ( port ) port-speed 0 di-speed! \ Use high speed for getting the device descriptor - dev-desc-buf h# 40 get-cfg-desc drop ( port ) + + dup reset-port ( port ) port-speed ( port speed )

1 0

[commit] r3014 - cpu/arm/olpc/1.75
by repository service 19 Jun '12

19 Jun '12

Author: quozl Date: Tue Jun 19 04:18:40 2012 New Revision: 3014 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3014 Log: Q4D18 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Tue Jun 19 04:17:19 2012 (r3013) +++ cpu/arm/olpc/1.75/fw-version.fth Tue Jun 19 04:18:40 2012 (r3014) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 17 +macro: FW_MINOR 18

1 0

[commit] r3013 - in dev/usb2/hcd: . ehci
by repository service 19 Jun '12

19 Jun '12

Author: quozl Date: Tue Jun 19 04:17:19 2012 New Revision: 3013 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3013 Log: OLPC - dev/usb2, revert svn 3011 as it broke production use of USB scanners, reproduced also by me. Modified: dev/usb2/hcd/device.fth dev/usb2/hcd/ehci/probe.fth Modified: dev/usb2/hcd/device.fth ============================================================================== --- dev/usb2/hcd/device.fth Sat Jun 16 05:00:26 2012 (r3012) +++ dev/usb2/hcd/device.fth Tue Jun 19 04:17:19 2012 (r3013) @@ -391,30 +391,33 @@ \ Executed in root hub node context : get-str-descriptors ( -- ) - language ( lang ) - dup d# 14 dev-desc@ v$-desc-buf get-string to /v$-desc-buf - dup d# 15 dev-desc@ d$-desc-buf get-string to /d$-desc-buf - d# 16 dev-desc@ s$-desc-buf get-string to /s$-desc-buf + language ( lang ) + dup dev-desc-buf d# 14 + c@ v$-desc-buf get-string to /v$-desc-buf + dup dev-desc-buf d# 15 + c@ d$-desc-buf get-string to /d$-desc-buf + dev-desc-buf d# 16 + c@ s$-desc-buf get-string to /s$-desc-buf ; \ Executed in root hub node context : refresh-desc-bufs ( dev -- ) set-target - dev-desc-buf d# 18 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf + dev-desc-buf 12 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf get-str-descriptors ; \ Executed in root hub node context -: get-initial-descriptors ( -- ) - \ Re-read the full device descriptor to pick up the vendor info - dev-desc-buf d# 18 get-dev-desc drop ( ) - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) +: get-initial-descriptors ( dev -- ) + dev-desc-buf /pipe0 get-dev-desc if ( dev ) + dev-desc-buf 7 + c@ 0 rot di-maxpayload! ( ) + else ( dev ) + drop ( ) + then ( ) + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) ; \ Executed in hub node context (root hub or subordinate hub) - creates new child nodes via (make-device-node) : make-device-node ( port dev -- ) - " get-initial-descriptors" my-self $call-method ( port dev ) + dup " get-initial-descriptors" my-self $call-method ( port dev ) /cfg-desc-buf 0= if 2drop exit then ( port dev ) asso-class? if 1 else cfg-desc-buf 4 + c@ then ( port dev #intf ) 0 ?do ( port dev ) @@ -440,16 +443,6 @@ then ( port ) ; -: get-initial-dev-desc ( dev -- ) - dev-desc-buf d# 18 erase ( dev ) - dev-desc-buf d# 64 get-dev-desc 0= if ( dev ) - dev-desc-buf /pipe0 get-dev-desc 0= if ( dev ) - drop exit - then - then - 7 dev-desc@ 0 rot di-maxpayload! ( ) -; - \ Executed in the root hub node context : setup-new-node ( port speed hub-port hub-dev -- true | port dev xt false ) \ Allocate device number @@ -460,11 +453,7 @@ tuck di-speed! ( port dev ) 0 set-target ( port dev ) \ Address it as device 0 - - \ Some devices (e.g. Lexar USB-to-SD and at least one USB FLASH drive) fail - \ on set-address unless you first read the device descriptor from address 0. - dup get-initial-dev-desc ( port dev ) - + over reset-port ( port dev ) \ Some devices want to be reset here dup set-address if ( port dev ) \ Assign it usb addr dev ." Retrying with a delay" cr over reset-port d# 5000 ms Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Sat Jun 16 05:00:26 2012 (r3012) +++ dev/usb2/hcd/ehci/probe.fth Tue Jun 19 04:17:19 2012 (r3013) @@ -7,16 +7,18 @@ 0 value port-speed : make-root-hub-node ( port -- ) + \ Some devices (e.g. Lexar USB-to-SD) fail unless you get the cfg desc from device 0 first 0 set-target \ First address it as device 0 ( port ) port-speed 0 di-speed! \ Use high speed for getting the device descriptor - dup reset-port ( port ) + dev-desc-buf h# 40 get-cfg-desc drop ( port ) + port-speed ( port speed ) \ hub-port and hub-dev route USB 1.1 transactions through USB 2.0 hubs over get-hub20-port get-hub20-dev ( port speed hub-port hub-dev ) \ Execute setup-new-node in root context and make-device-node in hub node context - setup-new-node if execute then ( ) + setup-new-node if execute then ( ) ; 0 instance value probe-error? \ Back channel to selftest

1 0

[commit] r3012 - cpu/arm/olpc/1.75
by repository service 16 Jun '12

16 Jun '12

Author: quozl Date: Sat Jun 16 05:00:26 2012 New Revision: 3012 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3012 Log: Q4D17 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sat Jun 16 04:13:21 2012 (r3011) +++ cpu/arm/olpc/1.75/fw-version.fth Sat Jun 16 05:00:26 2012 (r3012) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 16 +macro: FW_MINOR 17

1 0

[commit] r3011 - in dev/usb2/hcd: . ehci
by repository service 16 Jun '12

16 Jun '12

Author: quozl Date: Sat Jun 16 04:13:21 2012 New Revision: 3011 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3011 Log: OLPC - dev/usb2, read the device descriptor after reset and before set-address, instead of after set-address. Erase the device descriptor buffer before reading. #11931 Modified: dev/usb2/hcd/device.fth dev/usb2/hcd/ehci/probe.fth Modified: dev/usb2/hcd/device.fth ============================================================================== --- dev/usb2/hcd/device.fth Fri Jun 15 03:58:55 2012 (r3010) +++ dev/usb2/hcd/device.fth Sat Jun 16 04:13:21 2012 (r3011) @@ -391,33 +391,30 @@ \ Executed in root hub node context : get-str-descriptors ( -- ) - language ( lang ) - dup dev-desc-buf d# 14 + c@ v$-desc-buf get-string to /v$-desc-buf - dup dev-desc-buf d# 15 + c@ d$-desc-buf get-string to /d$-desc-buf - dev-desc-buf d# 16 + c@ s$-desc-buf get-string to /s$-desc-buf + language ( lang ) + dup d# 14 dev-desc@ v$-desc-buf get-string to /v$-desc-buf + dup d# 15 dev-desc@ d$-desc-buf get-string to /d$-desc-buf + d# 16 dev-desc@ s$-desc-buf get-string to /s$-desc-buf ; \ Executed in root hub node context : refresh-desc-bufs ( dev -- ) set-target - dev-desc-buf 12 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf + dev-desc-buf d# 18 get-dev-desc to /dev-desc-buf \ Refresh dev-desc-buf + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf \ Refresh cfg-desc-buf get-str-descriptors ; \ Executed in root hub node context -: get-initial-descriptors ( dev -- ) - dev-desc-buf /pipe0 get-dev-desc if ( dev ) - dev-desc-buf 7 + c@ 0 rot di-maxpayload! ( ) - else ( dev ) - drop ( ) - then ( ) - cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) +: get-initial-descriptors ( -- ) + \ Re-read the full device descriptor to pick up the vendor info + dev-desc-buf d# 18 get-dev-desc drop ( ) + cfg-desc-buf 0 get-cfg-desc to /cfg-desc-buf ( ) ; \ Executed in hub node context (root hub or subordinate hub) - creates new child nodes via (make-device-node) : make-device-node ( port dev -- ) - dup " get-initial-descriptors" my-self $call-method ( port dev ) + " get-initial-descriptors" my-self $call-method ( port dev ) /cfg-desc-buf 0= if 2drop exit then ( port dev ) asso-class? if 1 else cfg-desc-buf 4 + c@ then ( port dev #intf ) 0 ?do ( port dev ) @@ -443,6 +440,16 @@ then ( port ) ; +: get-initial-dev-desc ( dev -- ) + dev-desc-buf d# 18 erase ( dev ) + dev-desc-buf d# 64 get-dev-desc 0= if ( dev ) + dev-desc-buf /pipe0 get-dev-desc 0= if ( dev ) + drop exit + then + then + 7 dev-desc@ 0 rot di-maxpayload! ( ) +; + \ Executed in the root hub node context : setup-new-node ( port speed hub-port hub-dev -- true | port dev xt false ) \ Allocate device number @@ -453,7 +460,11 @@ tuck di-speed! ( port dev ) 0 set-target ( port dev ) \ Address it as device 0 - over reset-port ( port dev ) \ Some devices want to be reset here + + \ Some devices (e.g. Lexar USB-to-SD and at least one USB FLASH drive) fail + \ on set-address unless you first read the device descriptor from address 0. + dup get-initial-dev-desc ( port dev ) + dup set-address if ( port dev ) \ Assign it usb addr dev ." Retrying with a delay" cr over reset-port d# 5000 ms Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Fri Jun 15 03:58:55 2012 (r3010) +++ dev/usb2/hcd/ehci/probe.fth Sat Jun 16 04:13:21 2012 (r3011) @@ -7,18 +7,16 @@ 0 value port-speed : make-root-hub-node ( port -- ) - \ Some devices (e.g. Lexar USB-to-SD) fail unless you get the cfg desc from device 0 first 0 set-target \ First address it as device 0 ( port ) port-speed 0 di-speed! \ Use high speed for getting the device descriptor - dev-desc-buf h# 40 get-cfg-desc drop ( port ) - + dup reset-port ( port ) port-speed ( port speed ) \ hub-port and hub-dev route USB 1.1 transactions through USB 2.0 hubs over get-hub20-port get-hub20-dev ( port speed hub-port hub-dev ) \ Execute setup-new-node in root context and make-device-node in hub node context - setup-new-node if execute then ( ) + setup-new-node if execute then ( ) ; 0 instance value probe-error? \ Back channel to selftest

1 0

[commit] r3010 - cpu/x86/pc/olpc/via
by repository service 15 Jun '12

15 Jun '12

Author: quozl Date: Fri Jun 15 03:58:55 2012 New Revision: 3010 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3010 Log: Q3C07 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 Jun 15 03:52:54 2012 (r3009) +++ cpu/x86/pc/olpc/via/fw-version.fth Fri Jun 15 03:58:55 2012 (r3010) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 06 +macro: FW_MINOR 07

1 0

[commit] r3009 - dev/usb2/device/net
by repository service 15 Jun '12

15 Jun '12

Author: quozl Date: Fri Jun 15 03:52:54 2012 New Revision: 3009 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3009 Log: OLPC - revert svn 2950 and svn 2954 as they are affecting mass production Modified: dev/usb2/device/net/ax8817x.fth dev/usb2/device/net/common.fth dev/usb2/device/net/ethernet.fth Modified: dev/usb2/device/net/ax8817x.fth ============================================================================== --- dev/usb2/device/net/ax8817x.fth Wed Jun 13 07:33:36 2012 (r3008) +++ dev/usb2/device/net/ax8817x.fth Fri Jun 15 03:52:54 2012 (r3009) @@ -179,11 +179,6 @@ d# 10 ms \ Just in case the link status bit isn't ready just yet ; -: ax-stop-phy ( -- ) - ax88772? if - h# 40 ax-sw-reset \ Power off internal PHY, reset external one (08 == 0) - then -; : select-phy ( -- ) ax88772? if \ Linksys USB200M uses the built-in PHY, DLink DUB-E100 uses an external one @@ -241,8 +236,6 @@ ; : ax-start-phy ( -- ) - select-phy - ax-init-mii ax-auto-neg-wait ; : ax-promiscuous ( -- ) rx-ctl@ 1 or rx-ctl! ; @@ -297,9 +290,11 @@ ax-toggle-gpio ax-get-phyid + select-phy ax-stop-mac ax-get-mac-address 2drop ax-set-ipg + ax-init-mii ; : ax-loopback{ ( -- ) @@ -321,7 +316,6 @@ ['] ax-link-up? to link-up? ['] ax-start-mac to start-mac ['] ax-start-phy to start-phy - ['] ax-stop-phy to stop-phy ['] ax-stop-mac to stop-mac ['] ax-get-mac-address to get-mac-address ['] ax-mii@ to mii@ Modified: dev/usb2/device/net/common.fth ============================================================================== --- dev/usb2/device/net/common.fth Wed Jun 13 07:33:36 2012 (r3008) +++ dev/usb2/device/net/common.fth Fri Jun 15 03:52:54 2012 (r3009) @@ -23,7 +23,6 @@ defer unwrap-msg ( adr len -- adr' len' ) ' noop to unwrap-msg defer link-up? ( -- up? ) ' true to link-up? defer start-phy ( -- ) ' noop to start-phy -defer stop-phy ( -- ) ' noop to stop-phy defer start-mac ( -- ) ' noop to start-mac defer stop-mac ( -- ) ' noop to stop-mac defer mii{ ( -- ) ' noop to mii{ \ Acquire Modified: dev/usb2/device/net/ethernet.fth ============================================================================== --- dev/usb2/device/net/ethernet.fth Wed Jun 13 07:33:36 2012 (r3008) +++ dev/usb2/device/net/ethernet.fth Fri Jun 15 03:52:54 2012 (r3009) @@ -31,7 +31,6 @@ stop-mac end-bulk-in free-buf - stop-phy ; external @@ -42,7 +41,7 @@ : copy-packet ( adr len -- len' ) dup multi-packet? if 4 + then ( adr len len' ) - /outbuf > if ." USB Ethernet write packet too long" cr stop-net abort then ( adr len ) + /outbuf > if ." USB Ethernet write packet too long" cr stop-mac abort then ( adr len ) multi-packet? if ( adr len ) dup wbsplit ( adr len len.low len.high ) @@ -72,7 +71,7 @@ \ The data format is: \ length.leword ~length.leword data [ pad-to-even ] : extract-packet ( -- data-adr len ) - residue 4 < if ." Short residue from USB Ethernet" cr stop-net abort then + residue 4 < if ." Short residue from USB Ethernet" cr stop-mac abort then pkt-adr dup 4 + swap >r r@ c@ r@ 1+ c@ bwjoin ( data-adr length ) @@ -131,7 +130,7 @@ 0 ( adr 0 ) then ( adr ihandle|0 ) - dup 0= if ." Can't open obp-tftp support package" stop-net abort then + dup 0= if ." Can't open obp-tftp support package" stop-mac abort then ( adr ihandle ) >r @@ -186,7 +185,6 @@ link-up? 0= if ." Network not connected." cr - stop-phy true exit then

1 0

[commit] r3008 - cpu/x86/pc/olpc
by repository service 13 Jun '12

13 Jun '12

Author: quozl Date: Wed Jun 13 07:33:36 2012 New Revision: 3008 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3008 Log: Q2F12 Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Wed Jun 13 07:05:13 2012 (r3007) +++ cpu/x86/pc/olpc/versions.fth Wed Jun 13 07:33:36 2012 (r3008) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR F -macro: FW_MINOR 11ma +macro: FW_MINOR 12 \ The EC microcode macro: EC_VERSION 1_2_1

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware June 2012