OpenBIOS November 2007

openbios@openbios.org

5 participants
46 discussions

r713 - dev/usb2/device/wlan
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 08:24:22 +0100 (Wed, 07 Nov 2007) New Revision: 713 Modified: dev/usb2/device/wlan/usb8388.fth Log: OLPC trac 4705 - fix scan failures caused by mesh auto-start happening during the scan attempt. Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2007-11-05 18:40:33 UTC (rev 712) +++ dev/usb2/device/wlan/usb8388.fth 2007-11-07 07:24:22 UTC (rev 713) @@ -388,29 +388,30 @@ : process-pmic-failure ( -- ) ; : process-gmic-failure ( -- ) ; +: .event ?cr ." Event: " type cr ; : process-ind ( adr len -- ) - ?cr drop - ." Event: " + drop 4 + le-l@ case - h# 03 of ." Link Loss" process-disconnect endof - h# 04 of ." Link Sensed" endof - h# 06 of ." MIB Changed" endof - h# 07 of ." Init Done" endof - h# 08 of ." Deauthenticated" process-disconnect endof - h# 09 of ." Disassociated" process-disconnect endof - h# 0a of ." Awake" process-wakeup endof - h# 0b of ." Sleep" process-wakeup endof - h# 0d of ." Multicast MIC error" process-gmic-failure endof - h# 0e of ." Unicast MIC error" process-pmic-failure endof - h# 11 of ." HWAC - adhoc BCN lost" endof - h# 19 of ." RSSI low" endof - h# 1a of ." SNR low" endof - h# 1b of ." Max fail" endof - h# 1c of ." RSSI high" endof - h# 1d of ." SNR high" endof + h# 03 of " Link Loss" .event process-disconnect endof + h# 04 of " Link Sensed" .event endof + h# 06 of " MIB Changed" .event endof + h# 07 of " Init Done" .event endof + h# 08 of " Deauthenticated" .event process-disconnect endof + h# 09 of " Disassociated" .event process-disconnect endof + h# 0a of " Awake" .event process-wakeup endof + h# 0b of " Sleep" .event process-wakeup endof + h# 0d of " Multicast MIC error" .event process-gmic-failure endof + h# 0e of " Unicast MIC error" .event process-pmic-failure endof + h# 11 of " HWAC - adhoc BCN lost" .event endof + h# 19 of " RSSI low" .event endof + h# 1a of " SNR low" .event endof + h# 1b of " Max fail" .event endof + h# 1c of " RSSI high" .event endof + h# 1d of " SNR high" .event endof + h# 23 of endof \ Suppress this; the user doesn't need to see it + \ h# 23 of ." Mesh auto-started" endof ( default ) ." Unknown " dup u. endcase - cr ; : process-request ( adr len -- ) @@ -440,7 +441,8 @@ then then ; -: wait-cmd-resp ( -- error? ) +\ -1 error, 0 okay, 1 retry +: wait-cmd-resp ( -- -1|0|1 ) false to got-response? false to got-data? resp-wait 0 do @@ -449,7 +451,11 @@ 1 ms loop got-response? if - cmd-resp-error? dup if ." Result = " dup u. then + cmd-resp-error? case + 0 of 0 endof \ No error + 4 of 1 endof \ Busy, so retry + ( default ) ." Result = " dup u. cr dup + endcase else ." Timeout or USB error" cr true @@ -750,7 +756,7 @@ : (scan) ( -- error? ) /cmd_802_11_scan ssid c@ if - /marvel-IE-hdr + ssid c@ + + /marvel-IE-hdr + ssid c@ + then 6 ( CMD_802_11_SCAN ) prepare-cmd ( ) resp-wait-long to resp-wait ( ) @@ -787,7 +793,8 @@ : set-ssid ( adr len -- ) h# 32 min ssid pack drop ; : scan ( adr len -- actual ) - (scan) if 2drop 0 exit then + begin (scan) dup 1 = while drop d# 1000 ms repeat \ Retry while busy + if 2drop 0 exit then respbuf /respbuf /fw-cmd /string ( adr len radr rlen ) rot min -rot swap 2 pick move ( actual ) ;

1 0

r712 - ofw/inet
by svn＠openbios.org 05 Nov '07

05 Nov '07

Author: wmb Date: 2007-11-05 19:40:33 +0100 (Mon, 05 Nov 2007) New Revision: 712 Modified: ofw/inet/arp.fth Log: Control the "ARP timeout" message from debug-net instead of from diag-switch?, thus making the problem from OLPC trac 4637 slightly easier to discern. Modified: ofw/inet/arp.fth =================================================================== --- ofw/inet/arp.fth 2007-11-05 18:38:22 UTC (rev 711) +++ ofw/inet/arp.fth 2007-11-05 18:40:33 UTC (rev 712) @@ -83,7 +83,9 @@ ; : .arp/rarp-timeout ( -- ) - " Timeout waiting for ARP/RARP packet" diag-type diag-cr + bootnet-debug if + ." Timeout waiting for ARP/RARP packet" cr + then ; : arpcom ( his-ip his-en my-ip my-en req-type en-type -- ok? )

1 0

r711 - ofw/fs/jffs2
by svn＠openbios.org 05 Nov '07

05 Nov '07

Author: wmb Date: 2007-11-05 19:38:22 +0100 (Mon, 05 Nov 2007) New Revision: 711 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC trac 4599 - first-time? must be considered in optimizing out rescanning, in case the NAND image was changed underneath JFFS2. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-11-04 17:32:52 UTC (rev 710) +++ ofw/fs/jffs2/jffs2.fth 2007-11-05 18:38:22 UTC (rev 711) @@ -118,7 +118,7 @@ : eblock>page ( eblock# -- page# ) pages/eblock * ; : page>eblock ( page# -- eblock# ) pages/eblock / ; --1 ( instance ) value have-eblock# \ For avoiding redundant reads +-1 instance value have-eblock# \ For avoiding redundant reads : (read-pages) ( page# #pages -- #read ) \ Partial reads invalidate the cache dup pages/eblock <> if -1 to have-eblock# then ( page# #pages ) @@ -824,7 +824,7 @@ ; : scan-occupied ( -- ) - " partition#" $call-parent partition# = if exit then + " partition#" $call-parent partition# = first-time? 0= and if exit then init-curvars dirents 'next-dirent ! inodes 'next-inode !

1 0

r710 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Nov '07

04 Nov '07

Author: wmb Date: 2007-11-04 18:32:52 +0100 (Sun, 04 Nov 2007) New Revision: 710 Modified: cpu/x86/pc/olpc/ec.bth cpu/x86/pc/olpc/verify.bth Log: OLPC - added -q to all wget commands to tidy up the build output. Modified: cpu/x86/pc/olpc/ec.bth =================================================================== --- cpu/x86/pc/olpc/ec.bth 2007-11-04 17:29:50 UTC (rev 709) +++ cpu/x86/pc/olpc/ec.bth 2007-11-04 17:32:52 UTC (rev 710) @@ -9,7 +9,7 @@ " ${GET_EC}" expand$ nip [if] " ${GET_EC}" expand$ $sh [else] - " wget http://dev.laptop.org/pub/ec/ec_v${EC_VERSION}.img -O ec.img" expand$ $sh + " wget -q http://dev.laptop.org/pub/ec/ec_v${EC_VERSION}.img -O ec.img" expand$ $sh [then] \ This forces the creation of an ec.log file, so we don't re-fetch ec.img Modified: cpu/x86/pc/olpc/verify.bth =================================================================== --- cpu/x86/pc/olpc/verify.bth 2007-11-04 17:29:50 UTC (rev 709) +++ cpu/x86/pc/olpc/verify.bth 2007-11-04 17:32:52 UTC (rev 710) @@ -5,12 +5,12 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh \ This forces the creation of an verify.log file, so we don't re-fetch writing verify.version

1 0

r709 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Nov '07

04 Nov '07

Author: wmb Date: 2007-11-04 18:29:50 +0100 (Sun, 04 Nov 2007) New Revision: 709 Added: cpu/x86/pc/olpc/verify.bth Removed: cpu/x86/pc/olpc/crypto.bth Modified: cpu/x86/pc/olpc/olpc.bth cpu/x86/pc/olpc/versions.fth Log: OLPC - Fixed a build dependency problem that sometimes prevented the crypto keys from being re-fetched automatically. Deleted: cpu/x86/pc/olpc/crypto.bth =================================================================== --- cpu/x86/pc/olpc/crypto.bth 2007-11-04 16:57:41 UTC (rev 708) +++ cpu/x86/pc/olpc/crypto.bth 2007-11-04 17:29:50 UTC (rev 709) @@ -1,18 +0,0 @@ -purpose: Fetch the Crypto code and keys - -command: &builder &this -build-now - -fload ${BP}/cpu/x86/pc/olpc/versions.fth - -" wget http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/os.public -O os.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/fw.public -O fw.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/fs.public -O fs.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/lease.public -O lease.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/developer.public -O developer.public" expand$ $sh - -\ This forces the creation of an crypto.log file, so we don't re-fetch -writing crypto.version -" ${CRYPTO_VERSION}"n" expand$ ofd @ fputs -ofd @ fclose Modified: cpu/x86/pc/olpc/olpc.bth =================================================================== --- cpu/x86/pc/olpc/olpc.bth 2007-11-04 16:57:41 UTC (rev 708) +++ cpu/x86/pc/olpc/olpc.bth 2007-11-04 17:29:50 UTC (rev 709) @@ -22,9 +22,8 @@ in: ${BP}/dev/olpc/cafenand/build/cafenand.fc in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc in: ${BP}/clients/memtest86/memtest -in: ec.img -in: crypto.img -in: usb8388.bin +in: ${BP}/cpu/x86/pc/olpc/build/verify.img +in: ${BP}/cpu/x86/pc/olpc/build/usb8388.bin in: ${BP}/dev/pci/build/pcibridg.fc build-now Added: cpu/x86/pc/olpc/verify.bth =================================================================== --- cpu/x86/pc/olpc/verify.bth (rev 0) +++ cpu/x86/pc/olpc/verify.bth 2007-11-04 17:29:50 UTC (rev 709) @@ -0,0 +1,18 @@ +purpose: Fetch the Crypto code and keys + +command: &builder &this +build-now + +fload ${BP}/cpu/x86/pc/olpc/versions.fth + +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh + +\ This forces the creation of an verify.log file, so we don't re-fetch +writing verify.version +" ${CRYPTO_VERSION}"n" expand$ ofd @ fputs +ofd @ fclose Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-11-04 16:57:41 UTC (rev 708) +++ cpu/x86/pc/olpc/versions.fth 2007-11-04 17:29:50 UTC (rev 709) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 03 +macro: FW_MINOR 03c \ The EC microcode macro: EC_VERSION d02 @@ -11,6 +11,9 @@ \ Temporarily uncomment the line and modify the path as necessary \ macro: GET_EC wget http://dev.laptop.org/~rsmith/shiny6.bin -O ec.img +macro: KEYS mpkeys +\ macro: KEYS testkeys + \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 macro: WLAN_VERSION 5.110.19.p0

1 0

r708 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Nov '07

04 Nov '07

Author: wmb Date: 2007-11-04 17:57:41 +0100 (Sun, 04 Nov 2007) New Revision: 708 Modified: cpu/x86/pc/olpc/fsupdate.fth Log: Reread partition map after writing a new copy to NAND FLASH. Modified: cpu/x86/pc/olpc/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/fsupdate.fth 2007-10-30 21:00:39 UTC (rev 707) +++ cpu/x86/pc/olpc/fsupdate.fth 2007-11-04 16:57:41 UTC (rev 708) @@ -50,6 +50,7 @@ partition-map-offset /nand-page / dup " erase-block" $call-nand load-base swap nand-pages/block " write-blocks" $call-nand nand-pages/block <> abort" Can't write partition map" + " read-partmap" $call-nand ; 0 value partition-page-offset

1 0