December 2010 - openfirmware - mail.coreboot.org

[commit] r2066 - forth/lib
by repository service Dec. 7, 2010

Dec. 7, 2010

Author: wmb Date: Wed Dec 8 00:40:03 2010 New Revision: 2066 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2066 Log: Generic - fixed invalid assumption in dispose.fth - it assumed that allocated memory for the transient area was above the dictionary. Violation of the assumption caused end-module to crash. Modified: forth/lib/dispose.fth Modified: forth/lib/dispose.fth ============================================================================== --- forth/lib/dispose.fth Fri Dec 3 08:10:10 2010 (r2065) +++ forth/lib/dispose.fth Wed Dec 8 00:40:03 2010 (r2066) @@ -63,6 +63,16 @@ 0 value resboundary \ Lower boundary of region to dispose 0 value tranboundary +: transient-item? ( item -- transient? ) + tranboundary there within +; +: resident-item? ( item -- resident? ) + origin >link resboundary within +; +: safe-transient-item? ( item -- safe-transient? ) + transtart tranboundary within +; + \ relink removes transients from any linked list. It must be called \ with a known good first link, as it doesn't know how to reset \ the head of the list, which is usually a global variable. @@ -71,13 +81,13 @@ \ Skip over all consecutive words in the transient vocabulary dup begin ( prev-item this-item ) - item@ dup tranboundary >= ( prev-item next-item tran? ) + item@ dup transient-item? ( prev-item next-item tran? ) dup if over showit then 0= until ( prev-item next-kept-item ) \ Link the next non-transient word to the previous non-transient one - dup rot item! ( next-kept-item ) - dup resboundary < ( next-kept-item <resboundary? ) - over transtart >= ( next-kept-item <resboundary? safe-transient? ) + dup rot item! ( next-kept-item ) + dup resident-item? ( next-kept-item resident? ) + over safe-transient-item? ( next-kept-item resident? safe-transient? ) or until drop ; @@ -101,7 +111,7 @@ : relink-buffer:s ( -- ) ['] buf-link@ is item@ ['] buf-link! is item! ['] buffer:. is link. buffer-link begin \ Check for transient at head - link@ dup tranboundary >= + link@ dup transient-item? while dup showit >buffer-link repeat buffer-link link! @@ -116,7 +126,7 @@ : relink-voc-list ( -- ) ['] voc-link@ is item@ ['] voc-link! is item! ['] vocab. is link. voc-link begin \ Check for transient at head - link@ dup tranboundary >= + link@ dup transient-item? while dup showit >voc-link repeat voc-link link!

1 0

[commit] r2065 - dev/mmc/sdhci
by repository service Dec. 2, 2010

Dec. 2, 2010

Author: quozl Date: Fri Dec 3 08:10:10 2010 New Revision: 2065 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2065 Log: OLPC XO-1.5 - increase external SD card power-up off time for a 32 G class 10 SD card being tested. Modified: dev/mmc/sdhci/sdhci.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Fri Dec 3 07:55:12 2010 (r2064) +++ dev/mmc/sdhci/sdhci.fth Fri Dec 3 08:10:10 2010 (r2065) @@ -801,10 +801,16 @@ false to writing? ; +\ time to hold card power off to allow VCC_SD to discharge +\ 25ms required for XO-1.5 with external SanDisk 32 G class 10 SD card +\ 29ms required for XO-1.5 with external SanDisk 8 G class 4 SD card +\ 1ms should be required for XO-1.75 A2 (due to discharge clamps) +d# 40 value power-off-time + \ -1 means error, 1 means retry : power-up-card ( -- false | retry? true ) intstat-on - card-power-off d# 20 ms + card-power-off power-off-time ms card-power-on d# 40 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

1 0

[commit] r2064 - cpu/arm/olpc/1.75
by repository service Dec. 2, 2010

Dec. 2, 2010

Author: wmb Date: Fri Dec 3 07:55:12 2010 New Revision: 2064 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2064 Log: XO-1.75 - compile NANDblaster support into Forth dictionary (but NB object code is not yet in the build). Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Fri Dec 3 07:37:40 2010 (r2063) +++ cpu/arm/olpc/1.75/devices.fth Fri Dec 3 07:55:12 2010 (r2064) @@ -245,6 +245,8 @@ end-package +: wlan-reset ( -- ) d# 58 gpio-clr d# 20 ms d# 58 gpio-set ; + \ : usb-power-on ( -- ) 1 gpio-set ; : usb-power-on ( -- ) ; \ The EC controls the USB power : reset-usb-hub ( -- ) d# 146 gpio-set d# 10 ms d# 146 gpio-set ; Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Fri Dec 3 07:37:40 2010 (r2063) +++ cpu/arm/olpc/1.75/fw.bth Fri Dec 3 07:55:12 2010 (r2064) @@ -193,18 +193,15 @@ ; ' pre-setup-for-linux to linux-pre-hook -[ifdef] notyet +: show-temperature ( -- ) ; +: boot-as-call( ( -- ) ." Implement boot-as-call" cr ; +: )boot-as-call ( -- ) ; +\ fload ${BP}/cpu/x86/bootascall.fth create use-thinmac -fload ${BP}/cpu/x86/bootascall.fth fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth fload ${BP}/cpu/x86/pc/olpc/via/nbtx.fth fload ${BP}/cpu/x86/pc/olpc/via/nbrx.fth fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth -[else] -0 value nb-zd-#sectors -: nandblaster true abort" No nandblaster yet" ; -: show-temperature ; -[then] : hdd-led-off ( -- ) d# 10 gpio-clr ; : hdd-led-on ( -- ) d# 10 gpio-set ;

1 0

[commit] r2063 - dev/olpc/kb3700
by repository service Dec. 2, 2010

Dec. 2, 2010

Author: wmb Date: Fri Dec 3 07:37:40 2010 New Revision: 2063 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2063 Log: XO-1.75 - added battery status reporting (checkin an additional file). Modified: dev/olpc/kb3700/battery.fth Modified: dev/olpc/kb3700/battery.fth ============================================================================== --- dev/olpc/kb3700/battery.fth Fri Dec 3 07:35:59 2010 (r2062) +++ dev/olpc/kb3700/battery.fth Fri Dec 3 07:37:40 2010 (r2063) @@ -25,15 +25,12 @@ 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@ 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 -: >degrees-c 7 rshift 1+ 2/ ; \ Round to nearest degree \ : uvolt@ 0 bat-w@ d# 9760 d# 32 */ ; \ : cur@ 2 bat-w@ wextend d# 15625 d# 120 */ ; \ : pcb-temp 8 bat-w@ >degrees-c ; @@ -42,126 +39,6 @@ : bat-state h# 11 bat-b@ ; : bat-cause@ h# 70 bat-b@ ; -: uvolt@ bat-voltage@ d# 9760 d# 32 */ ; -: cur@ bat-current@ wextend d# 15625 d# 120 */ ; -: pcb-temp ambient-temp@ >degrees-c ; -: bat-temp bat-temp@ >degrees-c ; -: soc bat-soc@ ; - -string-array bat-causes -( 00) ," " -( 01) ," Bus Stuck at Zero" -( 02) ," Pack info" -( 03) ," NiMH Temp" -( 04) ," NiMH Over Voltage" -( 05) ," NiMH Over Current" -( 06) ," NiMH No voltage change during use" -( 07) ," " -( 08) ," NiMH Pre-charge fail" -( 09) ," No Battery ID" -( 0a) ," LiFe Over Voltage" -( 0b) ," LiFe Over Temp" -( 0c) ," LiFe No voltage change during use" -( 0d) ," " -( 0e) ," " -( 0f) ," " -( 10) ," ACR error" -( 11) ," NIMH 0xFF count" -( 12) ," FF count" -( 13) ," Voltage Invalid" -( 14) ," Bank 0 Invalid" -( 15) ," Bank 1 Invalid" -( 16) ," Bank 2 Invalid" -end-string-array - -: .bat-cause ( -- ) - bat-cause@ bat-causes count type cr -; - -: .bat-error .bat-cause ; - -string-array bat-states - ," no-battery " - ," charging-idle " - ," charging-normal " - ," charging-equalize " - ," charging-learning " - ," charging-temp-wait" - ," charging-full " - ," discharge " - ," abnormal: " - ," trickle " -end-string-array - -: .bat-type ( -- ) - bat-type@ dup 4 rshift case ( type ) - 0 of ." " endof - 1 of ." GPB " endof - 2 of ." BYD " endof - ." UnknownVendor " - endcase ( type ) - - h# 0f and case ( ) - 0 of ." " endof - 1 of ." NiMH " endof - 2 of ." LiFePO4 " endof - ." UnknownType " - endcase -; - -: .milli ( -- ) - push-decimal - dup abs d# 10,000 / <# u# u# [char] . hold u#s swap sign u#> type - pop-base -; - -: .mppt-active? - h# 3d ec-cmd-b@ h# d and - if ." MPPT" then -; - -\needs 2.d : 2.d ( n -- ) push-decimal <# u# u#s u#> type pop-base ; -: .% ( n -- ) 2.d ." %" ; -: .bat ( -- ) - bat-status@ ( stat ) - ." AC:" dup h# 10 and if ." on " else ." off " then ( stat ) - -\ PCB temp was nver really valid and was removed in Gen 1.5 -\ ." PCB: " pcb-temp 2.d ." C " - - dup h# 81 and if - ." Battery: " - .bat-type - soc .% ." " - uvolt@ .milli ." V " - cur@ .milli ." A " - bat-temp 2.d ." C " - dup 2 and if ." full " then - dup 4 and if ." low " then - dup 8 and if ." error " then - dup h# 20 and if ." charging " then - dup h# 40 and if ." discharging " then - dup h# 80 and if ." trickle " then - else - ." No battery " - then - drop - .mppt-active? -; - -: ?enough-power ( ) - bat-status@ ( stat ) - dup h# 10 and 0= abort" No external power" ( stat ) - dup 1 and 0= abort" No battery" ( stat ) - 4 and abort" Battery low" -; - -: watch-battery ( -- ) - begin (cr .bat kill-line d# 1000 ms key? until - key drop - bat-status@ 8 and if cr .bat-error then -; - \ A few commands for looking at what the EC is doing in \ the battery state machine. \ Unless you are on a serial console with stdout turned off @@ -795,131 +672,7 @@ h# 10 invert and ec-debugflag4 bat-b! ; -: mppt-off h# 40 ec-cmd ; -: mppt-on h# 41 ec-cmd ; -: mppt-pct 255 * 100 / h# 3f ec-cmd-b! ; - -: .mppt - h# 3e ec-cmd-b@ ( pwr_limit ) - h# 42 ec-cmd-b@ ( pwr_limit VA2 ) - ." Vsa: " d# 14927 * d# 158 / >sd.ddd type ." PWM: " . -; - -: watch-mppt ( -- ) - begin (cr .mppt kill-line d# 500 ms key? until - key drop -; - - -dev / -new-device -" battery" device-name -0 0 reg \ Needed so test-all will run the selftest - -\ Test that the battery is inserted and not broken. -: test-battery ( -- error? ) - bat-status@ h# 01 and 0= if - ." Insert battery to continue.. " - begin d# 100 ms bat-status@ h# 01 and until - cr - then - ." Testing battery status.. " - bat-status@ h# 04 and if - ." error: battery broken" cr - true - else - ." ok: " cr .bat cr - false - then -; - -: wait-no-ac ( -- error? ) - ." Disconnect AC power to continue.. " - begin - bat-status@ h# 10 and ( ac-connected? ) - while - d# 100 ms - - key? if - key h# 1b = if - ." ERROR: AC still connected" cr - true exit - then - then - repeat - cr - false -; - -\ Test that we can run without AC power. -: test-discharging ( -- error? ) - bat-status@ h# 10 and 0<> if - wait-no-ac if true exit then - then - ." Test running from battery.. " - d# 2000 ms - bat-status@ h# 40 and if - ." ok: battery discharging" cr - false - else - ." ERROR: battery not discharging" cr - true - then -; - -: wait-ac ( -- error? ) - ." Connect AC power to continue.. " - begin - bat-status@ h# 10 and 0= ( ac-disconnected? ) - while - d# 100 ms - - key? if - key h# 1b = if - ." ERROR: AC not connected" cr - true exit - then - then - repeat - cr - false -; - -: test-charging ( -- error? ) - bat-status@ h# 10 and 0= if - wait-ac if true exit then - then - ." Test running from AC.. " - d# 4000 ms - bat-status@ h# 40 and 0= if - ." ok: battery is not discharging" cr - false - else - ." ERROR: battery is discharging" cr - true - then -; - -: interactive-test ( -- error? ) - test-battery if true exit then - " test-station" $find if execute else 2drop 0 then ( station# ) - 1 <> if \ Skip this test in SMT - test-discharging if true exit then - then - test-charging if true exit then - false -; - -: selftest ( -- error? ) - diagnostic-mode? if - interactive-test - else - .bat false - then -; - -finish-device -device-end +fload ${BP}/dev/olpc/kb3700/batstat.fth \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

[commit] r2062 - cpu/arm/olpc/1.75 dev/olpc/kb3700
by repository service Dec. 2, 2010

Dec. 2, 2010

Author: wmb Date: Fri Dec 3 07:35:59 2010 New Revision: 2062 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2062 Log: XO-1.75 - added battery status reporting. Added: dev/olpc/kb3700/batstat.fth dev/olpc/kb3700/eccmdcom.fth Modified: cpu/arm/olpc/1.75/devices.fth dev/olpc/kb3700/eccmds.fth dev/olpc/kb3700/ecio.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Fri Dec 3 02:40:28 2010 (r2061) +++ cpu/arm/olpc/1.75/devices.fth Fri Dec 3 07:35:59 2010 (r2062) @@ -101,7 +101,6 @@ : ignore-power-button ; \ XXX implement me : ssp-spi-reprogrammed ; -: ?enough-power ( -- ) ; fload ${BP}/cpu/arm/mmp2/sspspi.fth \ Synchronous Serial Port SPI interface @@ -130,9 +129,9 @@ fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data fload ${BP}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree -[ifdef] notyet -fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports -[then] +fload ${BP}/dev/olpc/kb3700/eccmds.fth +fload ${BP}/dev/olpc/kb3700/batstat.fth \ Battery status reports +fload ${BP}/cpu/arm/olpc/1.75/boardrev.fth \ Board revision decoding false constant tethered? \ We only support reprogramming our own FLASH @@ -141,6 +140,8 @@ : ofw-fw-filename$ " disk:\boot\olpc.rom" ; ' ofw-fw-filename$ to fw-filename$ +fload ${BP}/cpu/arm/olpc/1.75/ecflash.fth + 0 0 " d420b000" " /" begin-package " display" name fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth @@ -228,10 +229,6 @@ devalias keyboard /ec-spi/keyboard -fload ${BP}/dev/olpc/kb3700/eccmds.fth -fload ${BP}/cpu/arm/olpc/1.75/ecflash.fth -fload ${BP}/cpu/arm/olpc/1.75/boardrev.fth \ Board revision decoding - 0 0 " d4208000" " /" begin-package \ USB Host Controller h# 200 constant /regs my-address my-space /regs reg Added: dev/olpc/kb3700/batstat.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/olpc/kb3700/batstat.fth Fri Dec 3 07:35:59 2010 (r2062) @@ -0,0 +1,253 @@ +: wextend ( w -- n ) dup h# 8000 and if h# ffff.0000 or then ; +\ Base unit for temperature is 1/256 degrees C +: >degrees-c 7 rshift 1+ 2/ ; \ Round to nearest degree +: uvolt@ bat-voltage@ d# 9760 d# 32 */ ; +: cur@ bat-current@ wextend d# 15625 d# 120 */ ; +: pcb-temp ambient-temp@ >degrees-c ; +: bat-temp bat-temp@ >degrees-c ; +: soc bat-soc@ ; + +string-array bat-causes +( 00) ," " +( 01) ," Bus Stuck at Zero" +( 02) ," Pack info" +( 03) ," NiMH Temp" +( 04) ," NiMH Over Voltage" +( 05) ," NiMH Over Current" +( 06) ," NiMH No voltage change during use" +( 07) ," " +( 08) ," NiMH Pre-charge fail" +( 09) ," No Battery ID" +( 0a) ," LiFe Over Voltage" +( 0b) ," LiFe Over Temp" +( 0c) ," LiFe No voltage change during use" +( 0d) ," " +( 0e) ," " +( 0f) ," " +( 10) ," ACR error" +( 11) ," NIMH 0xFF count" +( 12) ," FF count" +( 13) ," Voltage Invalid" +( 14) ," Bank 0 Invalid" +( 15) ," Bank 1 Invalid" +( 16) ," Bank 2 Invalid" +end-string-array + +: .bat-cause ( -- ) + bat-cause@ bat-causes count type cr +; + +: .bat-error .bat-cause ; + +string-array bat-states + ," no-battery " + ," charging-idle " + ," charging-normal " + ," charging-equalize " + ," charging-learning " + ," charging-temp-wait" + ," charging-full " + ," discharge " + ," abnormal: " + ," trickle " +end-string-array + +: .bat-type ( -- ) + bat-type@ dup 4 rshift case ( type ) + 0 of ." " endof + 1 of ." GPB " endof + 2 of ." BYD " endof + ." UnknownVendor " + endcase ( type ) + + h# 0f and case ( ) + 0 of ." " endof + 1 of ." NiMH " endof + 2 of ." LiFePO4 " endof + ." UnknownType " + endcase +; + +: .milli ( -- ) + push-decimal + dup abs d# 10,000 / <# u# u# [char] . hold u#s swap sign u#> type + pop-base +; + +: .mppt-active? + mppt-active@ h# d and + if ." MPPT" then +; + +\needs 2.d : 2.d ( n -- ) push-decimal <# u# u#s u#> type pop-base ; +: .% ( n -- ) 2.d ." %" ; +: .bat ( -- ) + bat-status@ ( stat ) + ." AC:" dup h# 10 and if ." on " else ." off " then ( stat ) + +\ PCB temp was nver really valid and was removed in Gen 1.5 +\ ." PCB: " pcb-temp 2.d ." C " + + dup h# 81 and if + ." Battery: " + .bat-type + soc .% ." " + uvolt@ .milli ." V " + cur@ .milli ." A " + bat-temp 2.d ." C " + dup 2 and if ." full " then + dup 4 and if ." low " then + dup 8 and if ." error " then + dup h# 20 and if ." charging " then + dup h# 40 and if ." discharging " then + dup h# 80 and if ." trickle " then + else + ." No battery " + then + drop + .mppt-active? +; + +: ?enough-power ( ) + bat-status@ ( stat ) + dup h# 10 and 0= abort" No external power" ( stat ) + dup 1 and 0= abort" No battery" ( stat ) + 4 and abort" Battery low" +; +: watch-battery ( -- ) + begin (cr .bat kill-line d# 1000 ms key? until + key drop + bat-status@ 8 and if cr .bat-error then +; + +[ifndef] >sd.ddd +: >sd.ddd ( n -- formatted ) + base @ >r decimal + dup abs <# u# u# u# [char] . hold u# u#s swap sign u#> + r> base ! +; +[then] + +: mppt-pct 255 * 100 / mppt-limit! ; + +: .mppt + mppt-limit@ ( pwr_limit ) + vin@ ( pwr_limit VA2 ) + ." Vsa: " d# 14927 * d# 158 / >sd.ddd type ." PWM: " . +; + +: watch-mppt ( -- ) + begin (cr .mppt kill-line d# 500 ms key? until + key drop +; + + +dev / +new-device +" battery" device-name +0 0 reg \ Needed so test-all will run the selftest + +\ Test that the battery is inserted and not broken. +: test-battery ( -- error? ) + bat-status@ h# 01 and 0= if + ." Insert battery to continue.. " + begin d# 100 ms bat-status@ h# 01 and until + cr + then + ." Testing battery status.. " + bat-status@ h# 04 and if + ." error: battery broken" cr + true + else + ." ok: " cr .bat cr + false + then +; + +: wait-no-ac ( -- error? ) + ." Disconnect AC power to continue.. " + begin + bat-status@ h# 10 and ( ac-connected? ) + while + d# 100 ms + + key? if + key h# 1b = if + ." ERROR: AC still connected" cr + true exit + then + then + repeat + cr + false +; + +\ Test that we can run without AC power. +: test-discharging ( -- error? ) + bat-status@ h# 10 and 0<> if + wait-no-ac if true exit then + then + ." Test running from battery.. " + d# 2000 ms + bat-status@ h# 40 and if + ." ok: battery discharging" cr + false + else + ." ERROR: battery not discharging" cr + true + then +; + +: wait-ac ( -- error? ) + ." Connect AC power to continue.. " + begin + bat-status@ h# 10 and 0= ( ac-disconnected? ) + while + d# 100 ms + + key? if + key h# 1b = if + ." ERROR: AC not connected" cr + true exit + then + then + repeat + cr + false +; + +: test-charging ( -- error? ) + bat-status@ h# 10 and 0= if + wait-ac if true exit then + then + ." Test running from AC.. " + d# 4000 ms + bat-status@ h# 40 and 0= if + ." ok: battery is not discharging" cr + false + else + ." ERROR: battery is discharging" cr + true + then +; + +: interactive-test ( -- error? ) + test-battery if true exit then + " test-station" $find if execute else 2drop 0 then ( station# ) + 1 <> if \ Skip this test in SMT + test-discharging if true exit then + then + test-charging if true exit then + false +; + +: selftest ( -- error? ) + diagnostic-mode? if + interactive-test + else + .bat false + then +; + +finish-device +device-end Added: dev/olpc/kb3700/eccmdcom.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/olpc/kb3700/eccmdcom.fth Fri Dec 3 07:35:59 2010 (r2062) @@ -0,0 +1,49 @@ +\ See license at end of file +purpose: EC commands that are the same for all XO versions + +: ec-api-ver@ ( -- b ) h# 08 ec-cmd-b@ ; +: bat-voltage@ ( -- w ) h# 10 ec-cmd-w@ ; +: bat-current@ ( -- w ) h# 11 ec-cmd-w@ ; +: bat-acr@ ( -- w ) h# 12 ec-cmd-w@ ; +: bat-temp@ ( -- w ) h# 13 ec-cmd-w@ ; +: ambient-temp@ ( -- w ) h# 14 ec-cmd-w@ ; +: bat-status@ ( -- b ) h# 15 ec-cmd-b@ ; +: bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; + +: ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; + +: reset-ec ( -- ) h# 28 ec-cmd ; + +: autowack-on ( -- ) 1 h# 33 ec-cmd-b! ; +: autowack-off ( -- ) 0 h# 33 ec-cmd-b! ; + +: mppt-active@ ( -- b ) h# 3d ec-cmd-b@ ; +: mppt-limit@ ( -- b ) h# 3e ec-cmd-b! ; +: mppt-limit! ( b -- ) h# 3f ec-cmd-b! ; +: mppt-off ( -- ) h# 40 ec-cmd ; +: mppt-on ( -- ) h# 41 ec-cmd ; +: vin@ ( -- b ) h# 42 ec-cmd-b@ ; + +\ LICENSE_BEGIN +\ Copyright (c) 2010 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 Modified: dev/olpc/kb3700/eccmds.fth ============================================================================== --- dev/olpc/kb3700/eccmds.fth Fri Dec 3 02:40:28 2010 (r2061) +++ dev/olpc/kb3700/eccmds.fth Fri Dec 3 07:35:59 2010 (r2062) @@ -24,14 +24,11 @@ : ec-cmd-w! ( w cmd -- ) >r wbsplit 2 0 r> do-ec-cmd ; : ec-cmd-l! ( l cmd -- ) >r lbsplit 4 0 r> do-ec-cmd ; -: ec-api-ver@ ( -- b ) h# 08 ec-cmd-b@ ; -: bat-voltage@ ( -- w ) h# 10 ec-cmd-w@ ; -: bat-current@ ( -- w ) h# 11 ec-cmd-w@ ; -: bat-acr@ ( -- w ) h# 12 ec-cmd-w@ ; -: bat-temp@ ( -- w ) h# 13 ec-cmd-w@ ; -: ambient-temp@ ( -- w ) h# 14 ec-cmd-w@ ; -: bat-status@ ( -- b ) h# 15 ec-cmd-b@ ; -: bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; +fload ${BP}/dev/olpc/kb3700/eccmdcom.fth \ Common commands + +\ Commands that are different for XO-1.75 +: board-id@ ( -- n ) h# 19 ec-cmd-w@ ; +: bat-cause@ ( -- b ) h# 1f ec-cmd-b@ ; : (bat-gauge-id@) ( -- sn0 .. sn7 ) 0 8 h# 17 do-ec-cmd ; : bat-gauge-id@ ( -- sn0 .. sn7 ) @@ -41,13 +38,11 @@ too-many-retries ; +: bat-type@ ( -- b ) h# 2c ec-cmd-b@ ; -: board-id@ ( -- n ) h# 19 ec-cmd-w@ ; -: reset-ec ( -- ) h# 28 ec-cmd ; +: ec-wackup ( ms -- ) lbsplit 4 0 h# 36 do-ec-cmd ; -: bat-type@ ( -- b ) h# 2c ec-cmd-b@ ; -: autowack-on ( -- ) 1 33 ec-cmd-b! ; -: autowack-off ( -- ) 0 33 ec-cmd-b! ; +: bat-gauge@ ( -- w ) h# 4e ec-cmd-w@ ; : cscount-max ( adr maxlen -- adr len ) dup 0 ?do ( adr maxlen ) @@ -61,8 +56,6 @@ d# 16 cscount-max ; -: bat-gauge@ ( -- w ) h# 4e ec-cmd-w@ ; - : ec-echo ( ... n -- ... ) dup h# 52 do-ec-cmd ; : ec-date$ ( -- adr len ) @@ -74,29 +67,17 @@ d# 16 cscount-max ; - -: mppt-active@ ( -- b ) h# 3d ec-cmd-b@ ; - -: bat-cause@ ( -- b ) h# 1f ec-cmd-b@ ; - -[ifdef] notdef -#define CMD_SET_EC_WAKEUP_TIMER 0x36 +[ifdef] notdef \ These commands are awaiting documentation on their interfaces #define CMD_READ_EXT_SCI_MASK 0x37 #define CMD_WRITE_EXT_SCI_MASK 0x38 #define CMD_CLEAR_EC_WAKEUP_TIMER 0x39 #define CMD_ENABLE_RUNIN_DISCHARGE 0x3B #define CMD_DISABLE_RUNIN_DISCHARGE 0x3C -#define CMD_READ_MPPT_LIMIT 0x3e -#define CMD_SET_MPPT_LIMIT 0x3f -#define CMD_DISABLE_MPPT 0x40 -#define CMD_ENABLE_MPPT 0x41 -#define CMD_READ_VIN 0x42 #define CMD_EXT_SCI_QUERY 0x43 #define CMD_READ_LOCATION 0x44 #define CMD_WRITE_LOCATION 0x45 #define RSP_KEYBOARD_DATA 0x48 #define RSP_TOUCHPAD_DATA 0x49 -#define CMD_GET_FW_VER 0x4a #define CMD_POWER_CYCLE 0x4b #define CMD_POWER_OFF 0x4c #define CMD_RESET_EC_SOFT 0x4d Modified: dev/olpc/kb3700/ecio.fth ============================================================================== --- dev/olpc/kb3700/ecio.fth Fri Dec 3 02:40:28 2010 (r2061) +++ dev/olpc/kb3700/ecio.fth Fri Dec 3 07:35:59 2010 (r2062) @@ -170,13 +170,12 @@ too-many-retries ; -: bat-voltage@ ( -- w ) h# 10 ec-cmd-w@ ; -: bat-current@ ( -- w ) h# 11 ec-cmd-w@ ; -: bat-acr@ ( -- w ) h# 12 ec-cmd-w@ ; -: bat-temp@ ( -- w ) h# 13 ec-cmd-w@ ; -: ambient-temp@ ( -- w ) h# 14 ec-cmd-w@ ; -: bat-status@ ( -- b ) h# 15 ec-cmd-b@ ; -: bat-soc@ ( -- b ) h# 16 ec-cmd-b@ ; +fload ${BP}/dev/olpc/kb3700/eccmdcom.fth + +\ Commands that are specific to XO-1 and XO-1.5 +: write-protect-fw ( -- ) 3 ec-cmd ; +: sci-queue@ ( -- b ) h# 84 ec-cmd-b@ ; + : (bat-gauge-id@) ( -- sn0 .. sn7 ) h# 17 ec-cmd-out 8 0 do ec-rb loop ; : bat-gauge-id@ ( -- sn0 .. sn7 ) #ec-retries 0 do @@ -184,22 +183,6 @@ loop too-many-retries ; -: (bat-gauge@) ( -- b ) h# 18 ec-cmd-out h# 31 ec-wb ec-rb ; \ 31 is the EEPROM address -: bat-gauge@ ( -- b ) - #ec-retries 0 do - ['] (bat-gauge@) catch 0= if unloop exit then - loop - too-many-retries -; - -: (bat-type@) ( -- b ) h# 18 ec-cmd-out h# 5f ec-wb ec-rb ; \ 5f is the EEPROM address -: bat-type@ ( -- b ) - #ec-retries 0 do - ['] (bat-type@) catch 0= if unloop exit then - loop - too-many-retries -; - : board-id@ ( -- b ) h# 19 ec-cmd-b@ ; : sci-source@ ( -- b ) h# 1a ec-cmd-b@ ; : sci-mask! ( b -- ) h# 1b ec-cmd-b! ; @@ -214,10 +197,6 @@ too-many-retries ; -: ec-wackup ( ms -- ) lbsplit h# 36 ec-cmd-out ec-wb ec-wb ec-wb ec-wb ; - -: ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; - : bat-init-nimh-gp ( -- ) h# 20 ec-cmd ; : bat-init-lifepo4-byd ( -- ) h# 21 ec-cmd ; : bat-init-lifepo4-gp ( -- ) h# 22 ec-cmd ; @@ -229,23 +208,34 @@ : dcon-power-off ( -- ) 0 h# 26 ec-cmd-b! ; : dcon-power-on ( -- ) 1 h# 26 ec-cmd-b! ; : reset-ec-warm ( -- ) h# 27 ec-cmd ; -: reset-ec ( -- ) h# 28 ec-cmd ; -: write-protect-fw ( -- ) 3 ec-cmd ; : ebook-mode? ( -- b ) h# 2a ec-cmd-b@ ; : wlan-freeze ( -- ) h# 35 ec-cmd ; -: sci-queue@ ( -- b ) h# 84 ec-cmd-b@ ; -: ec-api-ver@ ( -- b ) h# 08 ec-cmd-b@ ; -: sci-inhibit ( -- ) h# 32 ec-cmd ; -: sci-uninhibit ( -- ) h# 34 ec-cmd ; +: ec-wackup ( ms -- ) lbsplit h# 36 ec-cmd-out ec-wb ec-wb ec-wb ec-wb ; + -: mppt-active@ ( -- b ) h# 3d ec-cmd-b@ ; +: (bat-gauge@) ( -- b ) h# 18 ec-cmd-out h# 31 ec-wb ec-rb ; \ 31 is the EEPROM address +: bat-gauge@ ( -- b ) + #ec-retries 0 do + ['] (bat-gauge@) catch 0= if unloop exit then + loop + too-many-retries +; + +: (bat-type@) ( -- b ) h# 18 ec-cmd-out h# 5f ec-wb ec-rb ; \ 5f is the EEPROM address +: bat-type@ ( -- b ) + #ec-retries 0 do + ['] (bat-type@) catch 0= if unloop exit then + loop + too-many-retries +; -: autowack-on ( -- ) 1 33 ec-cmd-b! ; -: autowack-off ( -- ) 0 33 ec-cmd-b! ; : autowack-delay ( delay -- ) wbsplit f650 ec! f651 ec! ; : ec-indexed-io-off ( -- ) h# fe95 ec@ h# 40 invert and h# fe95 ec! ; +: sci-inhibit ( -- ) h# 32 ec-cmd ; +: sci-uninhibit ( -- ) h# 34 ec-cmd ; + 0 [if] \ EC mailbox access words

1 0

[commit] r2061 - dev/olpc/kb3700
by repository service Dec. 2, 2010

Dec. 2, 2010

Author: wmb Date: Fri Dec 3 02:40:28 2010 New Revision: 2061 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2061 Log: OLPC XO-1.75 - fixed typo in ec-cmd-b@ that was causing stack underflows with any command that used it. Modified: dev/olpc/kb3700/eccmds.fth Modified: dev/olpc/kb3700/eccmds.fth ============================================================================== --- dev/olpc/kb3700/eccmds.fth Thu Dec 2 03:11:27 2010 (r2060) +++ dev/olpc/kb3700/eccmds.fth Fri Dec 3 02:40:28 2010 (r2061) @@ -17,7 +17,7 @@ d# 10 constant #ec-retries : ec-cmd ( cmd -- ) 0 0 rot do-ec-cmd ; -: ec-cmd-b@ ( cmd -- w ) 0 1 rot do-ec-cmd bwjoin ; +: ec-cmd-b@ ( cmd -- b ) 0 1 rot do-ec-cmd ; : ec-cmd-w@ ( cmd -- w ) 0 2 rot do-ec-cmd bwjoin ; : ec-cmd-l@ ( cmd -- l ) 0 4 rot do-ec-cmd bljoin ; : ec-cmd-b! ( b cmd -- ) 1 0 rot do-ec-cmd ;

1 0

[commit] r2060 - cpu/arm/olpc/1.75
by repository service Dec. 1, 2010

Dec. 1, 2010

Author: wmb Date: Thu Dec 2 03:11:27 2010 New Revision: 2060 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2060 Log: Q4A06c Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Thu Dec 2 03:09:15 2010 (r2059) +++ cpu/arm/olpc/1.75/fw-version.fth Thu Dec 2 03:11:27 2010 (r2060) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 06a +macro: FW_MINOR 06c

1 0

[commit] r2059 - dev/via/spi
by repository service Dec. 1, 2010

Dec. 1, 2010

Author: wmb Date: Thu Dec 2 03:09:15 2010 New Revision: 2059 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2059 Log: OLPC XO-1.5 - fixed a bug in the SPI "cloning" code that lets you use an XO-1.5 board as an SPI programmer. Also added high-level versions of a couple of code words just for good measure. Modified: dev/via/spi/bbspi.fth Modified: dev/via/spi/bbspi.fth ============================================================================== --- dev/via/spi/bbspi.fth Thu Dec 2 03:07:34 2010 (r2058) +++ dev/via/spi/bbspi.fth Thu Dec 2 03:09:15 2010 (r2059) @@ -22,6 +22,7 @@ : bb-spi-cs-on ( -- ) gpo-port dup pc@ 8 invert and swap pc! ; : bb-spi-cs-off ( -- ) gpo-port dup pc@ 8 or swap pc! ; +[ifdef] 386-assembler code bb-spi-out ( b -- ) bx pop @@ -39,6 +40,8 @@ ax dx out bl bl add \ Shift left loopa + clk-mask do-mask + invert # ax and \ Clk low + ax dx out c; code bb-spi-in ( -- b ) @@ -66,9 +69,44 @@ bx inc then loopa + bp ax mov \ Base value + gpo-port # dx mov \ Out port + ax dx out \ CLK low bp pop bx push c; +[then] +[ifndef] bb-spi-in +: bb-spi-out ( b -- ) + gpo-port pl@ ( portval ) + clk-mask invert and ( portval' ) + do-mask invert and ( portval' ) + swap ( portval b ) + 8 0 do ( portval b ) + 2dup h# 80 and if ( portval b portval ) + do-mask or ( portval b portval' ) + then ( portval b portval ) + dup gpo-port pl! ( portval b portval ) \ CLK low with data + clk-mask or gpo-port pl! ( portval b ) \ CLK high with data + 2* ( portval b' ) + loop ( portval b ) + drop gpo-port pl! ( ) \ CLK low +; + +: bb-spi-in ( -- b ) + gpo-port pl@ ( portval ) + clk-mask invert and 0 ( portval b ) + 8 0 do ( portval b ) + over gpo-port pl! ( portval b ) \ CLK low + over clk-mask or gpo-port pl! ( portval b ) \ CLK high + 2* ( portval b' ) + gpi-port pl@ di-mask and if ( portval b ) + 1+ ( portval b' ) + then ( portval b ) + loop ( portval b ) + swap gpo-port pl! ( b ) \ CLK low +; +[then] : bb-spi-start ( -- ) ['] bb-spi-in to spi-in @@ -80,7 +118,7 @@ \ use-spi-flash-read \ Readback with SPI commands, not memory ops use-hw-spi-flash-read - gpo-port dup pc@ clk-mask invert and do-mask invert and cs-mask or swap pc! \ CLK, DO low, CS# high + gpo-port dup pl@ clk-mask invert and do-mask invert and cs-mask or swap pl! \ CLK, DO low, CS# high h# 88e4 config-b@ 2 or h# 88e4 config-b! ;

1 0

[commit] r2058 - dev/olpc/kb3700
by repository service Dec. 1, 2010

Dec. 1, 2010

Author: wmb Date: Thu Dec 2 03:07:34 2010 New Revision: 2058 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2058 Log: OLPC XO-1.75 - fixed a bug in the EC SPI protocol timeout handling. It was causing spurious timeouts which prematurely aborted flash-ec. Modified: dev/olpc/kb3700/spicmd.fth Modified: dev/olpc/kb3700/spicmd.fth ============================================================================== --- dev/olpc/kb3700/spicmd.fth Thu Dec 2 03:06:03 2010 (r2057) +++ dev/olpc/kb3700/spicmd.fth Thu Dec 2 03:07:34 2010 (r2058) @@ -179,13 +179,10 @@ 0 value cmd-time-limit : cmd-timeout? ( -- flag ) - cmd-time-limit 0= if false exit then get-msecs cmd-time-limit - 0>= ; -: cancel-cmd-timeout ( -- ) 0 to cmd-time-limit ; : set-cmd-timeout ( -- ) get-msecs d# 1000 + to cmd-time-limit - cmd-time-limit 0= if 1 to cmd-time-limit then \ Avoid reserved value ; defer do-state ' noop to do-state @@ -196,7 +193,6 @@ ['] upstream to do-state ; : command-done ( -- ) - cancel-cmd-timeout true to command-finished? sticky? 0= if enter-upstream-state

1 0

[commit] r2057 - dev/olpc/kb3700
by repository service Dec. 1, 2010

Dec. 1, 2010

Author: wmb Date: Thu Dec 2 03:06:03 2010 New Revision: 2057 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2057 Log: OLPC XO-1.75 - added ec-date$ and ec-user$ EC commands. Modified: dev/olpc/kb3700/eccmds.fth Modified: dev/olpc/kb3700/eccmds.fth ============================================================================== --- dev/olpc/kb3700/eccmds.fth Thu Dec 2 03:05:14 2010 (r2056) +++ dev/olpc/kb3700/eccmds.fth Thu Dec 2 03:06:03 2010 (r2057) @@ -65,6 +65,16 @@ : ec-echo ( ... n -- ... ) dup h# 52 do-ec-cmd ; +: ec-date$ ( -- adr len ) + 0 d# 16 h# 53 do-ec-cmd-buf ( adr ) + d# 16 cscount-max +; +: ec-user$ ( -- adr len ) + 0 d# 16 h# 54 do-ec-cmd-buf ( adr ) + d# 16 cscount-max +; + + : mppt-active@ ( -- b ) h# 3d ec-cmd-b@ ; : bat-cause@ ( -- b ) h# 1f ec-cmd-b@ ;

1 0