openfirmware January 2010

openfirmware@openfirmware.info

1 participants
85 discussions

r1717 - in cpu/x86/pc/olpc: . via
by svn＠openfirmware.info 28 Jan '10

28 Jan '10

Author: wmb Date: 2010-01-29 00:38:48 +0100 (Fri, 29 Jan 2010) New Revision: 1717 Modified: cpu/x86/pc/olpc/nandcastui.fth cpu/x86/pc/olpc/via/mcnand-version.fth Log: NANDblaster - added support for listening on different multicast groups so the factory can download different images to different SKUs simultaneously. Modified: cpu/x86/pc/olpc/nandcastui.fth =================================================================== --- cpu/x86/pc/olpc/nandcastui.fth 2010-01-28 13:59:56 UTC (rev 1716) +++ cpu/x86/pc/olpc/nandcastui.fth 2010-01-28 23:38:48 UTC (rev 1717) @@ -106,12 +106,17 @@ " boot rom:nb_rx ,,239.255.1.2" eval )boot-as-call ; -: nb-rx +: $nb-rx ( multicast-ip$ -- ) false to already-go? boot-as-call( - " boot rom:nb_rx ,,0.0.0.1" eval + ( multicast-ip$ ) " boot rom:nb_rx mcast:%s" sprintf eval )boot-as-call ; +: nb-rx: ( "multicast-ip" -- ) + safe-parse-word $nb-rx +; +: nb-rx ( -- ) " 224.0.0.100" $nb-rx ; + : ucastnand false to already-go? " boot rom:nb_rx 10.20.0.16,,10.20.0.44" eval Modified: cpu/x86/pc/olpc/via/mcnand-version.fth =================================================================== --- cpu/x86/pc/olpc/via/mcnand-version.fth 2010-01-28 13:59:56 UTC (rev 1716) +++ cpu/x86/pc/olpc/via/mcnand-version.fth 2010-01-28 23:38:48 UTC (rev 1717) @@ -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 b8b1eb851bf6583a3fe83c073ecb8e6a682f4e18 +macro: MCNAND_VERSION 1eaa6e5822104b58cd933d33724a550ee1778943 \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD

1 0

r1716 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 28 Jan '10

28 Jan '10

Author: rsmith Date: 2010-01-28 14:59:56 +0100 (Thu, 28 Jan 2010) New Revision: 1716 Added: cpu/x86/pc/olpc/via/final.fth Removed: cpu/x86/pc/olpc/via/runin.fth Log: Rename runin.fth to final.fth Copied: cpu/x86/pc/olpc/via/final.fth (from rev 1714, cpu/x86/pc/olpc/via/runin.fth) =================================================================== --- cpu/x86/pc/olpc/via/final.fth (rev 0) +++ cpu/x86/pc/olpc/via/final.fth 2010-01-28 13:59:56 UTC (rev 1716) @@ -0,0 +1,465 @@ +\ Post-runin boot script $Revision$ + +visible + +\ Location of the files containing KA tag data +: ka-dir$ ( -- adr len ) " http:\\10.1.0.1\ka\" ; + +: mfg-ntp-server ( -- name$ ) + " NT" find-tag if ?-null else " 10.1.0.1" then +; +' mfg-ntp-server to ntp-servers + +\ The Linux-based runin selftests put this file at int:\runin\olpc.fth +\ after they have finished. On the next reboot, OFW thus boots this +\ script instead of int:\boot\olpc.fth . This script either displays +\ the failure log (if int:\runin\fail.log is present) or modifies the +\ manufacturing data tags to cause the next boot to enter final test. + +d# 128 buffer: mb-buf : mb$ mb-buf count ; + +: get-mb-tags ( -- ) + " B#" find-tag if + ?-null + then + mb-buf place +; + +: set-tag-assy ( -- ) + get-mb-tags + + clear-mfg-buf + + " " " ww" put-ascii-tag + + " "(D3)" " SG" ($add-tag) + mb$ " B#" put-ascii-tag + " EN" " SS" put-ascii-tag + + " ASSY" " TS" put-ascii-tag + " cifs:\\Administrator:qmsswdl@10.0.0.2\OLPC_TM" " MS" put-ascii-tag + " u:\boot\olpc.fth net" " BD" put-ascii-tag + + flash-write-enable + (put-mfg-data) + no-kbc-reboot + kbc-on +; + +d# 20 buffer: sn-buf +: sn$ ( -- adr len ) sn-buf count ; + +: try-scan-sn ( -- gotit? ) + sn-buf 1+ d# 20 accept ( n ) + d# 12 <> if + " Wrong length, try again" .problem + false exit + then + sn-buf 1+ " TSHC" comp if + " Must begin with TSHC, try again" .problem + false exit + then + sn-buf 2+ sn-buf 1+ d# 11 move \ Elide the T + d# 11 sn-buf c! + true +; + +: scan-sn ( -- ) + ." *****" + + begin + " Please Input Serial Number ......" .instructions + try-scan-sn + until +; + +: board#$ ( -- adr len ) + " B#" find-tag 0= abort" Missing B# tag !!!" + -null +; + +: get-sn-value ( --) + " SN" find-tag if + ?-null + else + abort" Missing SN tag !!!" + then + sn-buf place +; + +0 0 2value response$ + +: final-filename$ ( -- adr len ) sn$ " %s.txt" sprintf ; + +: check-err-msg ( adr len -- ) + begin dup while ( adr len ) + linefeed left-parse-string ( rem$ line$ ) + ?remove-cr ( rem$ line$ ) + [char] : left-parse-string ( rem$ value$ key$ ) + " ERR_MSG" $= if ( rem$ value$ ) + page show-fail + type ( rem$ ) + cr cr + ." Perss any key to power off!" + key drop cr cr + power-off + then ( rem$ value$ ) + 2drop ( rem$ ) + repeat ( rem$ ) + 2drop ( ) +; + +\ Send the board number as the request and return the response data +: final-tag-exchange ( -- ) + final-filename$ open-temp-file + sn$ " SN:" put-key+value + " Request" submit-file + " Response" get-response to response$ + response$ check-err-msg +; + +: show-result-screen ( -- ) + pass? if + clear-screen + ." PASS" cr cr + green-screen + else + ." FAIL" cr cr + set-tag-assy + red-screen + then +; + +: put-ka-tag ( value$ key$ -- ) + 2over 8 min ka-dir$ " %s%s" sprintf ( value$ key$ filename$ ) + $read-file if ( value$ key$ ) + ." ERROR: No KA tag file for " 2swap type cr ( key$ ) + true abort" KA file not found" ( key$ ) + 2drop ( ) + else ( value$ key$ file-data$ ) + 2swap ($add-tag) ( value$ ) + 2drop ( ) + then +; + +false value write-protect? + +: special-tag? ( value$ key$ -- true | value$ key$ false ) + 2dup " KA" $= if ( value$ key$ ) + put-ka-tag ( ) + true exit ( -- true ) + then ( value$ key$ ) + 2dup " WP" nocase-$= if ( value$ key$ ) + 2drop " 0" $= 0= to write-protect? ( ) + true exit ( -- true ) + then ( value$ key$ ) + 2dup " ak" nocase-$= if ( value$ key$ ) + 2drop " 0" $= 0= if ( ) + " " " ak" ($add-tag) ( ) + then ( ) + true exit ( -- true ) + then ( value$ key$ ) + false ( value$ key$ false ) +; +: put-tag ( value$ key$ -- ) + special-tag? if exit then + put-ascii-tag +; +: show-tag ( value$ -- ) + 2dup $tag-printable? if ?-null type else wrapped-cdump then +; +: do-tag-error ( -- ) + ." Problem with tag processing. Halting." cr + begin halt again +; +: handle-tag ( value$ key$ -- ) + 2dup ram-find-tag if ( value$ key$ old-value$ ) \ Tag already exists, check it + 2over " KA" $= 0= if ?-null then ( value$ key$ old-value$' ) + 2>r 2over 2r@ $= if ( value$ key$ r: old-value$' ) + 2drop 2drop 2r> 2drop ( ) + else ( value$ key$ r: old-value$' ) + type ." tag changed!" cr ( value$ r: old-value$' ) + ." Old: " 2r> show-tag cr ( value$ ) + ." New: " show-tag cr ( ) + do-tag-error + then + else ( value$ key$ ) \ New tag, add it + put-tag + then +; + +: replace-ka-value ( rem$ value$ key$ -- rem$ file-data$ key$ ) + 2swap 2dup 8 min ka-dir$ " %s%s" sprintf ( rem$ key$ value$ filename$ ) + $read-file if ( rem$ key$ value$ ) + ." ERROR: No KA tag file for " type cr ( rem$ key$ ) + true abort" KA file not found" ( rem$ key$ ) + 2drop ( rem$ ) + else ( rem$ key$ value$ file-data$ ) + 2swap 2drop ( rem$ key$ file-data$ ) + 2swap ( rem$ file-data$ key$ ) + then +; + +: parse-tags ( adr len -- ) + begin dup while ( adr len ) + linefeed left-parse-string ( rem$ line$ ) + ?remove-cr ( rem$ line$ ) + [char] : left-parse-string ( rem$ value$ key$ ) + dup 2 = if ( rem$ value$ key$ ) + \ catch value from http, if KA tag + 2dup " KA" $= if ( rem$ value$ key$ ) + replace-ka-value ( rem$ value$' key$ ) + then + handle-tag ( rem$ ) + else ( rem$ value$ key$ ) + 4drop ( rem$ ) + then ( rem$ ) + repeat ( adr len ) + 2drop ( ) +; + +: format-date ( s m h d m y -- adr len ) + push-decimal + >r >r >r >r >r >r + <# + [char] Z hold + r> u# u# drop + r> u# u# drop + r> u# u# drop + [char] T hold + r> u# u# drop + r> u# u# drop + r> u# u# u# u# + u#> + pop-base +; +: make-md-tag ( -- ) + time&date ( s m h d m y ) format-date " md" put-ascii-tag +; +: inject-tags ( -- ) + get-mfg-data + + " TS" ($delete-tag) + " MS" ($delete-tag) + " BD" ($delete-tag) + " NT" ($delete-tag) + " MD" ($delete-tag) + " Pr" ($delete-tag) + make-md-tag + + response$ parse-tags + + " TS" ($delete-tag) + " SHIP" " TS" put-ascii-tag + + flash-write-enable + (put-mfg-data) + \ Change "ww" to "wp" if we want security to be enabled + write-protect? if " wp" h# efffe write-spi-flash then + no-kbc-reboot + kbc-on +; + +d# 180 constant rtc-threshold \ yes, really. 3 minutes +0 value ntp-seconds +0 value rtc-seconds +: .clocks ( -- ) + ." RTC: " rtc-seconds unix-seconds> .date space .time ." UTC" cr + ." NTP: " ntp-seconds unix-seconds> .date space .time ." UTC" cr +; +: verify-rtc-date ( -- ) +\ XXX check RTC power lost bit + ." Getting time from NTP server .. " + begin ntp-timestamp while ." Retry " repeat ( d.timestamp ) + + ntp>time&date >unix-seconds to ntp-seconds + time&date >unix-seconds to rtc-seconds + ntp-seconds rtc-seconds - ( lost-seconds ) + dup rtc-threshold > if ( lost-seconds ) + page show-fail ( lost-seconds ) + ." Clock lost " .d ." seconds since SMT" cr ( ) + .clocks + stall + then ( lost-seconds ) + + abs dup rtc-threshold > if ( gained-seconds ) + page show-fail ( gained-seconds ) + ." Clock gained " .d ." seconds since SMT" cr ( ) + .clocks + stall + then + ." NTP and RTC clocks agree." cr +; + +: put-key:value ( value$ key$ -- ) " %s:%s" sprintf put-key-line ; + +: upload-tag ( data$ tag$ -- ) + 2dup " wp" $= if ( data$ tag$ ) + 4drop " 1" " WP" put-key:value ( ) + exit + then + 2dup " ww" $= if ( data$ tag$ ) + 4drop " 0" " WP" put-key:value ( ) + exit + then + 2dup " ak" $= if ( data$ tag$ ) + 4drop " 1" " ak" put-key:value ( ) + exit + then + 2dup " KA" $= if ( data$ tag$ ) + 4drop ( ) + exit + then + 2dup " SG" $= if ( data$ tag$ ) + 4drop ( ) + exit + then ( data$ tag$ ) + + 2swap ?-null 2swap ( data$' tag$ ) + put-key:value ( ) +; + +: upload-tags ( -- ) + mfg-data-top ( adr ) + begin another-tag? while ( adr' data$ tname-adr ) + 2 upload-tag ( adr ) + repeat ( adr ) + drop +; + +\ Upload the result data +: final-result ( -- ) + final-filename$ open-temp-file + upload-tags + pass? if " PASS" else " FAIL" then " RESULT=" put-key+value + " Handshake" submit-file +; + +: wait-connections ( -- ) + silent-probe-usb + wait-lan +; + +: my-cifs-connect ( adr -- ) + open-dev to cifs-ih + cifs-ih 0= abort" Cannot open SMB share" +; + +\ $rename gives "Unimplemented package interface procedure" on ext2 +: do-rename + 2>r 2dup 2r> $copy $delete +; + +: $safe-delete ( $name -- ) + 2dup $file-exists? if + 2dup $delete + then + 2drop +; + +: $copy! ( $src $dst -- ) + 2dup $file-exists? if + 2dup $delete + then + $copy1 +; + + +: finish-final-test ( -- ) + + " int:\runin\final.fth" $safe-delete + " int:\runin\repass.fth" 2dup $file-exists? if + " int:\runin\final.fth" $copy + else + 2drop + then + + wait-connections + + get-sn-value + + verify-rtc-date + + ." Getting final tags .. " + cifs-connect final-tag-exchange \ Note: no disconnect... + ." Done" cr + + inject-tags + + ." Submitting results .. " + final-result cifs-disconnect + ." Done" cr + + " int:\runin\repass.fth" $safe-delete + + \ need to delete target, due to #9957 + " int:\runin\final.fth.sav" $safe-delete + + " int:\runin\final.fth" " int:\runin\final.fth.sav" $rename +; + +\ Make the "wait for SD insertion" step highly visible +dev ext +warning @ warning off +: wait&clear ( -- error? ) wait-card? page ; +patch wait&clear wait-card? selftest +: selftest ( -- ) page show-pass selftest ; +warning ! +dend + +: fail-backup-file$ ( -- name$ ) + time&date format-date " int:\runin\fail-%s.log" sprintf +; +: fail-log-file$ ( -- name$ ) " int:\runin\fail.log" ; + +\ The operator can type this to reset the state to run +\ the Linux-based runin tests again. +: rerunin ( -- ) + " int:\runin\final.fth" $safe-delete + fail-log-file$ fail-backup-file$ do-rename +; + +: after-runin ( -- ) + fail-log-file$ $read-file 0= if ( adr len ) + page + show-fail + ." Type a key to see the failure log" + key drop cr cr + list + ." Type R to restart runin, any other key to power off " + key dup emit cr upc [char] R = if + ." Resetting state to restart runin." cr + ." The old failure log is in " fail-backup-file$ type cr + rerunin + else + power-off + then + else + autorun-mfg-tests + pass? if finish-final-test then + show-result-screen + then + + ." Type a key to power off" + key cr + power-off +; + +\ Override the display self test +dev /display + +warning @ warning off +: selftest ( -- error? ) + depth d# 16 < if false exit then + + .vertical-bars16 wait + hgradient + + confirm-selftest? +; +warning ! + +device-end + +." Starting final phase" cr +after-runin Deleted: cpu/x86/pc/olpc/via/runin.fth =================================================================== --- cpu/x86/pc/olpc/via/runin.fth 2010-01-28 02:44:36 UTC (rev 1715) +++ cpu/x86/pc/olpc/via/runin.fth 2010-01-28 13:59:56 UTC (rev 1716) @@ -1,465 +0,0 @@ -\ Post-runin boot script $Revision$ - -visible - -\ Location of the files containing KA tag data -: ka-dir$ ( -- adr len ) " http:\\10.1.0.1\ka\" ; - -: mfg-ntp-server ( -- name$ ) - " NT" find-tag if ?-null else " 10.1.0.1" then -; -' mfg-ntp-server to ntp-servers - -\ The Linux-based runin selftests put this file at int:\runin\olpc.fth -\ after they have finished. On the next reboot, OFW thus boots this -\ script instead of int:\boot\olpc.fth . This script either displays -\ the failure log (if int:\runin\fail.log is present) or modifies the -\ manufacturing data tags to cause the next boot to enter final test. - -d# 128 buffer: mb-buf : mb$ mb-buf count ; - -: get-mb-tags ( -- ) - " B#" find-tag if - ?-null - then - mb-buf place -; - -: set-tag-assy ( -- ) - get-mb-tags - - clear-mfg-buf - - " " " ww" put-ascii-tag - - " "(D3)" " SG" ($add-tag) - mb$ " B#" put-ascii-tag - " EN" " SS" put-ascii-tag - - " ASSY" " TS" put-ascii-tag - " cifs:\\Administrator:qmsswdl@10.0.0.2\OLPC_TM" " MS" put-ascii-tag - " u:\boot\olpc.fth net" " BD" put-ascii-tag - - flash-write-enable - (put-mfg-data) - no-kbc-reboot - kbc-on -; - -d# 20 buffer: sn-buf -: sn$ ( -- adr len ) sn-buf count ; - -: try-scan-sn ( -- gotit? ) - sn-buf 1+ d# 20 accept ( n ) - d# 12 <> if - " Wrong length, try again" .problem - false exit - then - sn-buf 1+ " TSHC" comp if - " Must begin with TSHC, try again" .problem - false exit - then - sn-buf 2+ sn-buf 1+ d# 11 move \ Elide the T - d# 11 sn-buf c! - true -; - -: scan-sn ( -- ) - ." *****" - - begin - " Please Input Serial Number ......" .instructions - try-scan-sn - until -; - -: board#$ ( -- adr len ) - " B#" find-tag 0= abort" Missing B# tag !!!" - -null -; - -: get-sn-value ( --) - " SN" find-tag if - ?-null - else - abort" Missing SN tag !!!" - then - sn-buf place -; - -0 0 2value response$ - -: final-filename$ ( -- adr len ) sn$ " %s.txt" sprintf ; - -: check-err-msg ( adr len -- ) - begin dup while ( adr len ) - linefeed left-parse-string ( rem$ line$ ) - ?remove-cr ( rem$ line$ ) - [char] : left-parse-string ( rem$ value$ key$ ) - " ERR_MSG" $= if ( rem$ value$ ) - page show-fail - type ( rem$ ) - cr cr - ." Perss any key to power off!" - key drop cr cr - power-off - then ( rem$ value$ ) - 2drop ( rem$ ) - repeat ( rem$ ) - 2drop ( ) -; - -\ Send the board number as the request and return the response data -: final-tag-exchange ( -- ) - final-filename$ open-temp-file - sn$ " SN:" put-key+value - " Request" submit-file - " Response" get-response to response$ - response$ check-err-msg -; - -: show-result-screen ( -- ) - pass? if - clear-screen - ." PASS" cr cr - green-screen - else - ." FAIL" cr cr - set-tag-assy - red-screen - then -; - -: put-ka-tag ( value$ key$ -- ) - 2over 8 min ka-dir$ " %s%s" sprintf ( value$ key$ filename$ ) - $read-file if ( value$ key$ ) - ." ERROR: No KA tag file for " 2swap type cr ( key$ ) - true abort" KA file not found" ( key$ ) - 2drop ( ) - else ( value$ key$ file-data$ ) - 2swap ($add-tag) ( value$ ) - 2drop ( ) - then -; - -false value write-protect? - -: special-tag? ( value$ key$ -- true | value$ key$ false ) - 2dup " KA" $= if ( value$ key$ ) - put-ka-tag ( ) - true exit ( -- true ) - then ( value$ key$ ) - 2dup " WP" nocase-$= if ( value$ key$ ) - 2drop " 0" $= 0= to write-protect? ( ) - true exit ( -- true ) - then ( value$ key$ ) - 2dup " ak" nocase-$= if ( value$ key$ ) - 2drop " 0" $= 0= if ( ) - " " " ak" ($add-tag) ( ) - then ( ) - true exit ( -- true ) - then ( value$ key$ ) - false ( value$ key$ false ) -; -: put-tag ( value$ key$ -- ) - special-tag? if exit then - put-ascii-tag -; -: show-tag ( value$ -- ) - 2dup $tag-printable? if ?-null type else wrapped-cdump then -; -: do-tag-error ( -- ) - ." Problem with tag processing. Halting." cr - begin halt again -; -: handle-tag ( value$ key$ -- ) - 2dup ram-find-tag if ( value$ key$ old-value$ ) \ Tag already exists, check it - 2over " KA" $= 0= if ?-null then ( value$ key$ old-value$' ) - 2>r 2over 2r@ $= if ( value$ key$ r: old-value$' ) - 2drop 2drop 2r> 2drop ( ) - else ( value$ key$ r: old-value$' ) - type ." tag changed!" cr ( value$ r: old-value$' ) - ." Old: " 2r> show-tag cr ( value$ ) - ." New: " show-tag cr ( ) - do-tag-error - then - else ( value$ key$ ) \ New tag, add it - put-tag - then -; - -: replace-ka-value ( rem$ value$ key$ -- rem$ file-data$ key$ ) - 2swap 2dup 8 min ka-dir$ " %s%s" sprintf ( rem$ key$ value$ filename$ ) - $read-file if ( rem$ key$ value$ ) - ." ERROR: No KA tag file for " type cr ( rem$ key$ ) - true abort" KA file not found" ( rem$ key$ ) - 2drop ( rem$ ) - else ( rem$ key$ value$ file-data$ ) - 2swap 2drop ( rem$ key$ file-data$ ) - 2swap ( rem$ file-data$ key$ ) - then -; - -: parse-tags ( adr len -- ) - begin dup while ( adr len ) - linefeed left-parse-string ( rem$ line$ ) - ?remove-cr ( rem$ line$ ) - [char] : left-parse-string ( rem$ value$ key$ ) - dup 2 = if ( rem$ value$ key$ ) - \ catch value from http, if KA tag - 2dup " KA" $= if ( rem$ value$ key$ ) - replace-ka-value ( rem$ value$' key$ ) - then - handle-tag ( rem$ ) - else ( rem$ value$ key$ ) - 4drop ( rem$ ) - then ( rem$ ) - repeat ( adr len ) - 2drop ( ) -; - -: format-date ( s m h d m y -- adr len ) - push-decimal - >r >r >r >r >r >r - <# - [char] Z hold - r> u# u# drop - r> u# u# drop - r> u# u# drop - [char] T hold - r> u# u# drop - r> u# u# drop - r> u# u# u# u# - u#> - pop-base -; -: make-md-tag ( -- ) - time&date ( s m h d m y ) format-date " md" put-ascii-tag -; -: inject-tags ( -- ) - get-mfg-data - - " TS" ($delete-tag) - " MS" ($delete-tag) - " BD" ($delete-tag) - " NT" ($delete-tag) - " MD" ($delete-tag) - " Pr" ($delete-tag) - make-md-tag - - response$ parse-tags - - " TS" ($delete-tag) - " SHIP" " TS" put-ascii-tag - - flash-write-enable - (put-mfg-data) - \ Change "ww" to "wp" if we want security to be enabled - write-protect? if " wp" h# efffe write-spi-flash then - no-kbc-reboot - kbc-on -; - -d# 180 constant rtc-threshold \ yes, really. 3 minutes -0 value ntp-seconds -0 value rtc-seconds -: .clocks ( -- ) - ." RTC: " rtc-seconds unix-seconds> .date space .time ." UTC" cr - ." NTP: " ntp-seconds unix-seconds> .date space .time ." UTC" cr -; -: verify-rtc-date ( -- ) -\ XXX check RTC power lost bit - ." Getting time from NTP server .. " - begin ntp-timestamp while ." Retry " repeat ( d.timestamp ) - - ntp>time&date >unix-seconds to ntp-seconds - time&date >unix-seconds to rtc-seconds - ntp-seconds rtc-seconds - ( lost-seconds ) - dup rtc-threshold > if ( lost-seconds ) - page show-fail ( lost-seconds ) - ." Clock lost " .d ." seconds since SMT" cr ( ) - .clocks - stall - then ( lost-seconds ) - - abs dup rtc-threshold > if ( gained-seconds ) - page show-fail ( gained-seconds ) - ." Clock gained " .d ." seconds since SMT" cr ( ) - .clocks - stall - then - ." NTP and RTC clocks agree." cr -; - -: put-key:value ( value$ key$ -- ) " %s:%s" sprintf put-key-line ; - -: upload-tag ( data$ tag$ -- ) - 2dup " wp" $= if ( data$ tag$ ) - 4drop " 1" " WP" put-key:value ( ) - exit - then - 2dup " ww" $= if ( data$ tag$ ) - 4drop " 0" " WP" put-key:value ( ) - exit - then - 2dup " ak" $= if ( data$ tag$ ) - 4drop " 1" " ak" put-key:value ( ) - exit - then - 2dup " KA" $= if ( data$ tag$ ) - 4drop ( ) - exit - then - 2dup " SG" $= if ( data$ tag$ ) - 4drop ( ) - exit - then ( data$ tag$ ) - - 2swap ?-null 2swap ( data$' tag$ ) - put-key:value ( ) -; - -: upload-tags ( -- ) - mfg-data-top ( adr ) - begin another-tag? while ( adr' data$ tname-adr ) - 2 upload-tag ( adr ) - repeat ( adr ) - drop -; - -\ Upload the result data -: final-result ( -- ) - final-filename$ open-temp-file - upload-tags - pass? if " PASS" else " FAIL" then " RESULT=" put-key+value - " Handshake" submit-file -; - -: wait-connections ( -- ) - silent-probe-usb - wait-lan -; - -: my-cifs-connect ( adr -- ) - open-dev to cifs-ih - cifs-ih 0= abort" Cannot open SMB share" -; - -\ $rename gives "Unimplemented package interface procedure" on ext2 -: do-rename - 2>r 2dup 2r> $copy $delete -; - -: $safe-delete ( $name -- ) - 2dup $file-exists? if - 2dup $delete - then - 2drop -; - -: $copy! ( $src $dst -- ) - 2dup $file-exists? if - 2dup $delete - then - $copy1 -; - - -: finish-final-test ( -- ) - - " int:\runin\final.fth" $safe-delete - " int:\runin\repass.fth" 2dup $file-exists? if - " int:\runin\final.fth" $copy - else - 2drop - then - - wait-connections - - get-sn-value - - verify-rtc-date - - ." Getting final tags .. " - cifs-connect final-tag-exchange \ Note: no disconnect... - ." Done" cr - - inject-tags - - ." Submitting results .. " - final-result cifs-disconnect - ." Done" cr - - " int:\runin\repass.fth" $safe-delete - - \ need to delete target, due to #9957 - " int:\runin\final.fth.sav" $safe-delete - - " int:\runin\final.fth" " int:\runin\final.fth.sav" $rename -; - -\ Make the "wait for SD insertion" step highly visible -dev ext -warning @ warning off -: wait&clear ( -- error? ) wait-card? page ; -patch wait&clear wait-card? selftest -: selftest ( -- ) page show-pass selftest ; -warning ! -dend - -: fail-backup-file$ ( -- name$ ) - time&date format-date " int:\runin\fail-%s.log" sprintf -; -: fail-log-file$ ( -- name$ ) " int:\runin\fail.log" ; - -\ The operator can type this to reset the state to run -\ the Linux-based runin tests again. -: rerunin ( -- ) - " int:\runin\final.fth" $safe-delete - fail-log-file$ fail-backup-file$ do-rename -; - -: after-runin ( -- ) - fail-log-file$ $read-file 0= if ( adr len ) - page - show-fail - ." Type a key to see the failure log" - key drop cr cr - list - ." Type R to restart runin, any other key to power off " - key dup emit cr upc [char] R = if - ." Resetting state to restart runin." cr - ." The old failure log is in " fail-backup-file$ type cr - rerunin - else - power-off - then - else - autorun-mfg-tests - pass? if finish-final-test then - show-result-screen - then - - ." Type a key to power off" - key cr - power-off -; - -\ Override the display self test -dev /display - -warning @ warning off -: selftest ( -- error? ) - depth d# 16 < if false exit then - - .vertical-bars16 wait - hgradient - - confirm-selftest? -; -warning ! - -device-end - -." Starting final phase" cr -after-runin

1 0

r1715 - cpu/x86/pc/olpc dev/usb2/device/net ofw/inet
by svn＠openfirmware.info 28 Jan '10

28 Jan '10

Author: wmb Date: 2010-01-28 03:44:36 +0100 (Thu, 28 Jan 2010) New Revision: 1715 Modified: cpu/x86/pc/olpc/nandcastui.fth dev/usb2/device/net/ax8817x.fth ofw/inet/ip.fth ofw/inet/netload.fth Log: Multicast improvements. Modified: cpu/x86/pc/olpc/nandcastui.fth =================================================================== --- cpu/x86/pc/olpc/nandcastui.fth 2010-01-27 06:21:04 UTC (rev 1714) +++ cpu/x86/pc/olpc/nandcastui.fth 2010-01-28 02:44:36 UTC (rev 1715) @@ -100,12 +100,18 @@ " boot rom:nb_rx ,,239.255.1.2" eval ; -: nb-rx +: nb-xx false to already-go? boot-as-call( " boot rom:nb_rx ,,239.255.1.2" eval )boot-as-call ; +: nb-rx + false to already-go? + boot-as-call( + " boot rom:nb_rx ,,0.0.0.1" eval + )boot-as-call +; : ucastnand false to already-go? " boot rom:nb_rx 10.20.0.16,,10.20.0.44" eval Modified: dev/usb2/device/net/ax8817x.fth =================================================================== --- dev/usb2/device/net/ax8817x.fth 2010-01-27 06:21:04 UTC (rev 1714) +++ dev/usb2/device/net/ax8817x.fth 2010-01-28 02:44:36 UTC (rev 1715) @@ -135,6 +135,12 @@ ax-mii-hw ; +8 buffer: multicast-filter + +: ax-multi-filter! ( -- ) + multicast-filter 8 0 0 h# 16 ax-control-set +; + : ax-init-mii ( -- ) ax-mii-sw \ ax88772? if @@ -233,7 +239,39 @@ ax-auto-neg-wait ; : ax-promiscuous ( -- ) rx-ctl@ 1 or rx-ctl! ; -: ax-set-multicast ( adr len -- ) 2drop rx-ctl@ 2 or rx-ctl! ; + +: crc32-le ( adr len crc0 -- crc1 ) + -rot bounds ?do ( crc ) + i c@ xor ( crc' ) + 8 0 do ( crc ) + dup 1 and 0<> h# edb88320 and ( crc poly ) + swap u2/ xor ( crc' ) + loop ( crc ) + loop ( crc ) +; + +\ index 000 001 010 011 100 101 110 111 +\ bitrev 000 100 010 110 001 101 011 111 +create bitrev3 0 c, 4 c, 2 c, 6 c, 1 c, 5 c, 3 c, 7 c, + +: add-multicast-address ( adr len -- ) + h# ffffffff crc32-le ( crc ) + \ The low 3 bits - reversed - are the byte index and + \ the next 3 bits - reversed - are the bit number + dup 3 rshift 7 and bitrev3 + c@ ( crc bit# ) + 1 swap lshift ( crc bitmask ) + swap 7 and bitrev3 + c@ ( bitmask byte# ) + multicast-filter + tuck ( adr bitmask adr ) + c@ or swap c! ( ) +; + +\ : ax-set-multicast ( adr len -- ) 2drop rx-ctl@ 2 or rx-ctl! ; +: ax-set-multicast ( adr len -- ) + multicast-filter 8 erase ( adr len ) + add-multicast-address ( ) + ax-multi-filter! ( ) + rx-ctl@ h# 10 or rx-ctl! +; : ax-stop-mac ( -- ) 0 rx-ctl! ; : ax-init-nic ( -- ) \ Per ax8817x_bind Modified: ofw/inet/ip.fth =================================================================== --- ofw/inet/ip.fth 2010-01-27 06:21:04 UTC (rev 1714) +++ ofw/inet/ip.fth 2010-01-28 02:44:36 UTC (rev 1715) @@ -84,6 +84,10 @@ swap unknown-ip-addr? or ( flag ) ; +: multicast-ip-addr? ( adr-buf -- flag ) + c@ h# f0 and h# e0 = +; + : netmask ( -- 'ip ) subnetmask unknown-ip-addr? if default-netmask else subnetmask then ; @@ -185,6 +189,8 @@ drop ip-length xw@ ip-version c@ h# f and /l* payload ; +0 instance value multicast-rx? + : ip-addr-match? ( -- flag ) \ If we know the server's IP address (e.g. the user specified one, or \ we chose one from a RARP or BOOTP reply, or we locked onto one that @@ -200,6 +206,10 @@ \ If we don't know our own IP address yet, we accept every IP packet my-ip-addr unknown-ip-addr? if true exit then + multicast-rx? if + ip-dest-addr multicast-ip-addr? if true exit then + then + \ Otherwise, we know our IP address, so we filter out packets addressed \ to other destinations. my-ip-addr ip-dest-addr ip= Modified: ofw/inet/netload.fth =================================================================== --- ofw/inet/netload.fth 2010-01-27 06:21:04 UTC (rev 1714) +++ ofw/inet/netload.fth 2010-01-28 02:44:36 UTC (rev 1715) @@ -434,24 +434,45 @@ ." Can't enable multicast reception in network driver" cr ; +: set-multicast-en-addr ( 'ip -- ) + " "(01 00 5e)" his-en-addr swap move ( 'ip ) + 1+ his-en-addr 3 + 3 move ( ) + his-en-addr 3 + c@ h# 7f and his-en-addr 3 + c! ( ) +; + : send-multicast ( -- ) server-ip-addr his-ip-addr copy-ip-addr - " "(01 00 5e)" his-en-addr swap move ( acf ) - his-ip-addr 1+ his-en-addr 3 + 3 move ( acf ) - his-en-addr 3 + c@ h# 7f and his-en-addr 3 + c! ( ) + his-ip-addr set-multicast-en-addr ; -: receive-multicast ( -- ) -\ server-ip-addr my-ip-addr copy-ip-addr +0 value igmp-packet +: send-igmp-v1-report ( 'ip -- ) + 8 allocate-ip to igmp-packet ( 'ip ) + 0 igmp-packet l! ( 'ip ) + h# 12 igmp-packet c! ( 'ip ) + dup igmp-packet 4 + copy-ip-addr ( 'ip ) + 0 igmp-packet 8 oc-checksum igmp-packet 2+ be-w! ( 'ip ) + + his-ip-addr copy-ip-addr \ Send to the group we are registering for + 1 ttl ! + igmp-packet 8 2 send-ip-packet + igmp-packet 8 free-ip + broadcast-ip-addr his-ip-addr copy-ip-addr \ Don't filter on the server IP address +; + +: join-multicast-group ( 'ip -- ) + dup set-multicast-en-addr ( 'ip ) + send-igmp-v1-report ( ) + true to multicast-rx? ( ) " set-multicast" my-parent ihandle>phandle find-method if ( acf ) - " "(01 00 5e)" his-en-addr swap move ( acf ) - my-ip-addr 1+ his-en-addr 3 + 3 move ( acf ) - his-en-addr 3 + c@ h# 7f and his-en-addr 3 + c! ( ) his-en-addr /e rot my-parent call-package ( ) exit then try-promiscuous ; +: receive-multicast ( 'ip -- ) + my-ip-addr join-multicast-group +; defer configured ' noop to configured : configure ( -- )

1 0

r1714 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 27 Jan '10

27 Jan '10

Author: rsmith Date: 2010-01-27 07:21:04 +0100 (Wed, 27 Jan 2010) New Revision: 1714 Modified: cpu/x86/pc/olpc/via/assy.fth Log: OLPC 1.5: Add >= firmware upgrade check to assy Modified: cpu/x86/pc/olpc/via/assy.fth =================================================================== --- cpu/x86/pc/olpc/via/assy.fth 2010-01-27 05:42:50 UTC (rev 1713) +++ cpu/x86/pc/olpc/via/assy.fth 2010-01-27 06:21:04 UTC (rev 1714) @@ -2,6 +2,14 @@ visible +\ Does a base 36 compare on the firmware versions +\ true if $2 <= $1 +: fw-$compare ( $1 $2 -- $2>$1 ) + base @ >r d# 36 base ! ( $1 $2 ) + $number if exit then ( $1 n2 ) + -rot $number if exit then ( n2 n1 ) + pop-base u<= +; \ If the firmware file is on a CIFS share on the factory server, it \ should be read-only so multiple clients can read it simultaneously. @@ -28,9 +36,11 @@ ; : ?update-firmware ( -- ) - update-firmware? 0= if exit then \ Exit if the existing firmware and the wanted firmware are the same - fw-version$ wanted-fw$ nocase-$= if exit then + fw-version$ wanted-fw$ fw-$compare if + fw-version$ type ." >= " wanted-fw$ type cr + ." Not updating fimware" cr exit + then ." Updating firmware to version " fw-version$ type cr d# 2000 ms ?enough-power

1 0

r1713 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 27 Jan '10

27 Jan '10

Author: wmb Date: 2010-01-27 06:42:50 +0100 (Wed, 27 Jan 2010) New Revision: 1713 Modified: cpu/x86/pc/olpc/via/mcnand-version.fth Log: Use new nandblaster_rx with overtemperature warning. Modified: cpu/x86/pc/olpc/via/mcnand-version.fth =================================================================== --- cpu/x86/pc/olpc/via/mcnand-version.fth 2010-01-27 05:41:54 UTC (rev 1712) +++ cpu/x86/pc/olpc/via/mcnand-version.fth 2010-01-27 05:42:50 UTC (rev 1713) @@ -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 4ead46ac3b8b2a52e20661c27f7c72a77b38a16b +macro: MCNAND_VERSION b8b1eb851bf6583a3fe83c073ecb8e6a682f4e18 \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD

1 0

r1712 - cpu/x86/pc
by svn＠openfirmware.info 27 Jan '10

27 Jan '10

Author: wmb Date: 2010-01-27 06:41:54 +0100 (Wed, 27 Jan 2010) New Revision: 1712 Modified: cpu/x86/pc/biosints.fth Log: biosints.fth - changed "sd" devalias to "int" and "ext". Modified: cpu/x86/pc/biosints.fth =================================================================== --- cpu/x86/pc/biosints.fth 2010-01-26 17:27:08 UTC (rev 1711) +++ cpu/x86/pc/biosints.fth 2010-01-27 05:41:54 UTC (rev 1712) @@ -1188,10 +1188,14 @@ to bios-ih bootable-cdrom? if bios-ih to bios-cdrom-ih - " sd:0" open-dev ?dup if + " int:0" open-dev ?dup if to bios-disk-ih else - ." Can't open SD device. Install from CD-ROM probably won't work." cr + " ext:0" open-dev ?dup if + to bios-disk-ih + else + ." Can't open SD device. Install from CD-ROM probably won't work." cr + then then h# 82 to bios-boot-dev# true exit @@ -1203,7 +1207,8 @@ " /usb/disk:0" mbr-bootable? if " /usb/disk:0" set-hd-boot true exit then - " sd:0" mbr-bootable? if " sd:0" set-hd-boot true exit then + " int:0" mbr-bootable? if " int:0" set-hd-boot true exit then + " ext:0" mbr-bootable? if " ext:0" set-hd-boot true exit then false ;

1 0

r1711 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 18:27:08 +0100 (Tue, 26 Jan 2010) New Revision: 1711 Modified: cpu/x86/pc/olpc/via/fw-version.fth Log: Q3A31 Modified: cpu/x86/pc/olpc/via/fw-version.fth =================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth 2010-01-26 17:21:58 UTC (rev 1710) +++ cpu/x86/pc/olpc/via/fw-version.fth 2010-01-26 17:27:08 UTC (rev 1711) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 30 +macro: FW_MINOR 31

1 0

r1709 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 18:21:23 +0100 (Tue, 26 Jan 2010) New Revision: 1709 Modified: cpu/x86/pc/olpc/via/fsupdate.fth Log: Release inflater memory at the end of fs-update . Modified: cpu/x86/pc/olpc/via/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth 2010-01-26 17:20:42 UTC (rev 1708) +++ cpu/x86/pc/olpc/via/fsupdate.fth 2010-01-26 17:21:23 UTC (rev 1709) @@ -86,6 +86,7 @@ " write-blocks-end" $call-nand ( error? ) " Write error" ?nand-abort \ #image-eblocks erase-gap + release-inflater fexit ;

1 0

r1708 - cpu/x86/pc/olpc/via dev
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 18:20:42 +0100 (Tue, 26 Jan 2010) New Revision: 1708 Modified: cpu/x86/pc/olpc/via/copynand.fth cpu/x86/pc/olpc/via/fw.bth dev/logdev.fth Log: Turn off console logging while display grid maps, to avoid consuming large amounts of memory with boring messages. Modified: cpu/x86/pc/olpc/via/copynand.fth =================================================================== --- cpu/x86/pc/olpc/via/copynand.fth 2010-01-26 09:04:11 UTC (rev 1707) +++ cpu/x86/pc/olpc/via/copynand.fth 2010-01-26 17:20:42 UTC (rev 1708) @@ -75,6 +75,7 @@ d# 26 constant status-line : gshow-init ( #eblocks -- ) + suspend-logging dup set-grid-scale cursor-off " erase-screen" $call-screen @@ -87,7 +88,7 @@ : gshow-strange ( eblock# -- ) strange-color show-state ; -: gshow-done ( -- ) cursor-on ; +: gshow-done ( -- ) cursor-on resume-logging ; : gshow-pending ( eblock# -- ) pending-color show-state ; Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2010-01-26 09:04:11 UTC (rev 1707) +++ cpu/x86/pc/olpc/via/fw.bth 2010-01-26 17:20:42 UTC (rev 1708) @@ -356,6 +356,8 @@ fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools +fload ${BP}/dev/logdev.fth + fload ${BP}/cpu/x86/pc/olpc/disptest.fth fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic @@ -511,8 +513,6 @@ fload ${BP}/cpu/x86/pc/olpc/via/drawboard.fth fload ${BP}/cpu/x86/pc/olpc/via/drawboardtop.fth -fload ${BP}/dev/logdev.fth - fload ${BP}/ofw/inet/sntp.fth : olpc-ntp-servers ( -- ) " DHCP time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" Modified: dev/logdev.fth =================================================================== --- dev/logdev.fth 2010-01-26 09:04:11 UTC (rev 1707) +++ dev/logdev.fth 2010-01-26 17:20:42 UTC (rev 1708) @@ -75,6 +75,8 @@ log-ih add-output then ; +: suspend-logging ( -- ) log-ih if log-ih remove-output then ; +: resume-logging ( -- ) log-ih if log-ih add-output then ; : stop-logging ( -- ) log-ih if log-ih remove-output

1 0

r1707 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Jan '10

26 Jan '10

Author: wmb Date: 2010-01-26 10:04:11 +0100 (Tue, 26 Jan 2010) New Revision: 1707 Modified: cpu/x86/pc/olpc/via/fw-version.fth Log: Q3A30 Modified: cpu/x86/pc/olpc/via/fw-version.fth =================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth 2010-01-26 09:03:28 UTC (rev 1706) +++ cpu/x86/pc/olpc/via/fw-version.fth 2010-01-26 09:04:11 UTC (rev 1707) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 29j +macro: FW_MINOR 30

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware January 2010