openfirmware December 2009

openfirmware@openfirmware.info

1 participants
114 discussions

r1551 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 08 Dec '09

08 Dec '09

Author: wmb Date: 2009-12-08 09:30:48 +0100 (Tue, 08 Dec 2009) New Revision: 1551 Modified: cpu/x86/pc/olpc/via/versions.fth Log: q3a19 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-12-08 08:29:20 UTC (rev 1550) +++ cpu/x86/pc/olpc/via/versions.fth 2009-12-08 08:30:48 UTC (rev 1551) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 18 +macro: FW_MINOR 19 \ The EC microcode -macro: EC_VERSION 1_9_15 +macro: EC_VERSION 1_9_16 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary @@ -23,7 +23,7 @@ \ macro: GET_WLAN cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686-9.70.7.p0.bin" sd8686.bin; cp "/c/Documents and Settings/Mitch Bradley/My Documents/OLPC/DiskImages/sd8686_helper.bin" sd8686_helper.bin \ The bios_verify image -macro: CRYPTO_VERSION 0.4 +macro: CRYPTO_VERSION 0.5 \ The multicast NAND updater code version \ Use a specific git commit ID for a formal release or "test" for development.

1 0

r1550 - dev/mmc/sdhci
by svn＠openfirmware.info 08 Dec '09

08 Dec '09

Author: wmb Date: 2009-12-08 09:29:20 +0100 (Tue, 08 Dec 2009) New Revision: 1550 Modified: dev/mmc/sdhci/sdhci.fth dev/mmc/sdhci/selftest.fth Log: Test for write protect switch in SD selftest. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2009-12-08 06:21:21 UTC (rev 1549) +++ dev/mmc/sdhci/sdhci.fth 2009-12-08 08:29:20 UTC (rev 1550) @@ -153,8 +153,11 @@ \ The debouncer takes about 300 ms to stabilize. : card-inserted? ( -- flag ) - present-state@ h# 40000 and h# 40000 = + present-state@ h# 30000 and h# 30000 = ; +: write-protected? ( -- flag ) + present-state@ h# 80000 and 0= +; : ?via-quirk ( -- ) \ This is a workaround for an odd problem with the Via Vx855 chip. @@ -314,8 +317,10 @@ ." SDHCI: Error: ISR = " swap u. ." ESR = " dup u. decode-esr +\ debug-me + card-clock-off + card-power-off ." Stopping" cr abort - \ debug-me ; : wait ( mask -- ) @@ -724,10 +729,10 @@ \ -1 means error, 1 means retry : power-up-sdio-card ( -- false | retry? true ) intstat-on - card-power-off d# 20 ms - card-power-on d# 40 ms \ This delay is just a guess (20 was barely too slow for a Via board) + card-power-off d# 50 ms + card-power-on d# 50 ms \ This delay is just a guess (20 was barely too slow for a Via board) card-inserted? 0= if card-power-off intstat-off false true exit then - card-clock-slow d# 10 ms \ This delay is just a guess + card-clock-slow d# 50 ms \ This delay is just a guess reset-card \ Cmd 0 false ; @@ -756,9 +761,15 @@ : attach-card ( -- okay? ) setup-host - power-up-card if ( retry? ) + ['] power-up-card catch if true true then if ( retry? ) \ The first try at powering up failed. if ( ) + ." Trying to reset data lines" cr + card-clock-off + card-power-off + d# 500 ms + setup-host + \ The card was detected, but didn't go to "powered up" state. \ Sometimes that can be fixed by power cycling, so we retry power-up-card if ( retry? ) @@ -798,7 +809,7 @@ intstat-on wait-write-done intstat-off card-clock-off card-power-off - unmap-regs +\ unmap-regs ; : attach-sdio-card ( -- okay? ) Modified: dev/mmc/sdhci/selftest.fth =================================================================== --- dev/mmc/sdhci/selftest.fth 2009-12-08 06:21:21 UTC (rev 1549) +++ dev/mmc/sdhci/selftest.fth 2009-12-08 08:29:20 UTC (rev 1550) @@ -28,28 +28,85 @@ ibuf obuf /block comp ; +: write-protected? ( -- ) " write-protected?" $call-parent ; + : (selftest) ( -- error? ) + write-protected? if ." SD card is locked" cr true exit then + sbuf 0 read-block if true exit then 0 h# 5a test-block if true exit then 0 h# a5 test-block if true exit then sbuf 0 write-block \ Restore original content ; +: $= ( $1 $2 -- flag ) + rot tuck <> if ( adr1 adr2 len1 ) + 3drop false exit + then ( adr1 adr2 len1 ) + comp 0= ( flag ) +; +: external? ( -- flag ) + " slot-name" get-my-property if + false + else + decode-string " external" $= + then +; +: .slot-name ( -- ) + " slot-name" get-my-property 0= if + decode-string type space 2drop + then + ." SD slot" +; +: card-present? ( -- ) " card-inserted?" $call-parent ; +: test-abort? ( -- flag ) + key? if key h# 1b = else false then +; +: wait-card? ( -- error? ) + card-present? if false exit then + diagnostic-mode? if + ." Please insert card in " .slot-name ." to continue test." cr + begin + d# 100 ms + test-abort? if ." Aborted" true exit then + card-present? until + ." Card insertion correctly detected." cr + d# 200 ms \ Settling time + false + else + ." No card in " .slot-name cr + true + then +; + +: wait-removal? ( -- error? ) + diagnostic-mode? 0= if false exit then + external? 0= if false exit then + + ." Please remove card from " .slot-name ." to continue test." cr + + begin + d# 100 ms + test-abort? if ." Aborted" true exit then + card-present? 0= until + ." Card removal correctly detected." cr + false +; + external : selftest ( -- error? ) set-unit - " card-inserted?" $call-parent 0= if - ." No card in " - " slot-name" get-my-property 0= if - decode-string type space 2drop - then - ." SD slot" cr - true exit - then - open 0= if ." Open sdmmc failed" cr true exit then + + wait-card? if true exit then + + open 0= if ." Open SD card failed" cr true exit then alloc-test-bufs - ['] (selftest) catch if true then - free-test-bufs - close + ['] (selftest) catch if true then ( error? ) + free-test-bufs ( error? ) + close ( error? ) + + if true exit then ( ) + + wait-removal? ( error? ) ; headers

1 0

r1549 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 08 Dec '09

08 Dec '09

Author: wmb Date: 2009-12-08 07:21:21 +0100 (Tue, 08 Dec 2009) New Revision: 1549 Added: cpu/x86/pc/olpc/via/factory.fth cpu/x86/pc/olpc/via/leds.fth cpu/x86/pc/olpc/via/switches.fth Log: More changes to support OLPC manufacturing tests. Added: cpu/x86/pc/olpc/via/factory.fth =================================================================== --- cpu/x86/pc/olpc/via/factory.fth (rev 0) +++ cpu/x86/pc/olpc/via/factory.fth 2009-12-08 06:21:21 UTC (rev 1549) @@ -0,0 +1,122 @@ +\ See license at end of file +purpose: Factory test mode definitions + +0 value test-station +: smt-test? ( -- ) test-station 1 = ; +: final-test? ( -- ) test-station 5 = ; +: decode-ts ( adr len -- station# ) + 2dup " SMT" $= if 2drop 1 exit then + 2dup " ASSY" $= if 2drop 2 exit then + 2dup " DL" $= if 2drop 3 exit then + 2dup " RUNIN" $= if 2drop 4 exit then + 2dup " FINAL" $= if 2drop 5 exit then + 2dup " SHIP" $= if 2drop 6 exit then + 2dup " FQA" $= if 2drop 7 exit then + ." Unknown value in TS tag" cr + 2drop 0 +; +: set-test-station ( -- ) + " TS" find-tag if ( adr len ) + ?-null ( name$ ) + decode-ts ( station# ) + else ( ) + ." Missing TS tag" cr + \ Missing TS tag is treated as not factory mode + 0 ( station# ) + then ( station# ) + to test-station +; + +: set-boot-device ( -- ) + " BD" find-tag if ( adr len ) + ?-null + to boot-device + then +; + +0 0 2value factory-server$ +: set-factory-server ( -- ) + " MS" find-tag if ( adr len ) + ?-null + to factory-server$ + then +; + +0 value cifs-ih +d# 256 buffer: tempname-buf +: tempname$ ( -- adr len ) tempname-buf count ; +: $call-cifs ( ?? -- ?? ) cifs-ih $call-method ; + +: cifs-write ( adr len -- ) " write" $call-cifs drop ; + +: cifs-connect ( -- ) + factory-server$ open-dev to cifs-ih + cifs-ih 0= abort" Cannot open SMB share" +; +: cifs-disconnect ( -- ) + cifs-ih if cifs-ih close-dev 0 to cifs-ih then +; + +: open-temp-file ( filename$ -- ) + tempname-buf place + + tempname$ " $create" $call-cifs abort" Cannot open temp file" + cifs-ih 0= abort" Can't open temp file on manufacturing server" +; + +: put-key-line ( $ -- ) cifs-write " "r"n" cifs-write ; +: put-key+value ( value$ key$ -- ) cifs-write put-key-line ; +: submit-file ( subdir$ -- ) + " flush" $call-cifs abort" CIFS flush failed" + " close-file" $call-cifs abort" CIFS close-file failed" + tempname$ 2swap " %s\\%s" sprintf ( new-name$ ) + tempname$ 2swap " $rename" $call-cifs abort" CIFS rename failed" +; +: get-response ( subdir$ -- adr len ) + tempname$ 2swap " %s\\%s" sprintf ( response-name$ ) + d# 10 0 do ( response-name$ ) + d# 1000 ms ( response-name$ ) + 2dup 0 " open-file" $call-cifs 0= if ( response-name$ ) + 2drop ( ) + " size" $call-cifs ( d.size ) + abort" Size is > 4 GB" ( size ) + dup alloc-mem swap ( adr len ) +\ 0. " seek" $call-cifs drop ( adr len ) + 2dup " read" $call-cifs ( adr len actual ) + over <> abort" CIFS read of response file filed" + unloop exit + then + loop ( response-name$ ) + 2drop ( ) + true abort" Server did not respond with 10 seconds" +; + +stand-init: + set-boot-device + set-test-station + set-factory-server +; + +\ LICENSE_BEGIN +\ Copyright (c) 2009 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/x86/pc/olpc/via/leds.fth =================================================================== --- cpu/x86/pc/olpc/via/leds.fth (rev 0) +++ cpu/x86/pc/olpc/via/leds.fth 2009-12-08 06:21:21 UTC (rev 1549) @@ -0,0 +1,43 @@ +\ See license at end of file +purpose: Driver/selftest for OLPC XO-1.5 LEDs + +0 0 " 0" " /" begin-package +" leds" device-name +: open ( -- okay? ) true ; +: close ( -- ) ; +: gpio-lo ( mask -- ) h# 4c acpi-l@ swap invert and h# 4c acpi-l! ; +: gpio-hi ( mask -- ) h# 4c acpi-l@ swap or h# 4c acpi-l! ; +: hdd-led-on ( -- ) h# 400000 gpio-lo ; +: hdd-led-off ( -- ) h# 400000 gpio-hi ; +: selftest ( -- ) + ." Flashing LEDs" cr + " /wlan" test-dev + d# 10 0 do hdd-led-on d# 100 ms hdd-led-off d# 100 ms loop + confirm-selftest? +; + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2009 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/x86/pc/olpc/via/switches.fth =================================================================== --- cpu/x86/pc/olpc/via/switches.fth (rev 0) +++ cpu/x86/pc/olpc/via/switches.fth 2009-12-08 06:21:21 UTC (rev 1549) @@ -0,0 +1,62 @@ +\ See license at end of file +purpose: Driver/selftest for OLPC lid and ebook switches + +0 0 " 0" " /" begin-package +" switches" device-name +: open ( -- okay? ) true ; +: close ( -- ) ; +: lid? ( -- flag ) h# 48 acpi-l@ h# 80 and 0= ; +: ebook? ( -- flag ) h# 48 acpi-l@ h# 200 and 0= ; + +: ?key-abort ( -- ) key? if key esc = abort" Aborted" then ; +: wait-not-lid ( -- ) + ." Deactivate lid switch" cr + begin ?key-abort lid? 0= until +; +: wait-lid ( -- ) + ." Activate lid switch" cr + begin ?key-abort lid? until +; +: wait-not-ebook ( -- ) + ." Deactivate ebook switch" cr + begin ?key-abort ebook? 0= until +; +: wait-ebook ( -- ) + ." Activate ebook switch" cr + begin ?key-abort ebook? until +; + +: all-switch-states ( -- ) + lid? if wait-not-lid else wait-lid then + ebook? if wait-not-ebook else wait-ebook then +; + +: selftest ( -- error? ) + ['] all-switch-states catch +; + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2009 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

r1548 - cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc dev/usb2/hcd dev/usb2/hcd/ehci ofw/inet
by svn＠openfirmware.info 08 Dec '09

08 Dec '09

Author: wmb Date: 2009-12-08 07:17:29 +0100 (Tue, 08 Dec 2009) New Revision: 1548 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/mfgtest.fth cpu/x86/pc/olpc/via/smttags.fth dev/olpc/confirm.fth dev/usb2/hcd/ehci/probe.fth dev/usb2/hcd/hcd.fth ofw/inet/dhcp.fth ofw/inet/ip.fth ofw/inet/sntp.fth Log: Suite of changes to support OLPC manufacturing tests. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2009-12-08 06:12:45 UTC (rev 1547) +++ cpu/x86/pc/olpc/fw.bth 2009-12-08 06:17:29 UTC (rev 1548) @@ -468,7 +468,7 @@ fload ${BP}/ofw/inet/sntp.fth : olpc-ntp-servers ( -- ) - " time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" + " DHCP time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" ; ' olpc-ntp-servers to ntp-servers : ntp-time&date ( -- s m h d m y ) Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-12-08 06:12:45 UTC (rev 1547) +++ cpu/x86/pc/olpc/via/fw.bth 2009-12-08 06:17:29 UTC (rev 1548) @@ -351,16 +351,9 @@ fload ${BP}/cpu/x86/pc/olpc/gui.fth fload ${BP}/cpu/x86/pc/olpc/via/suspend.fth \ Suspend/resume setup -0 value test-station -\ 0 - not in diag mode -\ 1 - smt -\ 2 - assembly -\ 3 - download -\ 4 - runin -\ 5 - final test -\ 6 - ship image download -: smt-test? ( -- ) test-station 1 = ; -: final-test? ( -- ) test-station 5 = ; +fload ${BP}/cpu/x86/pc/olpc/via/switches.fth \ Lid and ebook switches +fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs +fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic @@ -513,7 +506,7 @@ fload ${BP}/ofw/inet/sntp.fth : olpc-ntp-servers ( -- ) - " time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" + " DHCP time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" ; ' olpc-ntp-servers to ntp-servers : ntp-time&date ( -- s m h d m y ) @@ -652,7 +645,7 @@ no-page ?factory-mode - ?factory-boot-sequence +\ ?factory-boot-sequence disable-user-aborts console-start Modified: cpu/x86/pc/olpc/via/mfgtest.fth =================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth 2009-12-08 06:12:45 UTC (rev 1547) +++ cpu/x86/pc/olpc/via/mfgtest.fth 2009-12-08 06:17:29 UTC (rev 1548) @@ -66,6 +66,8 @@ icon: keyboard.icon rom:keyboard.565 icon: timer.icon rom:timer.565 icon: clock.icon rom:clock.565 +icon: ebook.icon rom:ebook.565 +icon: leds.icon rom:leds.565 : all-tests-passed ( -- ) restore-scroller @@ -97,7 +99,8 @@ : flash-item ( -- ) " /flash" mfg-test-dev ; : memory-item ( -- ) " /memory" mfg-test-dev ; : usb-item ( -- ) " /usb" mfg-test-dev ; -: sd-item ( -- ) " /sd/disk:0" mfg-test-dev ; +: int-sd-item ( -- ) " int:0" mfg-test-dev ; +: ext-sd-item ( -- ) " ext:0" mfg-test-dev ; : rtc-item ( -- ) " /rtc" mfg-test-dev ; : display-item ( -- ) " /display" mfg-test-dev ; : audio-item ( -- ) " /audio" mfg-test-dev ; @@ -106,6 +109,8 @@ : timer-item ( -- ) " /timer" mfg-test-dev ; : touchpad-item ( -- ) " /8042/mouse" mfg-test-dev ; : keyboard-item ( -- ) " /8042/keyboard" mfg-test-dev ; +: switch-item ( -- ) " /switches" mfg-test-dev ; +: leds-item ( -- ) " /leds" mfg-test-dev ; : mfgtest-menu ( -- ) clear-menu @@ -116,50 +121,56 @@ " Exit selftest mode." ['] quit-item quit.icon 0 3 install-icon - " CPU" - ['] cpu-item cpu.icon 1 0 install-icon +\ " CPU" +\ ['] cpu-item cpu.icon 1 0 install-icon " SPI Flash: Contains EC code, firmware, manufacturing data." - ['] flash-item spi.icon 1 1 install-icon + ['] flash-item spi.icon 1 0 install-icon " RAM chips" - ['] memory-item ram.icon 1 2 install-icon + ['] memory-item ram.icon 1 1 install-icon " Internal mass storage" - ['] sd-item sdcard.icon 1 3 install-icon + ['] int-sd-item sdcard.icon 1 2 install-icon " Plug-in SD card" - ['] sd-item sdcard.icon 1 4 install-icon + ['] ext-sd-item sdcard.icon 1 3 install-icon - " Battery" - ['] battery-item battery.icon 2 0 install-icon + " Wireless LAN" + ['] wlan-item wifi.icon 1 4 install-icon + " Display" + ['] display-item display.icon 2 0 install-icon + " Camera" ['] camera-item camera.icon 2 1 install-icon - " Wireless LAN" - ['] wlan-item wifi.icon 2 2 install-icon - " Audio: Speaker and microphone" - ['] audio-item audio.icon 2 3 install-icon + ['] audio-item audio.icon 2 2 install-icon - " Display" - ['] display-item display.icon 2 4 install-icon + " Battery" + ['] battery-item battery.icon 2 3 install-icon " RTC (Real-Time Clock)" - ['] rtc-item clock.icon 3 0 install-icon + ['] rtc-item clock.icon 2 4 install-icon " USB ports" - ['] usb-item usb.icon 3 1 install-icon + ['] usb-item usb.icon 3 0 install-icon \ These are last because they require user participation. \ The earlier tests are all included in automatic batch-mode. " Keyboard" - ['] keyboard-item keyboard.icon 3 2 install-icon + ['] keyboard-item keyboard.icon 3 1 install-icon " Touchpad" - ['] touchpad-item touchpad.icon 3 3 install-icon + ['] touchpad-item touchpad.icon 3 2 install-icon + + " LEDs" + ['] leds-item leds.icon 3 3 install-icon + + " Switches" + ['] switch-item ebook.icon 3 4 install-icon ; ' mfgtest-menu to root-menu Modified: cpu/x86/pc/olpc/via/smttags.fth =================================================================== --- cpu/x86/pc/olpc/via/smttags.fth 2009-12-08 06:12:45 UTC (rev 1547) +++ cpu/x86/pc/olpc/via/smttags.fth 2009-12-08 06:17:29 UTC (rev 1548) @@ -2,142 +2,123 @@ \ visible -\ Needs: -\ sharename$ ( -- adr len ) CIFS URL of share and credentials, e.g.: -\ " cifs:\\user:password@192.168.0.1\myshare" - -[ifndef] $read-file -\ Read entire file into allocated memory -: $read-file ( filename$ -- true | data$ false ) - open-dev ?dup 0= if true exit then >r ( r: ih ) - " size" r@ $call-method drop ( len r: ih ) - dup alloc-mem swap ( adr len r: ih ) - 2dup " read" r@ $call-method ( adr len actual r: ih ) - r> close-dev ( adr len actual ) - over <> if ( adr len ) - free-mem true exit - then ( adr len ) - false +\ This is for testing, until we get the MS tag injected into the final image +[ifdef] factory-server$ +: set-server ( -- ) + factory-server$ nip 0= if + " cifs:\\bekins:bekind2@10.60.0.2\nb2_fvs" to factory-server$ + then ; [then] +: .instructions ( adr len -- ) + cr blue-letters type black-letters cr +; +: .problem ( adr len -- ) + red-letters type black-letters cr +; + d# 20 buffer: bn-buf \ Buffer for scanned-in board number string -0 value bn-acquired? \ True if we have the board number +: scanned-board#$ ( -- adr len ) bn-buf count ; -\ Get a board number from the user and validate it -: try-get-bn ( -- ) - bn-buf 1+ d# 20 accept ( n ) - dup bn-buf c! ( n ) - d# 14 <> if - red-letters ." Wrong length, try again" black-letters cr - exit - then - bn-buf 1+ " Q" comp if - red-letters ." Must begin with Q, try again" black-letters cr - exit - then - true to bn-acquired? +: accept-to-buf ( buf len -- actual ) + over 1+ swap accept ( buf actual ) + tuck swap c! ( actual ) ; \ Get a board number from the user, retrying until valid \ Usually the number is entered with a barcode scanner -: scanned-board#$ ( -- adr len ) - bn-acquired? if bn-buf count exit then +: get-board# ( -- ) ." *****" - begin - blue-letters ." Please Input Board Number ......" black-letters - cr cr cr + " Please Input Board Number ......" .instructions + bn-buf d# 20 accept-to-buf ( n ) + d# 14 <> if + " Wrong length, try again" .problem + else + bn-buf 1+ c@ [char] Q = if exit then + " Must begin with Q, try again" .problem + then + again +; - try-get-bn - bn-acquired? until +d# 20 buffer: station#-buf +: station#$ ( -- adr len ) station#-buf count ; \ e.g. 01 - bn-buf count -; +: get-station# ( -- ) + ." *****" + begin + " Please Input Station Number ......" .instructions -\ Construct the filename used for communicating with the server -\ We make an 8.3 name from the last 11 characters of the board number -d# 12 buffer: filename-buf -: smt-filename$ ( -- ) - scanned-board#$ drop 3 + filename-buf 1 + 8 move - [char] . filename-buf 8 + c! - scanned-board#$ drop d# 11 + filename-buf 9 + 3 move - d# 12 filename-buf c! - filename-buf count + station#-buf d# 20 accept-to-buf ( n ) + d# 2 <> if + " Wrong length, try again" .problem + else + station#$ push-decimal $number pop-base if ( ) + " Must be a number, try again" .problem + else ( n ) + drop exit + then + then + again ; -0 value cifs-ih -d# 256 buffer: tempname-buf -: tempname$ ( -- adr len ) tempname-buf count ; -: $call-cifs ( ?? -- ?? ) cifs-ih $call-method ; +d# 20 buffer: opid-buf +: opid$ ( -- adr len ) opid-buf count ; \ e.g. A001 -: cifs-write ( adr len -- ) " write" $call-cifs ; - -: cifs-connect ( -- ) - sharename$ open-dev to cifs-ih - cifs-ih 0= abort" Cannot open SMB share" +\ Get and validate an operator ID +: get-opid ( -- ) + ." *****" + begin + " Please Operator ID ......" .instructions + opid-buf d# 20 accept-to-buf ( n ) + d# 4 <> if + " Wrong length, try again" .problem + else + opid-buf 1+ c@ [char] A = if exit then + " Must begin with A, try again" .problem + then + again ; -: cifs-disconnect ( -- ) - cifs-ih if cifs-ih close-dev 0 to cifs-ih then -; -: open-temp-file ( filename$ -- ) - tempname-buf place - - tempname$ " $create" $call-cifs abort" Cannot open temp file" - cifs-ih 0= abort" Can't open temp file on manufacturing server" +\ Construct the filename used for communicating with the server +d# 20 buffer: filename-buf +: smt-filename$ ( -- ) filename-buf count ; +: set-filename ( -- ) + scanned-board#$ filename-buf place + " .txt" filename-buf $cat ; -: put-key ( value$ key$ -- ) - cifs-write cifs-write " "r"n" cifs-write +: get-info ( -- ) + get-board# + set-filename + get-station# + get-opid ; -: submit-file ( subdir$ -- ) - " flush" $call-cifs abort" CIFS flush failed" - " close-file" $call-cifs abort" CIFS close-file failed" - tempname$ 2swap " %s\\%s" sprintf ( new-name$ ) - tempname$ 2swap " $rename" $call-cifs abort" CIFS rename failed" -; -: get-response ( subdir$ -- adr len ) - tempname$ 2swap " %s\\%s" sprintf ( response-name$ ) - d# 10 0 do ( response-name$ ) - d# 1000 ms ( response-name$ ) - 2dup 0 open-file 0= if ( response-name$ ) - 2drop ( ) - " size" $call-cifs ( d.size ) - abort" Size is > 4 GB" ( size ) - dup alloc-mem swap ( adr len ) - 2dup " read" $call-cifs ( adr len actual ) - over <> abort" CIFS read of response file filed" - unloop exit - then - loop ( response-name$ ) - 2drop ( ) - true abort" Server did not respond with 10 seconds" -; \ Upload the result data : smt-result ( pass? -- adr len ) smt-filename$ open-temp-file - if " PASS" else " FAIL" then " RESULT=" put-key - " FVT" " PROCESS=" put-key - " " " STATION=" put-key - " " " OPID=" put-key - " " " GUID=" put-key - scanned-board#$ " MB_NUM=" put-key + if " PASS" else " FAIL" then " RESULT=" put-key+value + " PROCESS=FVT" put-key-line + " STATION=" put-key-line + " OPID=" put-key-line + " GUID=" put-key-line + scanned-board#$ " MB_NUM=" put-key+value " Result" submit-file ; \ Send the board number as the request and return the response data : smt-request$ ( -- adr len ) smt-filename$ open-temp-file - scanned-board#$ " MB_NUM=" put-key + scanned-board#$ " MB_NUM=" put-key+value + opid$ " OPID=" put-key+value + station#$ " STATION=" put-key+value " Request" submit-file " Response" get-response ; -: clear-mfg-buf ( -- ) - mfg-data-buf /flash-block h# ff fill -; +: clear-mfg-buf ( -- ) mfg-data-buf /flash-block h# ff fill ; : put-ascii-tag ( value$ key$ -- ) 2swap dup if add-null then 2swap ( value$' key$ ) @@ -151,58 +132,31 @@ flash-write-enable clear-mfg-buf ( ) +\ XXX propagate tag values from response - code in Notes/mfgtags.fth " " " ww" put-ascii-tag ( ) " EN" " SS" put-ascii-tag ( ) + " ASSY" " TS" put-ascii-tag ( ) + " C1" " SG" put-ascii-tag ( ) scanned-board#$ " B#" put-ascii-tag ( ) (put-mfg-data) ( ) \ check-tags no-kbc-reboot - flash-write-disable + kbc-on false ; \ Perform the exchange with the manufacturing server : smt-tag-exchange ( -- error? ) - smt-request$ $read-file dup if exit then ( adr len ) - 2>r 2r@ parse-smt-response ( r: adr len ) - 2r> free-mem + smt-request$ ( adr len ) + 2>r 2r@ parse-smt-response ( error? r: adr len ) + 2r> free-mem ( error? ) ; -0 0 " 0" " /" begin-package -" gpios" device-name -: open ( -- okay? ) true ; -: close ( -- ) ; -: gpio-lo ( mask -- ) h# 4c acpi-l@ swap invert and h# 4c acpi-l! ; -: gpio-hi ( mask -- ) h# 4c acpi-l@ swap or h# 4c acpi-l! ; -: wlan-led-on ( -- ) h# 200000 gpio-lo ; -: wlan-led-off ( -- ) h# 200000 gpio-hi ; -: hdd-led-on ( -- ) h# 400000 gpio-lo ; -: hdd-led-off ( -- ) h# 400000 gpio-hi ; -: selftest ( -- ) - ." Flashing LEDs" cr - - confirm-selftest? -; +d# 15 to #mfgtests -end-package - -: led-item ( -- ) " /leds" mfg-test-dev ; - - -\ XXX need a better icon -icon: led.icon rom:timer.565 - -: smt-test-menu ( -- ) - mfgtest-menu - " LEDs" - ['] led-item led.icon 3 4 install-icon -; -\ d# 15 to #mfgtests -\ ' smt-test-menu to root-menu - : smt-tests ( -- pass? ) 5 #mfgtests + 5 do i set-current-sq @@ -217,13 +171,83 @@ true ; +0 value usb-ih +: open-usb ( -- ) + " /usb:noprobe" open-dev to usb-ih + usb-ih 0= abort" Can't open USB!" +; +: close-usb ( -- ) usb-ih close-dev 0 to usb-ih ; +: silent-probe-usb ( -- ) + " /" ['] (probe-usb2) scan-subtree + " /" ['] (probe-usb1) scan-subtree + report-disk report-net report-keyboard +; +: usb-ports-changed? ( -- flag ) + open-usb + " ports-changed?" usb-ih $call-method ( changed? ) + close-usb +; + +: ?reprobe-usb ( -- ) usb-ports-changed? if silent-probe-usb then ; +: reprobe-usb ( -- ) + begin d# 100 ms usb-ports-changed? until + silent-probe-usb +; +: scanner? ( -- flag ) + " usb-keyboard" expand-alias if 2drop true else false then +; +: wait-scanner ( -- ) + begin scanner? 0= while ( ) + " Connect USB barcode scanner" .instructions + reprobe-usb + repeat + ; +: wired-lan? ( -- flag ) + " /usb/ethernet" locate-device if false else drop true then +; +: wait-lan ( -- ) + begin wired-lan? 0= while + " Connect USB Ethernet Adapter" .instructions + reprobe-usb + repeat +; +: usb-key? ( -- flag ) + " /usb/disk" locate-device if false else drop true then +; +: wait-usb-key ( -- ) + begin usb-key? 0= while + " Connect USB memory stick" .instructions + reprobe-usb + repeat +; +: wait-connections ( -- ) + ?reprobe-usb + wait-scanner + wait-lan + wait-usb-key +; + : do-smt-test ( -- ) - smt-tag-exchange - smt-tests smt-result + wait-connections + + ." Setting clock " ntp-set-clock ." Done" cr + + get-info + ." Connecting " cifs-connect ." Done" cr + + ." Writing mfg data tags " smt-tag-exchange ." Done" cr + + ['] true is (diagnostic-mode?) + " patch smt-tests play-item mfgtest-menu" evaluate + menu + ['] false is (diagnostic-mode?) + + ." Uploading test result " smt-result ." Done" cr + + cifs-disconnect ; \ patch do-smt-test play-item mfgtest-menu -\ patch smt-tests play-item mfgtest-menu true value once? : doit-once ( -- ) @@ -235,8 +259,3 @@ then ; patch doit-once do-key menu-interact - -' true to (diagnostic-mode?) -patch false diagnostic-mode? memory-test-suite - -\ menu Modified: dev/olpc/confirm.fth =================================================================== --- dev/olpc/confirm.fth 2009-12-08 06:12:45 UTC (rev 1547) +++ dev/olpc/confirm.fth 2009-12-08 06:17:29 UTC (rev 1548) @@ -2,8 +2,8 @@ : confirm-selftest? ( -- error? ) diagnostic-mode? if - ." Did the test pass (n for FAIL) ? " - key dup emit cr upc [char] N = + ." Did the test pass (n or ESC for FAIL) ? " + key dup emit cr upc dup [char] N = swap h# 1b = or else false then Modified: dev/usb2/hcd/ehci/probe.fth =================================================================== --- dev/usb2/hcd/ehci/probe.fth 2009-12-08 06:12:45 UTC (rev 1547) +++ dev/usb2/hcd/ehci/probe.fth 2009-12-08 06:17:29 UTC (rev 1548) @@ -72,6 +72,13 @@ external : power-usb-ports ( -- ) ; +: ports-changed? ( -- flag ) + #ports 0 ?do + i portsc@ 2 and if true unloop exit then + loop + false +; + : probe-root-hub ( -- ) \ Set active-package so device nodes can be added and removed my-self ihandle>phandle push-package Modified: dev/usb2/hcd/hcd.fth =================================================================== --- dev/usb2/hcd/hcd.fth 2009-12-08 06:12:45 UTC (rev 1547) +++ dev/usb2/hcd/hcd.fth 2009-12-08 06:17:29 UTC (rev 1548) @@ -23,6 +23,7 @@ 0 instance value target false value debug? +false instance value noprobe? \ Setup and descriptor DMA data buffers 0 value setup-buf \ SETUP packet buffer @@ -128,7 +129,14 @@ ; : parse-my-args ( -- ) - my-args " debug" $= if debug-on then + my-args + begin dup while + ascii , left-parse-string ( rem$' opt$ ) + 2dup " debug" $= if debug-on then + 2dup " noprobe" $= if true to noprobe? then + 2drop ( rem$ ) + repeat ( rem$ ) + 2drop ( ) ; headers Modified: ofw/inet/dhcp.fth =================================================================== --- ofw/inet/dhcp.fth 2009-12-08 06:12:45 UTC (rev 1547) +++ ofw/inet/dhcp.fth 2009-12-08 06:17:29 UTC (rev 1548) @@ -262,6 +262,7 @@ 0 file-name-buf c! unknown-ip-addr name-server-ip copy-ip-addr unknown-ip-addr dhcp-server-ip copy-ip-addr + unknown-ip-addr ntp-server-ip copy-ip-addr ; also forth definitions @@ -530,6 +531,7 @@ d# 28 find-option if drop broadcast-ip-addr copy-ip-addr then d# 15 find-option if 'domain-name place-cstr drop then d# 12 find-option if 'client-name place-cstr drop then + d# 42 find-option if drop ntp-server-ip copy-ip-addr then d# 43 find-option if parse-vendor 'vendor-options place-cstr drop then d# 17 find-option if 'root-path place-cstr drop then @@ -550,6 +552,9 @@ 'root-path c@ if indent indent ." Root path: " 'root-path cscount type cr then + ntp-server-ip known? if + indent indent ." NTP server: " ntp-server-ip .ipaddr cr + then 'vendor-options c@ if indent indent ." Vendor options: " 'vendor-options cscount type cr then Modified: ofw/inet/ip.fth =================================================================== --- ofw/inet/ip.fth 2009-12-08 06:12:45 UTC (rev 1547) +++ ofw/inet/ip.fth 2009-12-08 06:17:29 UTC (rev 1548) @@ -42,6 +42,7 @@ headers /i buffer: his-ip-addr /i buffer: name-server-ip +/i buffer: ntp-server-ip ' 'domain-name " domain-name" chosen-string headerless Modified: ofw/inet/sntp.fth =================================================================== --- ofw/inet/sntp.fth 2009-12-08 06:12:45 UTC (rev 1547) +++ ofw/inet/sntp.fth 2009-12-08 06:17:29 UTC (rev 1548) @@ -45,14 +45,24 @@ then d# 5,000 " set-timeout" $call-ip - " $set-host" $call-ip + + 2dup " DHCP" $= if ( hostname$ ) + 2drop " ntp-server-ip" $call-ip ( 'ipaddr ) + dup " known?" $call-ip 0= if ( 'ipaddr ) + drop ip-ih close-dev true exit + then ( 'ipaddr ) + " set-dest-ip" $call-ip ( ) + else ( hostname$ ) + " $set-host" $call-ip ( ) + then ( ) + send-sntp-request receive-sntp-reply ip-ih close-dev ; defer ntp-servers -: default-ntp-servers " 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" ; +: default-ntp-servers " DHCP 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" ; ' default-ntp-servers to ntp-servers : ntp-timestamp ( -- true | d.timestamp false )

1 0

r1547 - cpu/x86/pc/olpc
by svn＠openfirmware.info 08 Dec '09

08 Dec '09

Author: wmb Date: 2009-12-08 07:12:45 +0100 (Tue, 08 Dec 2009) New Revision: 1547 Modified: cpu/x86/pc/olpc/banner.fth Log: Added EC Firmware version to OLPC banner. Modified: cpu/x86/pc/olpc/banner.fth =================================================================== --- cpu/x86/pc/olpc/banner.fth 2009-12-07 14:11:06 UTC (rev 1546) +++ cpu/x86/pc/olpc/banner.fth 2009-12-08 06:12:45 UTC (rev 1547) @@ -10,14 +10,20 @@ \ pop-base \ This is the manufacturing signature [ifdef] rom-loaded - h# ffff.ffc0 h# 10 type cr + h# ffff.ffc0 h# 10 type [then] ; +: .ec + " ec-name" ['] root-node get-package-property 0= if ( adr len ) + get-encoded-string ." EC Firmware " type + then +; + : (xbanner-basics) ( -- ) ?spaces cpu-model type ." , " .memory ." , S/N " " SN" find-tag if type else ." Unknown" then cr - ?spaces .rom + ?spaces .rom ." " .ec cr ; ' (xbanner-basics) to banner-basics

1 0

r1546 - cpu/x86/pc/olpc/via dev/olpc/kb3700
by svn＠openfirmware.info 07 Dec '09

07 Dec '09

Author: rsmith Date: 2009-12-07 15:11:06 +0100 (Mon, 07 Dec 2009) New Revision: 1546 Modified: cpu/x86/pc/olpc/via/fw.bth dev/olpc/kb3700/battery.fth dev/olpc/kb3700/ecio.fth Log: Add several new battery debug words and the enable-serial word Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-12-06 22:52:21 UTC (rev 1545) +++ cpu/x86/pc/olpc/via/fw.bth 2009-12-07 14:11:06 UTC (rev 1546) @@ -732,6 +732,13 @@ warning ! previous previous definitions +: enable-serial ( -- ) + serial-enabled? if exit then + 40 8846 config-b! + " com1" open-dev add-input + " com1" open-dev add-output +; + tag-file @ fclose tag-file off .( --- Saving fw.dic ...) Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2009-12-06 22:52:21 UTC (rev 1545) +++ dev/olpc/kb3700/battery.fth 2009-12-07 14:11:06 UTC (rev 1546) @@ -6,10 +6,30 @@ : ec! wbsplit h# 381 pc! h# 382 pc! h# 383 pc! ; [then] +\ Names try to match the variable names in EC code +h# FA00 constant ec-rambase +h# 01 constant ec-pwr_limit +h# 09 constant ec-va2 +h# 20 constant ec-platformID + +h# FC00 constant ec-gpiobase +h# 00 constant ec-gpiofs00 +h# 12 constant ec-gpio-0A + +h# FE00 constant ec-pwmbase +h# 08 constant ec-pwmhigh2 +h# 09 constant ec-pwmhigh3 +h# 0A constant ec-pwmhigh4 + +h# F900 constant ec-batrambase +h# 15 constant ec-debugflag4 + +: ec-ram@ ec-rambase + ec@ ; : wextend ( w -- n ) dup h# 8000 and if h# ffff.0000 or then ; : rr ec@ . ; : ww ec! ; -: bat-b@ h# f900 + ec@ ; +: bat-b@ ec-batrambase + ec@ ; +: bat-b! ec-batrambase + ec! ; : bat-w@ dup 1+ bat-b@ swap bat-b@ bwjoin ; : eram-w@ h# f400 + dup 1+ ec@ swap ec@ bwjoin ; \ Base unit for temperature is 1/256 degrees C @@ -137,20 +157,17 @@ \ (stdout off) this will miss some state changes. \ -h# FA00 constant ec-rambase -h# 20 constant ec-platformID +: .mppt + ec-pwr_limit ec-ram@ ( pwr_limit ) + ec-rambase ec-va2 + ecw@ ( pwr_limit VA2 ) + ." VA2: " .d ." PWM: " . +; -h# FC00 constant ec-gpiobase -h# 00 constant ec-gpiofs00 -h# 12 constant ec-gpio-0A +: watch-mppt ( -- ) + begin (cr .mppt kill-line d# 500 ms key? until + key drop +; -h# FE00 constant ec-pwmbase -h# 08 constant ec-pwmhigh2 -h# 09 constant ec-pwmhigh3 -h# 0A constant ec-pwmhigh4 - -: ec-ram@ ec-rambase + ec@ ; - : next-bstate begin f780 ec@ tuck <> @@ -356,20 +373,36 @@ \ buffer for reading bank data h# 20 constant /ds-bank \ Bytes per bank in the battery sensor chip h# 60 constant /ds-eeprom \ Bytes in the eeprom + h# 01 constant ni-mh h# 02 constant li-fe h# 00 constant ds-regs h# 10 constant ds-acr + h# 20 constant ds-bank0 h# 25 constant ds-bat-misc-flag h# 2d constant ds-last-dis-soc h# 2e constant ds-last-dis-acr-msb h# 2f constant ds-last-dis-acr-lsb +h# 31 constant ds-default-status + h# 40 constant ds-bank1 +h# 5f constant ds-batid + h# 60 constant ds-bank2 +h# 60 constant ds_bat_serial_num_1 +h# 61 constant ds_bat_serial_num_2 +h# 62 constant ds_bat_serial_num_3 +h# 63 constant ds_bat_serial_num_4 +h# 64 constant ds_bat_serial_num_5 h# 68 constant ds-remain-acr-msb -h# 69 constant ds-remain-acr-lsb -h# 5f constant ds-batid +h# 69 constant ds-remain-acr-lsb +h# 6a constant ds_bat_charge_msb +h# 6b constant ds_bat_charge_lsb +h# 6c constant ds_bat_charge_soc +h# 6d constant ds_bat_discharge_msb +h# 6e constant ds_bat_discharge_lsb +h# 6f constant ds_bat_discharge_soc h# 01 constant ds-bat-low-volt h# 20 constant ds-bat-full @@ -515,6 +548,31 @@ r> base ! ; +: bat-set-default-status ( val -- ) + ds-bank0 1w-recall + ds-default-status 1w-write-start + 1w-write-byte + ds-bank0 1w-copy + 1w-reset +; + +: bat-get-default-status ( -- val ) + ds-bank0 1w-recall + ds-bank-buf 1 ds-default-status 1w-read + ds-bank-buf c@ ( pack info ) +; + +: bat-fix-error-2 + batman-init? + bat-get-default-status + dup h# 6a = + if ." Pack info is already correct" drop + else + ." Fixing bad pack info: " . + h# 6a bat-set-default-status + then +; + \ Retrieve the key battery stats in bulk and put it on the stack \ sign extending the values that are 2's complement. : bg-charge-info@ @@ -637,6 +695,23 @@ bg-V>V >sd.ddd type ; +0 value bg-last-acr +0 value bg-v_avg + +: bg-watch ( -- ) + bg-acr@ + begin + bg-charge-info@ + dup to bg-last-acr + ." ACR:" .bg-acr ." I:" .bg-current ." V:" .bg-volt + dup bg-last-acr swap - ." Chg:" .bg-acr + cr + 500 ms + key? + until + drop +; + : bat-debug begin bat-lfp-dataf@ @@ -660,9 +735,6 @@ ; -0 value bg-last-acr -0 value bg-v_avg - : bat-charge ( -- ) batman-init? bat-enable-charge @@ -680,6 +752,26 @@ bat-disable-charge ; +: bat-enable-ecdbg + ec-debugflag4 bat-b@ + h# 8 dup rot and or ec-debugflag4 bat-b! +; + +: bat-enable-ecdbg-short + ec-debugflag4 bat-b@ + h# 18 or ec-debugflag4 bat-b! +; + +: bat-disable-ecdbg + ec-debugflag4 bat-b@ + h# 18 invert and ec-debugflag4 bat-b! +; + +: bat-disable-ecdbg-short + ec-debugflag4 bat-b@ + h# 10 invert and ec-debugflag4 bat-b! +; + dev / new-device " battery" device-name Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2009-12-06 22:52:21 UTC (rev 1545) +++ dev/olpc/kb3700/ecio.fth 2009-12-07 14:11:06 UTC (rev 1546) @@ -20,9 +20,45 @@ iobase 3 + pc! ; +\ Read a word from an EC index +: ecw@ ( index -- data ) + dup ec@ 8 << swap ( msb index ) + 1+ ec@ or ( data ) +; + : kbc-debug-on ( -- ) 1 fbfe ec! ; : kbc-debug-off ( -- ) 0 fbfe ec! ; +: kbc-regs + ." KBCCB: " + fc80 ec@ dup . cr + dup 20 and ." Aux " if ." Dis" else ." Enb" then cr + 10 and ." Kbc " if ." Dis" else ." Enb" then cr + ." KBCIF: " + fc82 ec@ dup . cr + dup 2 and if ." OBF" cr then + 1 and if ." IBF" cr then + ." KBSTS: " + fc86 ec@ dup . cr + dup 2 and if ." IBF" cr then + 1 and if ." OBF" cr then + ." PS2PF: " + fee1 ec@ dup . cr + dup 8 and if ." Perr" cr then + dup 4 and if ." TxOut" cr then + dup 2 and if ." TxD" cr then + 1 and if ." RxD" cr then + fee2 ec@ + ." PS2CTRL: " . cr + f501 ec@ + ." SrvPS2: " . cr + 64 pc@ + ." p64: " . cr + 60 pc@ + ." p60: " . cr + +; + : ec-dump ( offset len -- ) ." Addr 0 1 2 3 4 5 6 7 8 9 a b c d e f" cr cr push-hex

1 0

r1545 - ofw/inet
by svn＠openfirmware.info 06 Dec '09

06 Dec '09

Author: wmb Date: 2009-12-06 23:52:21 +0100 (Sun, 06 Dec 2009) New Revision: 1545 Modified: ofw/inet/dhcp.fth Log: Added brief DHCP progress reports. Modified: ofw/inet/dhcp.fth =================================================================== --- ofw/inet/dhcp.fth 2009-12-06 14:05:53 UTC (rev 1544) +++ ofw/inet/dhcp.fth 2009-12-06 22:52:21 UTC (rev 1545) @@ -297,6 +297,8 @@ use-router? if indent indent ." BOOTP relay agent: " router-ip-addr .ipaddr cr then + else + ." got " my-ip-addr .ipaddr cr then ; @@ -366,6 +368,8 @@ bootnet-debug if indent ." DHCP Discover: requesting an IP address for " my-en-addr .enaddr cr + else + ." DHCP " then init-backoff @@ -374,7 +378,7 @@ \ Enter SELECTING state choose-response ( timeout? ) while ( ) - " Timeout" .dhcp-msg + bootnet-debug if " Timeout" .dhcp-msg else ." Retry " then \ If too many retries, go to INIT state too-many? if true exit then

1 0

r1544 - cpu/x86/pc/olpc dev/olpc/keyboard
by svn＠openfirmware.info 06 Dec '09

06 Dec '09

Author: wmb Date: 2009-12-06 15:05:53 +0100 (Sun, 06 Dec 2009) New Revision: 1544 Modified: cpu/x86/pc/olpc/gui.fth dev/olpc/keyboard/selftest.fth Log: Fixed a couple of dependencies that broke the XO-1 build. Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2009-12-06 14:04:38 UTC (rev 1543) +++ cpu/x86/pc/olpc/gui.fth 2009-12-06 14:05:53 UTC (rev 1544) @@ -459,6 +459,7 @@ background 0 0 screen-wh fill-rectangle " bigcheck" $show-centered ; +\needs color-reg h# f800 constant color-red : show-fail ( -- ) color-red 0 0 screen-wh fill-rectangle " bigx" $show-centered Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2009-12-06 14:04:38 UTC (rev 1543) +++ dev/olpc/keyboard/selftest.fth 2009-12-06 14:05:53 UTC (rev 1544) @@ -1,6 +1,9 @@ purpose: Interactive keyboard test shows which keys are pressed \ See license at end of file +\needs final-test? 0 value final-test? +\needs smt-test? 0 value smt-test? + dev /8042/keyboard hex

1 0

r1543 - in cpu/x86/pc: . olpc olpc/via
by svn＠openfirmware.info 06 Dec '09

06 Dec '09

Author: wmb Date: 2009-12-06 15:04:38 +0100 (Sun, 06 Dec 2009) New Revision: 1543 Added: cpu/x86/pc/olpc/xpsecure.fth Modified: cpu/x86/pc/biosints.fth cpu/x86/pc/linux.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/sba.fth cpu/x86/pc/olpc/security.fth cpu/x86/pc/olpc/via/fw.bth Log: Integrated XP secure boot into OLPC/Bitfrost security scheme. Modified: cpu/x86/pc/biosints.fth =================================================================== --- cpu/x86/pc/biosints.fth 2009-12-06 13:57:39 UTC (rev 1542) +++ cpu/x86/pc/biosints.fth 2009-12-06 14:04:38 UTC (rev 1543) @@ -1171,7 +1171,7 @@ bypass-bios-boot? if false exit then " ext:1" ntfs? if " ext:0" set-hd-boot - " sound-end" evaluate + " sound-end" evaluate true exit then Modified: cpu/x86/pc/linux.fth =================================================================== --- cpu/x86/pc/linux.fth 2009-12-06 13:57:39 UTC (rev 1542) +++ cpu/x86/pc/linux.fth 2009-12-06 14:04:38 UTC (rev 1543) @@ -191,7 +191,8 @@ ' ramdisk-buf " ramdisk" chosen-string defer load-ramdisk -: place-ramdisk ( adr len -- ) +defer place-ramdisk +: linux-place-ramdisk ( adr len -- ) to /ramdisk ( adr ) \ Move ramdisk to top of memory for new kernels. In principle, @@ -290,6 +291,7 @@ false to linux-loaded? init-program linux-loaded? if + ['] linux-place-ramdisk to place-ramdisk claim-params memory-limit to linux-memtop \ load-ramdisk may change this ['] load-ramdisk guarded Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2009-12-06 13:57:39 UTC (rev 1542) +++ cpu/x86/pc/olpc/fw.bth 2009-12-06 14:04:38 UTC (rev 1543) @@ -360,6 +360,7 @@ fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/security.fth +fload ${BP}/cpu/x86/pc/olpc/xpsecure.fth fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth [ifdef] wlan-wackup Modified: cpu/x86/pc/olpc/sba.fth =================================================================== --- cpu/x86/pc/olpc/sba.fth 2009-12-06 13:57:39 UTC (rev 1542) +++ cpu/x86/pc/olpc/sba.fth 2009-12-06 14:04:38 UTC (rev 1543) @@ -1,18 +1,20 @@ \ See license at end of file purpose: Subrange device to access Secure Boot Area between boot record and first partition +support-package: secure-boot-area + d# 512 constant /sector /sector instance buffer: sector-buf -0 instance 2value image-size -0 instance 2value seek-ptr +0. instance 2value image-size +0. instance 2value seek-ptr external \ Expose for the OLPC security scheme -0 instance 2value offset +0. instance 2value offset : clip-size ( adr len -- adr len' ) u>d seek-ptr d+ ( adr d.endptr ) - 2dup image-size d> if ( adr d.endptr ) + image-size 2over d< if ( adr d.endptr ) 2drop image-size ( adr d.endlimit ) then ( adr d.endlimit ) seek-ptr d- drop ( adr len' ) @@ -22,17 +24,18 @@ : ptable-adr ( -- start ) sector-buf h# 1be + ; : open ( -- flag ) + 0. " seek" $call-parent if false exit then sector-buf /sector " read" $call-parent /sector <> if false exit then sector-buf h# 1fe + le-w@ h# aa55 <> if false exit then \ FDisk? - ptable-adr 4 + c@ 7 <> if false exit then \ NTFS? - ptable-adr 8 + le-l@ /sector um* to image-size - h# 10 /sector um* to offset + ptable-adr 4 + c@ 7 <> if false exit then \ NTFS? + ptable-adr 8 + le-l@ 1- /sector um* to image-size \ The 1- skips sector 0 + /sector u>d to offset \ The SBA starts just after the Master Boot Record sector true ; external : seek ( d.offset -- status ) - 2dup image-size d> if 2drop true exit then \ Seek offset too big + image-size 2over d< if 2drop true exit then \ Seek offset too big to seek-ptr seek-ptr offset d+ " seek" $call-parent ; @@ -42,8 +45,8 @@ " read" $call-parent ( len' ) update-ptr ( len' ) ; +end-support-package - \ LICENSE_BEGIN \ Copyright (c) 2009 FirmWorks \ Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2009-12-06 13:57:39 UTC (rev 1542) +++ cpu/x86/pc/olpc/security.fth 2009-12-06 14:04:38 UTC (rev 1543) @@ -1071,7 +1071,7 @@ " dk" find-tag dup if nip nip then ; -: all-devices$ ( -- list$ ) " disk: ext: int:" ; +: all-devices$ ( -- list$ ) " sba: disk: ext: int:" ; : secure-startup ( -- ) in-factory? if Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-12-06 13:57:39 UTC (rev 1542) +++ cpu/x86/pc/olpc/via/fw.bth 2009-12-06 14:04:38 UTC (rev 1543) @@ -395,6 +395,7 @@ fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/via/sound.fth fload ${BP}/cpu/x86/pc/olpc/security.fth +fload ${BP}/cpu/x86/pc/olpc/xpsecure.fth fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth [ifdef] wlan-wackup Added: cpu/x86/pc/olpc/xpsecure.fth =================================================================== --- cpu/x86/pc/olpc/xpsecure.fth (rev 0) +++ cpu/x86/pc/olpc/xpsecure.fth 2009-12-06 14:04:38 UTC (rev 1543) @@ -0,0 +1,59 @@ +h# b00.0000 constant ramdisk-base + +\ Create a new device node implementing a ramdisk device, +\ supporting the usual block device interface methods. + +fload ${BP}/dev/ramdisk.fth +fload ${BP}/cpu/x86/pc/olpc/sba.fth + +devalias sba ext:0//secure-boot-area//zip-file-system + +0 value ramdisk-ih \ Instance handle for accessing ramdisk device + +\ Setup the ramdisk driver as the INT 13 data source, from the data at adr,len +: xpsecure-place-ramdisk ( adr len -- ) + " /ramdisk" open-dev to ramdisk-ih ( adr len ) + + \ Tell the ramdisk driver its actual size + dup u>d " set-size" ramdisk-ih $call-method ( adr len ) + + \ Copy in the data + ramdisk-base swap move ( ) + + \ Tell the BIOS INT 13 emulator code to use the ramdisk instead of the SD + ramdisk-ih to bios-disk-ih + h# 80 to bios-boot-dev# +; + +h# 20000 constant ntldr-base \ The address where NTLDR expects to be loaded + +false value ntldr-prepped? +: is-ntldr? ( adr len -- flag ) + h# 5000 < if drop false exit then + " NTLDR is corrupt" rot h# 5000 sindex -1 <> +; + +warning @ warning off +: execute-buffer ( -- ) + ntldr-prepped? if + \ set-mode3 \ Probably unnecessary as NTLDR does it internally + visible + init-regs ntldr-base rm-run \ Start NTLDR in real mode + then + execute-buffer +; + +: init-program ( -- ) + loaded is-ntldr? if + prep-rm \ Turn on BIOS emulation + loaded ntldr-base swap move \ Move NTLDR to its execution address + init-regs /rm-regs erase \ Setup the initial register values + bios-boot-dev# init-regs >rm-edx c! \ DL must contain the boot device ID + true to ntldr-prepped? \ Tell execute-buffer to execute NTLDR + ['] xpsecure-place-ramdisk to place-ramdisk \ Setup ramdisk preparation hook + ['] load-ramdisk guarded \ Run ramdisk loader + exit + then + init-program +; +warning !

1 0

r1542 - ofw/fs
by svn＠openfirmware.info 06 Dec '09

06 Dec '09

Author: wmb Date: 2009-12-06 14:57:39 +0100 (Sun, 06 Dec 2009) New Revision: 1542 Modified: ofw/fs/zipfs.fth Log: Fixed a bug in zipfs's handling of symlinks - it caused dir to hang. Modified: ofw/fs/zipfs.fth =================================================================== --- ofw/fs/zipfs.fth 2009-12-06 13:56:04 UTC (rev 1541) +++ ofw/fs/zipfs.fth 2009-12-06 13:57:39 UTC (rev 1542) @@ -45,6 +45,8 @@ 0 instance value name-len : zip-name$ ( -- adr len ) zip-name name-len ; +d# 512 instance buffer: saved-name + d# 512 instance buffer: path-prefix 0 instance value prefix-len : prefix$ ( -- adr len ) path-prefix prefix-len ; @@ -376,7 +378,7 @@ \ di-expansion be-l@ ( id s m h d m y size ) \ ?dup 0= if di-size be-l@ then ( id s m h d m y size ) zip-attrs ( id s m h d m y size attributes ) - zip-name$ ( id s m h d m y size attr name$ ) + zip-name$ saved-name $save ( id s m h d m y size attr name$ ) prefix-len /string ( id s m h d m y size attr name$' ) true ( id s m h d m y size attr name$ true ) exit

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware December 2009