openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2653 - cpu/x86/pc/alex
by repository service 25 Oct '11

25 Oct '11

Author: lwalter Date: Tue Oct 25 00:57:39 2011 New Revision: 2653 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2653 Log: Include /supplicant package for wifi. Modified: cpu/x86/pc/alex/fw.bth Modified: cpu/x86/pc/alex/fw.bth ============================================================================== --- cpu/x86/pc/alex/fw.bth Tue Oct 25 00:56:15 2011 (r2652) +++ cpu/x86/pc/alex/fw.bth Tue Oct 25 00:57:39 2011 (r2653) @@ -174,10 +174,22 @@ true ' local-mac-address? set-config-int-default fload ${BP}/ofw/inet/loadtcp.fth +[ifdef] resident-packages +support-package: nfs + fload ${BP}/ofw/fs/nfs/loadpkg.fth +end-support-package +[then] +devalias nfs net//obp-tftp:last//nfs + support-package: http fload ${BP}/ofw/inet/http.fth \ HTTP client end-support-package +fload ${BP}/ofw/wifi/wifi-cfg.fth +support-package: supplicant +fload ${BP}/ofw/wifi/loadpkg.fth +end-support-package + fload ${BP}/cpu/x86/pc/boot.fth fload ${BP}/cpu/x86/pc/linux.fth @@ -251,7 +263,7 @@ " probe-" do-drop-in probe-pci report-pci-fb -\ silent-probe-usb + silent-probe-usb ; \ This reduces processor use when waiting for a key. It helps

1 0

[commit] r2652 - ofw/wifi
by repository service 25 Oct '11

25 Oct '11

Author: lwalter Date: Tue Oct 25 00:56:15 2011 New Revision: 2652 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2652 Log: Make eapol key handshake more robust and fix WPA/WPA2 auto cipher bug Modified: ofw/wifi/data.fth ofw/wifi/eapol.fth Modified: ofw/wifi/data.fth ============================================================================== --- ofw/wifi/data.fth Mon Oct 24 08:53:41 2011 (r2651) +++ ofw/wifi/data.fth Tue Oct 25 00:56:15 2011 (r2652) @@ -27,6 +27,8 @@ : set-key-type ( ctp ctg ktype -- ) " set-key-type" $call-parent ; : set-country-info ( adr len -- ) " set-country-info" $call-parent ; : set-atim-window ( n -- ) " set-atim-window" $call-parent ; +: set-gtk-idx ( n -- ) " set-gtk-idx" ['] $call-parent catch if 3drop then ; +: disconnected? ( -- flag ) " disconnected?" $call-parent ; \ ======================================================================= \ Global data Modified: ofw/wifi/eapol.fth ============================================================================== --- ofw/wifi/eapol.fth Mon Oct 24 08:53:41 2011 (r2651) +++ ofw/wifi/eapol.fth Tue Oct 25 00:56:15 2011 (r2652) @@ -9,9 +9,38 @@ : vtype ( adr len -- ) debug? if ??cr type cr else 2drop then ; \ ======================================================================= -\ EAPOL data definitions +\ Handshake variables and helper words + +false value send-error? +2 constant send-retry-cnt + +d# 30,000 constant timeout-eapol-limit +d# 5,000 constant timeout-msg-limit + +0 value timeout-eapol \ Global timeout value in ms +0 value timeout-msg \ Timeout waiting for msg from AP in ms + +: set-eapol-timeout ( -- ) get-msecs timeout-eapol-limit + to timeout-eapol ; +: set-msg-timeout ( -- ) get-msecs timeout-msg-limit + to timeout-msg ; +: eapol-timeout? ( -- timeout? ) get-msecs timeout-eapol >= ; +: msg-timeout? ( -- timeout? ) get-msecs timeout-msg >= ; +: timeout? ( -- timeout? ) eapol-timeout? msg-timeout? or ; + +false value done-pairwise-key? +false value done-group-key? -d# 10,000 constant eapol-wait +: done? ( -- done? ) done-group-key? done-pairwise-key? and ; + +: send-eapol-msg ( adr len -- ok? ) + send-retry-cnt 0 do + 2dup tuck write-force = if 2drop true unloop exit then + loop 2drop + false " Fail to send message" vtype + true to send-error? +; + +\ ======================================================================= +\ EAPOL data definitions 1 value eapol-ver 3 constant eapol-key @@ -68,6 +97,13 @@ 1000 constant ki-encr-key \ >kdata encrypted (WPA2) 2000 constant ki-smk-msg \ STSL master key +\ Vendor IE's OUI +h# 0050f2.01 constant oui-wpa \ Microsoft OUI's +h# 0050f2.02 constant oui-wmm +h# 0050f2.04 constant oui-wps +h# 00904c.33 constant oui-ht \ Broadcom OUI's +h# 00904c.34 constant oui-ht+ + \ ======================================================================= \ Nonce @@ -179,14 +215,13 @@ \ ======================================================================= \ Group temporal keys (GTK) -false value done-group-key? - d# 32 dup constant /gtk buffer: gtk 0 value gtk-idx \ Active GTK idx d# 32 buffer: ek \ Temporary rc4 key : install-group-key ( -- ) gtk ctype-g ct>klen set-gtk ; +: install-gtk-idx ( -- ) ktype kt-wpa2 = if gtk-idx set-gtk-idx then ; : set-gtk-supplicant ( adr -- ) dup gtk d# 16 move @@ -252,12 +287,54 @@ then ; +\ ======================================================================= +\ WPA/WPA2 handshake states +\ State Comment Process +\ s1/4 initial state Reset wait for 1/4 timeout +\ authenticate done pairwise key received? = false +\ associate done group key received? = false +\ Wait for 1/4 msg from AP +\ 1/4 timeout -> exit fail +\ s3/4 got 1/4 msg Send 2/4 msg to AP +\ Reset 3/4 timeout +\ Wait for 3/4 msg from AP +\ 3/4 timeout -> s2 +\ got 3/4 msg -> send 4/4 msg to AP +\ If we got group key, exit ok +\ Reset 1/2 timeout +\ s1/2 pairwise key done Wait for 1/2 msg from AP +\ 1/2 timeout -> s2 +\ got 1/2 msg -> send 2/2 msg to AP +\ exit ok +\ exit ok Install keys +\ +\ Anytime a 1/4 msg is received, goto s3/4 +\ Anytime deauthenticate is received, exit fail +\ Global timeout, exit fail + +0 value eapol-state +0 constant s0/4 \ Initial state; also invalid msg +1 constant s1/4 \ Waiting for 1/4 from AP; also msg# +2 constant s3/4 \ Waiting for 3/4 from AP; also msg# +3 constant s1/2 \ Waiting for 1/2 from AP; also msg# + +: set-s/4 ( -- ) + false to done-group-key? + false to done-pairwise-key? + set-msg-timeout +; +: set-s0/4 ( -- ) s0/4 to eapol-state set-s/4 ; +: set-s1/4 ( -- ) s1/4 to eapol-state set-s/4 ; +: set-s3/4 ( -- ) s3/4 to eapol-state set-s/4 ; +: set-s1/2 ( -- ) + false to done-group-key? + s1/2 to eapol-state + set-msg-timeout +; \ ======================================================================= \ WPA/WPA2 pairwise keys four-way handshake - -false value pairwise-rekey? -false value group-rekey? +\ WPA group key 2-way handshake /buf buffer: data @@ -269,35 +346,9 @@ ktype kt-wpa2 = if ki-encr-key or ki-secure or then ; : pct>kinfo4 ( -- kinfo ) pct>kinfo2 ktype kt-wpa2 = if ki-secure or then ; -: wait-for-eapol-key ( -- flag ) - false eapol-wait 0 do - data /buf read-force 0> if - data >etype be-w@ eapol-type = \ EAPOL frame - data >ptype c@ eapol-key = and \ EAPOL-key - data >rcnt last-rcnt /rcnt comp and if \ A new eapol-key record - data >rcnt last-rcnt! \ Update last replay counter - drop true - leave - then - then - 1 ms - loop -; - -: process-1-of-4 ( -- ok? ) - " Process EAPOL-key message 1 of 4" vtype - data >ver c@ to eapol-ver - data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch - data >kinfo be-w@ pct>kinfo1 <> if false exit then \ Bad key info - data >klen be-w@ ctype-p ct>klen <> if false exit then \ Bad key len - data >knonce anonce$ move \ Save authenticator nonce - true -; - -: wait-for-1-of-4 ( -- ok? ) - " Waiting for EAPOL-key message 1 of 4..." vtype - wait-for-eapol-key if process-1-of-4 else false then -; +: gct>kinfo ( -- kinfo ) ctype-p ct-aes = if ki-sha1-aes else ki-md5-rc4 then ; +: gct>kinfo1 ( -- kinfo ) gct>kinfo ki-mic or ki-secure or ki-ack or ; +: gct>kinfo2 ( -- kinfo ) gct>kinfo ki-mic or ki-secure or ; : set-eapolbuf-common ( -- ) eapolbuf /eapol-key erase @@ -310,132 +361,168 @@ ctype-p ct>klen eapolbuf >klen be-w! \ Key length last-rcnt eapolbuf >rcnt /rcnt move \ Replay counter ; -: send-2-of-4 ( -- error? ) + +: resync-gtk ( -- ) + last-rcnt++ + set-eapolbuf-common + 0 eapolbuf >klen be-w! \ Key length + /eapol-body eapolbuf >plen be-w! \ Packet length + ctype-g ct>klen eapolbuf >klen be-w! \ Key length + gct>kinfo ki-request or eapolbuf >kinfo be-w! \ Key info + eapolbuf /eapol-key send-eapol-msg +; + +: send-2/4 ( -- ok? ) " Send EAPOL-key message 2 of 4" vtype compute-snonce compute-ptk-supplicant set-eapolbuf-common - /eapol-body wpa-ie$ nip + eapolbuf >plen be-w! \ Packet length - pct>kinfo2 eapolbuf >kinfo be-w! \ Key info - snonce eapolbuf >knonce /nonce move \ Supplicant nonce - wpa-ie$ nip eapolbuf >kdlen be-w! \ Key data length - wpa-ie$ eapolbuf >kdata swap move \ Key data is WPA IE (or RSN IE) + /eapol-body wpa-ie$ nip + eapolbuf >plen be-w! \ Packet length + pct>kinfo2 eapolbuf >kinfo be-w! \ Key info + snonce eapolbuf >knonce /nonce move \ Supplicant nonce + wpa-ie$ nip eapolbuf >kdlen be-w! \ Key data length + wpa-ie$ eapolbuf >kdata swap move \ Key data is WPA IE (or RSN IE) eapolbuf >ver eapolbuf >plen be-w@ 4 + ctype-p compute-mic - mic eapolbuf >kmic /mic move \ Key mic - eapolbuf /eapol-key wpa-ie$ nip + tuck write-force <> + mic eapolbuf >kmic /mic move \ Key mic + eapolbuf /eapol-key wpa-ie$ nip + send-eapol-msg ; - -: process-3-of-4 ( -- ok? ) - " Process EAPOL-key message 3 of 4" vtype - data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch - data >kinfo be-w@ pct>kinfo3 <> if false exit then \ Bad key info - data >klen be-w@ ctype-p ct>klen <> if false exit then \ Bad key len - data >knonce anonce /nonce comp if false exit then \ Nonce differ - data ctype-p mic-ok? 0= if true to pairwise-rekey? false exit then \ Bad mic - data >kinfo be-w@ ki-encr-key and if data decrypt-parse-ie else true then -; -: wait-for-3-of-4 ( -- ok? ) - " Waiting for EAPOL-key message 3 of 4..." vtype - wait-for-eapol-key if process-3-of-4 else false then -; - -: send-4-of-4 ( -- error? ) +: send-4/4 ( -- ok? ) " Send EAPOL-key message 4 of 4" vtype set-eapolbuf-common - /eapol-body eapolbuf >plen be-w! \ Packet length - pct>kinfo4 eapolbuf >kinfo be-w! \ Key info + /eapol-body eapolbuf >plen be-w! \ Packet length + pct>kinfo4 eapolbuf >kinfo be-w! \ Key info eapolbuf >ver eapolbuf >plen be-w@ 4 + ctype-p compute-mic - mic eapolbuf >kmic /mic move \ Key mic - eapolbuf /eapol-key tuck write-force <> + mic eapolbuf >kmic /mic move \ Key mic + eapolbuf /eapol-key send-eapol-msg ; - -: do-pairwise-key-handshake ( -- ok? ) - false - wait-for-1-of-4 0= if ." Failed to get the first pairwise key" cr exit then - send-2-of-4 if ." Failed to send the second pairwise key" cr exit then - wait-for-3-of-4 0= if ." Failed to get the third pairwise key" cr exit then - send-4-of-4 if ." Failed to send the fourth pairwise key" cr exit then - install-pairwise-key - done-group-key? if install-group-key then - drop true +: send-2/2 ( -- ok? ) + " Send EAPOL-key message 2 of 2" vtype + set-eapolbuf-common + /eapol-body eapolbuf >plen be-w! \ Packet length + gct>kinfo2 eapolbuf >kinfo be-w! \ Key info + ctype-g ct>klen eapolbuf >klen be-w! \ Key length + eapolbuf >ver eapolbuf >plen be-w@ 4 + ctype-p compute-mic + mic eapolbuf >kmic /mic move \ Key mic + eapolbuf /eapol-key send-eapol-msg +; +: 1/4-valid? ( -- ok? ) + data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch + data >klen be-w@ ctype-p ct>klen <> if false exit then \ Bad key len + true ; - -\ ======================================================================= -\ WPA group keys 2-way handshake - -: gct>kinfo ( -- kinfo ) ctype-g ct-aes = if ki-sha1-aes else ki-md5-rc4 then ; -: gct>kinfo1 ( -- kinfo ) gct>kinfo ki-mic or ki-secure or ki-ack or ; -: gct>kinfo2 ( -- kinfo ) gct>kinfo ki-mic or ki-secure or ; - -: process-1-of-2 ( -- ok? ) - " Process EAPOL-key message 1 of 2" vtype - data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch data >kinfo be-w@ ki-idx-mask invert and gct>kinfo1 <> if false exit then \ Bad key info - data >klen be-w@ ctype-g ct>klen <> if false exit then \ Bad key len - data ctype-p mic-ok? 0= if true to group-rekey? false exit then \ Bad mic - data decrypt-gtk +: process-1/4 ( -- ) + " Process EAPOL-key message 1 of 4" vtype + eapol-state s1/4 <> if " Unexpected pairwise key message 1 of 4" vtype then + 1/4-valid? if + data >ver c@ to eapol-ver + data >knonce anonce$ move + send-2/4 if set-s3/4 then + then ; -: wait-for-1-of-2 ( -- ok? ) - " Waiting for EAPOL-key message 1 of 2..." vtype - wait-for-eapol-key if process-1-of-2 else false then +: 3/4-valid? ( -- ok? ) + data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch + data >klen be-w@ ctype-p ct>klen <> if false exit then \ Bad key len + data >knonce anonce /nonce comp if false exit then \ Nonce differ + data ctype-p mic-ok? 0= if false exit then \ Bad mic + data >kinfo be-w@ ki-encr-key and if data decrypt-parse-ie else true then ; - -: send-2-of-2 ( -- error? ) - " Send EAPOL-key message 2 of 2" vtype - set-eapolbuf-common - /eapol-body eapolbuf >plen be-w! \ Packet length - gct>kinfo2 eapolbuf >kinfo be-w! \ Key info - eapolbuf >ver eapolbuf >plen be-w@ 4 + ctype-g compute-mic - mic eapolbuf >kmic /mic move \ Key mic - eapolbuf /eapol-key tuck write-force <> +: process-3/4 ( -- ) + " Process EAPOL-key message 3 of 4" vtype + eapol-state s3/4 = if + 3/4-valid? if + send-4/4 if + install-pairwise-key + true to done-pairwise-key? + " Install pairwise key" vtype + done-group-key? if + \ WPA2 3/4 contains the group key + " Install group key" vtype + install-gtk-idx + install-group-key + else + " Wait for group key message 1 of 2" vtype + set-s1/2 + then + then + then + else + " Unexpected pairwise key message 3 of 4" vtype + then ; - -: do-group-key-handshake ( -- ) - wait-for-1-of-2 0= if ." Failed to get the first group key" cr exit then - send-2-of-2 if ." Failed to send the second group key" cr exit then - install-group-key +: 1/2-valid? ( -- ok? ) + data >dtype c@ kt>dtype <> if false exit then \ Descriptor type mismatch + data >klen be-w@ ctype-g ct>klen <> if false exit then \ Bad key len + data ctype-p mic-ok? 0= if false exit then \ Bad MIC + data decrypt-gtk ; - -\ ======================================================================= -\ WPA/WPA2 keys handshake - -: request-rekey ( ki-pairwise -- ) - " Send rekey message" vtype - last-rcnt++ - set-eapolbuf-common - 0 eapolbuf >klen be-w! \ Key length - /eapol-body eapolbuf >plen be-w! \ Packet length - ( ki-pairwise ) dup gct>kinfo or ki-request or ki-error or ki-mic or - eapolbuf >kinfo be-w! \ Key info - eapolbuf >ver eapolbuf >plen be-w@ 4 + - rot ( ki-pairwise ) if ctype-p else ctype-g then compute-mic - mic eapolbuf >kmic /mic move \ Key mic - eapolbuf /eapol-key tuck write-force <> +: process-1/2 ( -- ) + eapol-state s1/2 = if + 1/2-valid? if + send-2/2 if + " Install group key" vtype + install-gtk-idx + install-group-key + true to done-group-key? + then + then + else + " Unexpected group key message 1 of 2" vtype + then ; - -: resync-gtk ( -- ) 0 request-rekey ; - -: (do-key-handshakes) ( -- ) - false to done-group-key? - false to pairwise-rekey? - do-pairwise-key-handshake if - done-group-key? 0= if - 2 0 do - false to group-rekey? - do-group-key-handshake - group-rekey? if resync-gtk else leave then - loop +: get-eapol-msg# ( -- state ) + data >kinfo be-w@ + dup ki-pairwise and if \ Pairwise key info + dup pct>kinfo1 = if drop s1/4 exit then + pct>kinfo3 = if s3/4 exit then + else + ki-idx-mask invert and gct>kinfo1 = if s1/2 exit then + then + s0/4 +; +: process-eapol-key ( -- ) + get-eapol-msg# case + s1/4 of process-1/4 endof + s3/4 of process-3/4 endof + s1/2 of process-1/2 endof + endcase +; +: (process-eapol) ( -- ) + data >etype be-w@ eapol-type = \ EAPOL frame + data >ptype c@ eapol-key = and if \ EAPOL-key + data >ver c@ to eapol-ver + data >rcnt last-rcnt /rcnt comp 0> if \ A new eapol-key record + data >rcnt /rcnt cdump cr + data >rcnt last-rcnt! \ Update last replay counter + process-eapol-key + else + " Same replay count; packet discarded" vtype then + else + " Non EAPOL frame received" vtype then ; - +: (do-key-handshakes) ( -- ) + begin + data /buf read-force 0> if (process-eapol) then + timeout? disconnected? or done? or send-error? or until +; : do-key-handshakes ( -- ) - 2 0 do + false to send-error? + set-eapol-timeout + set-s1/4 + (do-key-handshakes) + done? disconnected? or send-error? or if exit then + done-pairwise-key? if + " Timeout waiting for group key; request group key" vtype + resync-gtk + set-eapol-timeout + set-s1/2 (do-key-handshakes) - pairwise-rekey? if ki-pairwise request-rekey else leave then - loop + else + " Timeout waiting for 4-way handshake" vtype + then ; - \ ======================================================================= \ Scan dump @@ -447,6 +534,21 @@ loop cr ; +: .vendor ( adr -- ) + dup 2 + swap 1+ c@ ( adr' len ) + ?dup 0= if drop exit then + dup 4 < if ." Vendor Specific: " cdump cr exit then + over be-l@ case ( adr len ) + oui-wpa of ." WPA: " endof + oui-wmm of ." WMM: " endof + oui-wps of ." WPS: " endof + oui-ht of ." HT: " endof + oui-ht+ of ." More HT: " endof + ( otherwise ) ." Vendor Specific: " + endcase + cdump cr +; + : .ie ( adr -- ) dup c@ ." " case @@ -482,7 +584,7 @@ cr endof d# 48 of ." Robust security network: " dup 2 + swap 1+ c@ cdump cr endof d# 50 of ." Extended supported rates (Mbit/s): " .rates endof - d# 221 of ." Wi-Fi Protected Access: " dup 2 + swap 1+ c@ cdump cr endof + d# 221 of .vendor endof ( default ) ." Unknown IE type: " swap dup 1+ c@ 2 + cdump cr endcase ; @@ -573,14 +675,6 @@ dup le-w@ swap 2 + swap d# 19 /string ( adr' len' ) r> (find-ie) ( adr' len' true | false ) ; -: find-ie2 ( ie-adr,len adr ie-type -- adr len true | false ) - >r ( ie-adr,len adr ) ( R: ie-type ) - dup le-w@ swap 2 + swap d# 19 /string - ( ie-adr,len adr len ) ( R: ie-type ) - 3 pick rot - - ( ie-adr,len len' ) ( R: ie-type ) - swap /string ( adr' len' ) ( R: ie-type ) - r> (find-ie) ( adr' len' true | false ) -; : find-ssid ( ssid$ scanbuf-adr -- ap-adr' true | false ) false swap ( ssid$ flag adr ) dup 3 + ( ssid$ flag 'ap ) @@ -728,14 +822,19 @@ dup 0= if ." Keys in wifi-cfg are not valid - " then ; -h# 0050.f201 constant wpa-tag -: process-wpa-ie ( ie-adr,len adr -- ) - \ Some AP such as Linksys has a bogus WPA IE in addition to the real thing. - \ Skip over the bad one and see if there's another WPA IE - 2 pick be-l@ wpa-tag = if drop set-wpa-ktype exit then - d# 221 find-ie2 if - over be-l@ wpa-tag = if set-wpa-ktype else 2drop then - then +: (process-vendor-ie) ( adr -- ) + dup 2 + swap 1+ c@ ( adr' len ) + dup 4 > if + over be-l@ oui-wpa = if set-wpa-ktype exit then + then 2drop +; + +: process-vendor-ie ( adr -- ) + dup le-w@ swap 2 + swap d# 19 /string ( adr' len ) + begin dup 0> while ( adr len ) + over c@ h# dd = if over (process-vendor-ie) then + over 1+ c@ 2 + /string ( adr' len' ) + repeat 2drop ; : ssid-valid? ( adr -- flag ) @@ -754,7 +853,7 @@ dup 6 find-ie if drop 2 + le-w@ set-atim-window then \ ATIM window dup 7 find-ie 0= if null$ then do-set-country-info \ Country channel/power info dup d# 48 find-ie if set-wpa2-ktype drop key-ok? exit then \ Favor RSN(WPA2) over WPA - dup d# 221 find-ie if 2 pick process-wpa-ie then + dup process-vendor-ie \ E.g. WPA drop key-ok? ; @@ -764,7 +863,7 @@ cr ktype=wpa? if do-key-handshakes - done-group-key? + done? else true then @@ -831,15 +930,8 @@ " Process EAPOL message" vtype 2dup vdump data swap move - data >ptype c@ eapol-key = and if \ EAPOL-key - data >rcnt last-rcnt /rcnt comp if \ A new eapol-key record - " Got EAPOL-key message 1 of 2" vtype - data >rcnt last-rcnt! \ Update last replay counter - process-1-of-2 if - send-2-of-2 0= if install-group-key then - then - then - then + set-s1/2 + (process-eapol) ;

1 0

[commit] r2651 - cpu/x86/pc/olpc/via
by repository service 24 Oct '11

24 Oct '11

Author: quozl Date: Mon Oct 24 08:53:41 2011 New Revision: 2651 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2651 Log: Q3B22 (note that this version was not svn head at this point, but rather svn 2478 [q3b19] with 2589 and 2597 [q3b20]) (that is, q3b21 with another EC version) Modified: cpu/x86/pc/olpc/via/ec-version.fth cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/ec-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/ec-version.fth Mon Oct 24 04:51:51 2011 (r2650) +++ cpu/x86/pc/olpc/via/ec-version.fth Mon Oct 24 08:53:41 2011 (r2651) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 2_2_9 +macro: EC_VERSION 2_2_10 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Mon Oct 24 04:51:51 2011 (r2650) +++ cpu/x86/pc/olpc/via/fw-version.fth Mon Oct 24 08:53:41 2011 (r2651) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 21 +macro: FW_MINOR 22

1 0

[commit] r2650 - cpu/arm/olpc/1.75
by repository service 24 Oct '11

24 Oct '11

Author: wmb Date: Mon Oct 24 04:51:51 2011 New Revision: 2650 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2650 Log: Q4C01 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 Mon Oct 24 04:51:41 2011 (r2649) +++ cpu/arm/olpc/1.75/fw-version.fth Mon Oct 24 04:51:51 2011 (r2650) @@ -1,3 +1,3 @@ \ The overall firmware revision -macro: FW_MAJOR B -macro: FW_MINOR 12mk +macro: FW_MAJOR C +macro: FW_MINOR 01

1 0

[commit] r2649 - cpu/arm/olpc/1.75
by repository service 24 Oct '11

24 Oct '11

Author: wmb Date: Mon Oct 24 04:51:41 2011 New Revision: 2649 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2649 Log: OLPC XO-1.75 - Include EC code version 4_0_3_01 Modified: cpu/arm/olpc/1.75/ec-version.fth Modified: cpu/arm/olpc/1.75/ec-version.fth ============================================================================== --- cpu/arm/olpc/1.75/ec-version.fth Mon Oct 24 04:51:29 2011 (r2648) +++ cpu/arm/olpc/1.75/ec-version.fth Mon Oct 24 04:51:41 2011 (r2649) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 4_0_3_00 +macro: EC_VERSION 4_0_3_01 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r2648 - cpu/arm/olpc/1.75
by repository service 24 Oct '11

24 Oct '11

Author: wmb Date: Mon Oct 24 04:51:29 2011 New Revision: 2648 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2648 Log: OLPC XO-1.75 - changed USB post-hub-port-power-on delay to 350 ms to fix a problem with some Belkin USB sticks. Modified: cpu/arm/olpc/1.75/usb.fth Modified: cpu/arm/olpc/1.75/usb.fth ============================================================================== --- cpu/arm/olpc/1.75/usb.fth Mon Oct 24 01:54:24 2011 (r2647) +++ cpu/arm/olpc/1.75/usb.fth Mon Oct 24 04:51:29 2011 (r2648) @@ -41,7 +41,7 @@ init-usb ; -d# 300 config-int usb-delay \ Milliseconds to wait before probing hub ports +d# 350 config-int usb-delay \ Milliseconds to wait before probing hub ports devalias u /usb/disk

1 0

[commit] r2647 - cpu/x86/pc/olpc/via
by repository service 24 Oct '11

24 Oct '11

Author: quozl Date: Mon Oct 24 01:54:24 2011 New Revision: 2647 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2647 Log: Q3B21 (note that this version was not svn head at this point, but rather svn 2478 [q3b19] with 2589 and 2597 [q3b20]) 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 Sun Oct 23 01:36:39 2011 (r2646) +++ cpu/x86/pc/olpc/via/fw-version.fth Mon Oct 24 01:54:24 2011 (r2647) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 20 +macro: FW_MINOR 21

1 0

[commit] r2646 - cpu/arm/olpc/1.75
by repository service 23 Oct '11

23 Oct '11

Author: wmb Date: Sun Oct 23 01:36:39 2011 New Revision: 2646 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2646 Log: q4b12mk 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 Sun Oct 23 01:36:33 2011 (r2645) +++ cpu/arm/olpc/1.75/fw-version.fth Sun Oct 23 01:36:39 2011 (r2646) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 12mj +macro: FW_MINOR 12mk

1 0

[commit] r2645 - ofw/fs/ext2fs
by repository service 23 Oct '11

23 Oct '11

Author: wmb Date: Sun Oct 23 01:36:33 2011 New Revision: 2645 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2645 Log: ext2/3 file system - added ext3 journal recovery. Modified: ofw/fs/ext2fs/ext2fs.fth ofw/fs/ext2fs/ext2test.sh ofw/fs/ext2fs/layout.fth ofw/fs/ext2fs/methods.fth ofw/fs/ext2fs/recovery.fth ofw/fs/ext2fs/sb.fth Modified: ofw/fs/ext2fs/ext2fs.fth ============================================================================== --- ofw/fs/ext2fs/ext2fs.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/ext2fs.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -10,7 +10,9 @@ fload ${BP}/ofw/fs/ext2fs/bitmap.fth fload ${BP}/ofw/fs/ext2fs/layout.fth fload ${BP}/ofw/fs/ext2fs/dir.fth +fload ${BP}/ofw/fs/ext2fs/recovery.fth fload ${BP}/ofw/fs/ext2fs/methods.fth + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: ofw/fs/ext2fs/ext2test.sh ============================================================================== --- ofw/fs/ext2fs/ext2test.sh Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/ext2test.sh Sun Oct 23 01:36:33 2011 (r2645) @@ -63,10 +63,11 @@ if [ ! -b "${DEVICE}" ]; then echo REMAKING FILE rm -f "${DEVICE}" -dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=8388000 2> /dev/null #8388608 +# dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=8388000 2> /dev/null #8388608 # dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=4194303 2> /dev/null -#dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=2097151 2> /dev/null -#dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=1050000 2> /dev/null +# dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=2097151 2> /dev/null +# dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=1050000 2> /dev/null +dd if=/dev/zero of=${DEVICE} bs=512 count=1 seek=10000 2> /dev/null # 5 MiB chmod 666 ${DEVICE} fi # if [ ! -b "${DEVICE}" -a ! -f "${DEVICE}" ]; then @@ -123,7 +124,7 @@ echo -n "make filesystem ... " #/sbin/mke2fs -n -b 4096 -q ${PARTITION} # /sbin/mke2fs -n -j -O dir_index,^huge_file -E resize=8G -m 1 -b 4096 -q ${PARTITION} -/sbin/mke2fs -n -j -O dir_index -m 1 -b 1024 -q ${PARTITION} +/sbin/mke2fs -j -O dir_index -m 1 -b 1024 -q ${PARTITION} echo "made" # we occasionally get @@ -133,12 +134,12 @@ until mount ${PARTITION} /mnt; do sleep 0.1; done echo "mounted" -echo -n "create test content and unmount ... " +echo "create test content" mkdir /mnt/boot cp ext2test.fth /mnt/boot/olpc.fth -cd /mnt +pushd /mnt touch touched echo hello > hello echo hello world > hello-world @@ -151,11 +152,23 @@ echo hello world down here > directory/hw mkfifo fifo mknod node b 1 1 -cd +popd + +if [ ! -b ${DEVICE} ] ; then + echo -n "save dirty journal ..." + sleep 10 + cp ${DEVICE} ${DEVICE}.dirty +fi + +echo -n "unmount ... " umount /mnt +sync if [ ! -b ${DEVICE} ] ; then /sbin/losetup -d ${PARTITION} + sync + mv ${DEVICE} ${DEVICE}.clean + cp ${DEVICE}.dirty ${DEVICE}.test fi echo "finished" Modified: ofw/fs/ext2fs/layout.fth ============================================================================== --- ofw/fs/ext2fs/layout.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/layout.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -211,7 +211,8 @@ else \ find or allocate physical block get-pblk# ( adr pblk# ) then - dup h# f8 < if dup . ." attempt to destroy file system" cr abort then +\ This interferes with journal recovery +\ dup h# f8 < if dup . ." attempt to destroy file system" cr abort then block bsize move update ; Modified: ofw/fs/ext2fs/methods.fth ============================================================================== --- ofw/fs/ext2fs/methods.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/methods.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -216,6 +216,8 @@ my-args " <NoFile>" $= if true exit then + recover? if process-journal then + \ Start out in the root directory set-root Modified: ofw/fs/ext2fs/recovery.fth ============================================================================== --- ofw/fs/ext2fs/recovery.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/recovery.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -6,6 +6,21 @@ /l field >h_sequence constant /journal-header +\ Superblock - blocktype 3 (version 1) or 4 (version 2) +/journal-header + /l field >s_blocksize + /l field >s_maxlen + /l field >s_first + /l field >s_sequence + /l field >s_start + /l field >s_errno + /l field >s_feature_compat + /l field >s_feature_incompat + /l field >s_feature_ro_compat + \ We don't need the rest +drop + +\ Commit header - blocktype 2 /journal-header /c field >h_chksum_type /c field >h_chksum_size @@ -15,10 +30,13 @@ /l field >h_commit_nsec constant /commit-header +\ Revoke header - blocktype 5 /journal-header /l field >r_count constant /revoke-header +\ Descriptor block - blocktype 1 - journal header followed by an array of tags +\ Tag - 32-bit and 64-bit forms struct /l field >t_blocknr /l field >t_flags @@ -26,19 +44,6 @@ /l field >t_blocknr_high constant /tag64 -/journal-header - /l field >s_blocksize - /l field >s_maxlen - /l field >s_first - /l field >s_sequence - /l field >s_start - /l field >s_errno - /l field >s_feature_compat - /l field >s_feature_incompat - /l field >s_feature_ro_compat - \ We don't need the rest -drop - 0 value j-buf 0 value j-compat 0 value j-incompat @@ -72,7 +77,7 @@ then jsb >s_start be-l@ to j-start - jsb 0= if + j-start 0= if free-journal true exit ( -- skip? ) then @@ -333,6 +338,7 @@ then ; : commit-journal ( -- ) + jsb >s_sequence dup be-l@ 1+ swap be-l! 0 jsb >s_start be-l! jsb 0 write-file-block flush @@ -340,6 +346,8 @@ : process-journal ( -- ) read-journal if exit then +." Recovering from journal ... " + 0 ['] one-pass catch if ." Journal scan failed" cr free-journal exit @@ -357,6 +365,7 @@ free-revoke-list - \ commit-journal + commit-journal free-journal +cr ; Modified: ofw/fs/ext2fs/sb.fth ============================================================================== --- ofw/fs/ext2fs/sb.fth Sat Oct 22 12:40:13 2011 (r2644) +++ ofw/fs/ext2fs/sb.fth Sun Oct 23 01:36:33 2011 (r2645) @@ -48,10 +48,10 @@ : total-free-inodes! ( -- n ) super-block 4 la+ int! ; : #groups ( -- n ) total-blocks bpg ceiling ; +: recover? ( -- flag ) 24 +sbl 4 and 0<> ; + \ Don't write to a disk that uses extensions we don't understand : unknown-extensions? ( -- unsafe? ) - 24 +sbl 4 and if ." ext3 journal needs recovery" cr then - 23 +sbl h# ffffffff invert and \ Accept all compat extensions 24 +sbl h# 00000002 invert and or \ Incompatible - accept FILETYPE 25 +sbl h# 00000003 invert and or \ RO - accept SPARSE_SUPER and LARGE_FILE

1 0

[commit] r2644 - in cpu/arm: . mmp2 olpc/1.75
by repository service 22 Oct '11

22 Oct '11

Author: wmb Date: Sat Oct 22 12:40:13 2011 New Revision: 2644 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2644 Log: OLPC XO-1.75 - Fixed emacs by revamping the DMA allocation code, separating the DMA memory list from the physical memlist. DMA memory is mapped uncached, while other memory is cacheable, so conflating them is not a good idea. Modified: cpu/arm/linux.fth cpu/arm/mmp2/rootnode.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/probemem.fth Modified: cpu/arm/linux.fth ============================================================================== --- cpu/arm/linux.fth Sat Oct 22 12:40:07 2011 (r2643) +++ cpu/arm/linux.fth Sat Oct 22 12:40:13 2011 (r2644) @@ -9,8 +9,9 @@ 0 value linux-memtop +defer memory-limit \ Find the end of the largest piece of memory -: memory-limit ( -- limit ) +: (memory-limit) ( -- limit ) \ If we have already loaded a RAMdisk in high memory, its base is the memory limit ramdisk-adr ?dup if exit then @@ -30,6 +31,7 @@ 2drop ( size base ) + ( limit ) ; +' (memory-limit) to memory-limit \ Override by platform code if necessary \ see http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html Modified: cpu/arm/mmp2/rootnode.fth ============================================================================== --- cpu/arm/mmp2/rootnode.fth Sat Oct 22 12:40:07 2011 (r2643) +++ cpu/arm/mmp2/rootnode.fth Sat Oct 22 12:40:13 2011 (r2644) @@ -34,54 +34,14 @@ 2drop ; -: dma-range ( -- start end ) dma-mem-va >physical dup /dma-mem + ; - +[ifdef] virtual-mode h# 0 constant dma-map-mode \ XXX what should this be? - -\ Used with "find-node" to locate a physical memory node containing -\ enough memory in the DMA range. -\ We first compute the intersection between the memory piece and the -\ range reachable by DMA. If the regions are disjoint, then ok-high -\ will be (unsigned) less than ok-low. We then subtract ok-low from -\ ok-high to give the (possibly negative) size of the intersection. -: in-range? ( size mem-low mem-high range-low range-high -- flag ) - rot umin -rot ( size min-high mem-low mem-high ) - umax ( size min-high max-low ) - - <= ( flag ) -; - -: dma-ok? ( size node-adr -- size flag ) - node-range ( size mem-adr mem-len ) - over + ( size mem-adr mem-end ) - - 3dup dma-range in-range? if ( size mem-adr mem-end ) - 2drop true exit ( size true ) - then ( size mem-adr mem-end ) - - 2drop false ( size false ) -; - -\ Find an available physical address range suitable for DMA. This word -\ doesn't actually claim the memory (that is done later), but simply locates -\ a suitable range that can be successfully claimed. -: find-dma-address ( size -- true | adr false ) - " physavail" memory-node @ $call-method ( list ) - ['] dma-ok? find-node is next-node drop ( size' ) - next-node 0= if drop true exit then ( size' ) - next-end ( size mem-end ) - dma-range ( size mem-end range-l,h ) - nip umin swap - false ( adr false ) -; +[then] headers : dma-alloc ( size -- virt ) - pagesize round-up - - \ Locate a suitable physical range - dup find-dma-address throw ( size' phys ) - - \ Claim it - over 0 mem-claim ( size' phys ) + \ Allocate the physical memory + dup " allocate-dma-phys" $call-mem-method ( size' phys ) [ifdef] virtual-mode \ Get a virtual range @@ -111,7 +71,7 @@ swap >physical swap ( virt ) [then] [then] - mem-release ( ) + " free-dma-phys" $call-mem-method ( ) ; : dma-map-in ( virt size cacheable -- devaddr ) Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Sat Oct 22 12:40:07 2011 (r2643) +++ cpu/arm/olpc/1.75/fw.bth Sat Oct 22 12:40:13 2011 (r2644) @@ -27,6 +27,11 @@ fload ${BP}/cpu/arm/linux.fth +\ The bottom of extra-mem is the top of DMA memory. +\ We give everything up to that address to Linux. +: olpc-memory-limit ( -- adr ) extra-mem-va >physical ; +' olpc-memory-limit to memory-limit + : usb-quiet ( -- ) [ ' linux-hook behavior compile, ] \ Chain to old behavior unload-crypto Modified: cpu/arm/olpc/1.75/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Sat Oct 22 12:40:07 2011 (r2643) +++ cpu/arm/olpc/1.75/probemem.fth Sat Oct 22 12:40:13 2011 (r2644) @@ -8,18 +8,28 @@ headerless -h# ffff.ffff value low -h# 0 value high +list: dmaavail 0 dmaavail ! -: log&release ( adr len -- ) - over low umin to low ( adr len ) - 2dup + high umax to high ( adr len ) - release +headers +: allocate-dma-phys ( size -- phys ) + \ Minumum granularity of memory chunks is 1 page + pagesize round-up ( size' ) + + pagesize over dmaavail ( size alignment size list ) + allocate-memrange ( size [ adr ] error? ) + abort" Insufficient DMA memory" ( size adr ) + dup rot clear-mem ( phys ) +; + +: free-dma-phys ( phys size -- ) + >page-boundaries ( adr' size' ) + ['] 2drop is ?splice ( adr' size' ) + dmaavail free-memrange ; headers : probe ( -- ) - 0 fb-mem-va >physical /fb-mem + log&release + 0 fb-mem-va >physical /fb-mem + release 0 0 encode-bytes ( adr 0 ) physavail ['] make-phys-memlist find-node ( adr len prev 0 ) @@ -29,6 +39,9 @@ fb-mem-va >physical /fb-mem 0 claim drop fw-mem-va >physical /fw-mem 0 claim drop extra-mem-va >physical /extra-mem 0 claim drop + dma-mem-va >physical /dma-mem 0 claim drop + + dma-mem-va >physical /dma-mem free-dma-phys 0 pagesize 0 claim drop \ Vector table ;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware