November 2010 - openfirmware - mail.coreboot.org

[commit] r2042 - cpu/arm/olpc/1.75
by repository service Nov. 25, 2010

Nov. 25, 2010

Author: wmb Date: Thu Nov 25 05:55:14 2010 New Revision: 2042 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2042 Log: OLPC XO-1.75 SD driver - tune data timing for 50 MHz operation. Modified: cpu/arm/olpc/1.75/sdregs.fth Modified: cpu/arm/olpc/1.75/sdregs.fth ============================================================================== --- cpu/arm/olpc/1.75/sdregs.fth Thu Nov 25 05:54:10 2010 (r2041) +++ cpu/arm/olpc/1.75/sdregs.fth Thu Nov 25 05:55:14 2010 (r2042) @@ -18,5 +18,8 @@ ; : vendor-modes ( -- ) ; -: ?cafe-fpga-quirk ( -- ) ; + +\ This tunes the data timing for better operation at 50 MHz +: ?cafe-fpga-quirk ( -- ) h# 10a chip + rw@ h# 3f00 or h# 10a chip + rw! ; + : ?via-quirk ( -- ) ;

1 0

[commit] r2041 - dev/olpc/dcon
by repository service Nov. 25, 2010

Nov. 25, 2010

Author: wmb Date: Thu Nov 25 05:54:10 2010 New Revision: 2041 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2041 Log: Fixed typo in previous checkin. Modified: dev/olpc/dcon/mmp2dcon.fth Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Thu Nov 25 05:53:28 2010 (r2040) +++ dev/olpc/dcon/mmp2dcon.fth Thu Nov 25 05:54:10 2010 (r2041) @@ -99,8 +99,8 @@ \ We got a false ack from the DCON so start over from LOAD state dcon-load d# 25 ms ( ) repeat ( ) - then [then] + then ; \ gx_configure_tft(info);

1 0

[commit] r2040 - dev/olpc/dcon
by repository service Nov. 25, 2010

Nov. 25, 2010

Author: wmb Date: Thu Nov 25 05:53:28 2010 New Revision: 2040 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2040 Log: OLPC XO-1.75 DCON driver - freeze is now a no-op because, lacking frame storage, it doesn't work on this hardware. Modified: dev/olpc/dcon/mmp2dcon.fth Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Thu Nov 25 03:40:12 2010 (r2039) +++ dev/olpc/dcon/mmp2dcon.fth Thu Nov 25 05:53:28 2010 (r2040) @@ -89,6 +89,7 @@ dcon-load \ Put the DCON in VGA-refreshed mode d# 25 ms \ Ensure that that DCON sees the DCONLOAD high \ display-on +[ifdef] notdef else begin ( ) dcon-unload \ Put the DCON in self-refresh mode @@ -99,6 +100,7 @@ dcon-load d# 25 ms ( ) repeat ( ) then +[then] ; \ gx_configure_tft(info);

1 0

[commit] r2039 - cpu/arm/olpc/1.75
by repository service Nov. 25, 2010

Nov. 25, 2010

Author: wmb Date: Thu Nov 25 03:40:12 2010 New Revision: 2039 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2039 Log: OLPC XO-1.75 boardrev.fth - initial revision Added: cpu/arm/olpc/1.75/boardrev.fth Added: cpu/arm/olpc/1.75/boardrev.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/boardrev.fth Thu Nov 25 03:40:12 2010 (r2039) @@ -0,0 +1,47 @@ +purpose: Determine the board revision based on hardware and EC info +\ See license at end of file + +0 value board-revision + +\ Constructs a string like "B4" or "preB4" or "postB4" +: model-name$ ( -- model$ ) + board-revision h# 10 /mod ( minor major ) + swap dup 8 = if ( major minor ) + drop " " ( major prefix$ ) + else ( major minor ) + 8 < if " pre" else " post" then ( major prefix$ ) + then ( major prefix$ ) + push-hex + rot <# u# u# u# drop hold$ 0 u#> ( adr len ) + pop-base + 2dup + 2- 2 upper ( model$ ) \ Upper case for base model +; + +stand-init: board revision + ['] board-id@ catch if 0 then + dup if h# 10 * 8 + then to board-revision +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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

[commit] r2038 - in cpu: arm arm/olpc/1.75 x86/pc/olpc
by repository service Nov. 25, 2010

Nov. 25, 2010

Author: wmb Date: Thu Nov 25 03:31:28 2010 New Revision: 2038 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2038 Log: OLPC XO-1.75 - (1) Startup sound now plays in the background for faster startup (2) Use 3.3V signals GPIO 97,98 for RTC (bitbanging instead of using the TWSI hardware) (3) Made the startup sequence more like the 1.5 version Modified: cpu/arm/forthint.fth cpu/arm/olpc/1.75/boardgpio.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/rtc.fth cpu/arm/olpc/1.75/sound.fth cpu/x86/pc/olpc/security.fth Modified: cpu/arm/forthint.fth ============================================================================== --- cpu/arm/forthint.fth Thu Nov 25 00:38:16 2010 (r2037) +++ cpu/arm/forthint.fth Thu Nov 25 03:31:28 2010 (r2038) @@ -145,7 +145,7 @@ interrupt-preamble 6 install-handler init-dispatcher [ previous ] - d# 10 set-tick-limit + d# 1 set-tick-limit enable-interrupts \ Turn interrupts on ; Modified: cpu/arm/olpc/1.75/boardgpio.fth ============================================================================== --- cpu/arm/olpc/1.75/boardgpio.fth Thu Nov 25 00:38:16 2010 (r2037) +++ cpu/arm/olpc/1.75/boardgpio.fth Thu Nov 25 03:31:28 2010 (r2038) @@ -23,6 +23,8 @@ d# 58 gpio-set \ WLAN_RESET# d# 58 gpio-dir-out \ WLAN_RESET# d# 73 gpio-dir-out \ CAM_RST + d# 97 gpio-dir-out \ RTC_SCK + d# 98 gpio-dir-out \ RTC_SDA d# 125 gpio-set d# 125 gpio-dir-out \ EC_SPI_ACK @@ -90,10 +92,10 @@ no-update, \ GPIO_50 - Not connected (TP114) no-update, \ GPIO_51 - Not connected (TP59) no-update, \ GPIO_52 - Not connected (TP113) - 2 af, \ GPIO_53 - RTC_SCK (TWSI2) if R124 populated - 2 af, \ GPIO_54 - RTC_SDA (TWSI2) if R125 populated -\ no-update, \ GPIO_53 - Not connected if nopop R124 to use TWSI6 for RTC -\ no-update, \ GPIO_54 - Not connected if nopop R125 to use TWSI6 for RTC +\ 2 af, \ GPIO_53 - RTC_SCK (TWSI2) if R124 populated +\ 2 af, \ GPIO_54 - RTC_SDA (TWSI2) if R125 populated + no-update, \ GPIO_53 - Not connected if nopop R124 to use TWSI6 for RTC + no-update, \ GPIO_54 - Not connected if nopop R125 to use TWSI6 for RTC no-update, \ GPIO_55 - Not connected (TP51) no-update, \ GPIO_56 - Not connected (TP60) 0 af, \ GPIO_57 - WLAN_PD# @@ -141,10 +143,12 @@ no-update, \ GPIO_96 - Not connected (TP112) - no-update, \ GPIO_97 - Not connected (R100 nopop) if we use TWSI2 for RTC - no-update, \ GPIO_98 - Not connected (R106 nopop) if we use TWSI2 for RTC +\ no-update, \ GPIO_97 - Not connected (R100 nopop) if we use TWSI2 for RTC +\ no-update, \ GPIO_98 - Not connected (R106 nopop) if we use TWSI2 for RTC \ 2 af, \ GPIO_97 - RTC_SCK (TWSI6) if R100 populated \ 2 af, \ GPIO_98 - RTC_SDA (TWSI6) if R106 populated + 0 af, \ GPIO_97 - RTC_SCK (bitbang) if R100 populated + 0 af, \ GPIO_98 - RTC_SDA (bitbang) if R106 populated 0 af, \ GPIO_99 - TOUCH_SCR_INT 0 af, \ GPIO_100 - DCONSTAT0 Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Thu Nov 25 00:38:16 2010 (r2037) +++ cpu/arm/olpc/1.75/fw.bth Thu Nov 25 03:31:28 2010 (r2038) @@ -167,8 +167,14 @@ : ec-indexed-io-off ( -- ) ; \ !!! : ec-ixio-reboot ( -- ) ; \ !!! : flash-base ( -- ) true abort" The stuff that relies on flash-base in security.fth needs to be reworked!" ; -: cmos@ ( index -- data ) h# 38 mod 8 + " rtc@" clock-node @ $call-method ; -: cmos! ( index data -- ) h# 38 mod 8 + " rtc!" clock-node @ $call-method ; +: cmos@ ( index -- data ) + h# 38 mod 8 + " rtc@" clock-node @ ( index adr len ih ) + ['] $call-method catch if 4drop 0 then +; +: cmos! ( data index -- ) + h# 38 mod 8 + " rtc!" clock-node @ ( data index adr len ih ) + ['] $call-method if 2drop 3drop then +; : halt ( -- ) c7-wfi ; fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/security.fth @@ -201,7 +207,7 @@ \needs ramdisk " " d# 128 config-string ramdisk " " ' boot-file set-config-string-default \ Let the boot script set the cmdline -2 config-int auto-boot-countdown +3 config-int auto-boot-countdown \ Eliminate 4 second delay in install console for the case where \ there is no keyboard. The delay is unnecessary because the screen @@ -227,7 +233,7 @@ : console-start ( -- ) install-mux-io -\ cursor-off + cursor-off true to text-on? " //null" open-dev to null-ih \ For text-off state @@ -244,9 +250,7 @@ warning on only forth also definitions - show-child install-alarm - ['] sound catch drop page-mode #line off @@ -254,6 +258,18 @@ \ .built cr ; + +: factory-test? ( -- flag ) + \ TS is the "test station" tag, whose value is set to "SHIP" at the + \ end of manufacturing test. + " TS" find-tag if ( adr len ) + ?-null " SHIP" $= 0= ( in-factory? ) + else ( ) + \ Missing TS tag is treated as not in factory test + false + then ( in-factory? ) +; + [ifdef] notyet : ?games ( -- ) rocker-right game-key? if @@ -289,26 +305,32 @@ : startup ( -- ) standalone? 0= if exit then -\ block-exceptions + block-exceptions no-page + ?factory-mode + + disable-user-aborts console-start [ifdef] notyet read-game-keys [then] -\ text-off + factory-test? if text-off then " probe-" do-drop-in + show-child + install-alarm + ['] sound catch drop [ifdef] notyet - sound ?games [then] ['] false to interrupt-auto-boot? [ifdef] probe-usb + factory-test? if d# 1000 ms then \ Extra USB probe delay in the factory probe-usb report-disk report-keyboard @@ -317,19 +339,31 @@ interpreter-init [ifdef] notyet - ?scan-nand ?diags +[ifdef] Later + ?scan-nand +[then] ?fs-update [then] -\ unblock-exceptions + factory-test? 0= if secure-startup then + unblock-exceptions ['] (interrupt-auto-boot?) to interrupt-auto-boot? -\ ?usb-keyboard +[ifdef] notyet + ?usb-keyboard +[then] auto-banner? if banner then auto-boot + frozen? text-on? 0= and ( no-banner? ) + unfreeze visible ( no-banner? ) + if banner then \ Reissue banner if it was suppressed + + blue-letters ." Type 'help' for more information." black-letters cr cr + enable-user-aborts + stop-sound quit ; Modified: cpu/arm/olpc/1.75/rtc.fth ============================================================================== --- cpu/arm/olpc/1.75/rtc.fth Thu Nov 25 00:38:16 2010 (r2037) +++ cpu/arm/olpc/1.75/rtc.fth Thu Nov 25 03:31:28 2010 (r2038) @@ -1,9 +1,13 @@ 0 0 " " " /" begin-package " rtc" name -: set-address ( -- ) h# d0 2 set-twsi-target ; -: rtc@ ( reg# -- byte ) set-address twsi-b@ ; -: rtc! ( byte reg# -- ) set-address twsi-b! ; +: set-address ( -- ) + d# 97 to smb-clock-gpio# + d# 98 to smb-data-gpio# + h# d0 to smb-slave +; +: rtc@ ( reg# -- byte ) set-address smb-byte@ ; +: rtc! ( byte reg# -- ) set-address smb-byte! ; headerless @@ -21,8 +25,8 @@ : >bcd ( binary -- bcd ) d# 10 /mod 4 << + ; : bcd-time&date ( -- s m h d m y century ) - 0 1 7 twsi-get ( s m h dow d m y ) - 3 roll drop ( s m h dow d m y ) + 7 0 smb-read-n ( s m h dow d m y ) + 3 roll drop ( s m h dow d m y ) d# 20 ; : bcd! ( n offset -- ) swap >bcd swap rtc! ; Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Thu Nov 25 00:38:16 2010 (r2037) +++ cpu/arm/olpc/1.75/sound.fth Thu Nov 25 03:31:28 2010 (r2038) @@ -123,7 +123,7 @@ : set-descriptor ( next dest source length adr -- ) >r r@ l! r@ la1+ l! r@ 2 la+ l! r> 3 la+ l! ; -: make-out-ring ( adr len -- ) +: make-out-ring ( -- ) out-desc h# 10 + sspa-base h# 80 + out-bufs /audio-buf out-desc set-descriptor out-desc sspa-base h# 80 + out-bufs /audio-buf + /audio-buf out-desc h# 10 + set-descriptor out-desc h# 30 adma! \ Link to first descriptor @@ -133,7 +133,9 @@ 1 h# 80 adma! \ Enable DMA completion interrupts h# 0081.3020 h# 40 adma! \ 16 bits, pack, fetch next, enable, chain, hold dest, inc src ; -: make-in-ring ( adr len -- ) +: stop-out-ring ( -- ) h# 100000 h# 40 adma! ; + +: make-in-ring ( -- ) in-desc h# 10 + in-bufs sspa-base /audio-buf in-desc set-descriptor in-desc in-bufs /audio-buf + sspa-base /audio-buf in-desc h# 10 + set-descriptor in-desc h# 34 adma! \ Link to first descriptor @@ -252,7 +254,6 @@ : close-in ( -- ) ; : open-out ( -- ) setup-sspa-tx ; : close-out ( -- ) ; -: write-done ( -- ) ; : wait-out ( -- ) buf-timeout 0 do @@ -260,20 +261,84 @@ loop 0 h# a0 adma! ; -: audio-out ( adr len -- actual ) - tuck to out-len to out-adr + +defer playback-alarm +0 value alarmed? + +: install-playback-alarm ( -- ) + true to alarmed? ['] playback-alarm d# 3 alarm +; +: uninstall-playback-alarm ( -- ) + alarmed? if + ['] playback-alarm d# 0 alarm + false to alarmed? + then +; + +false value playing? + +: stop-out ( -- ) + disable-sspa-tx + stop-out-ring + uninstall-playback-alarm + false to playing? +; + +: ?end-playing ( -- ) + h# a0 adma@ 1 and 0= if exit then + 0 h# a0 adma! + out-len if copy-out then + h# 40 adma@ h# 4000 and 0= if + stop-out + then +; +: playback-continue-alarm ( -- ) + playing? if + ?end-playing + else + \ If playback has already stopped as a result of + \ someone else having waited for completion, we + \ just uninstall ourself. + uninstall-playback-alarm + then +; +' playback-continue-alarm to playback-alarm + +: start-audio-out ( adr len -- ) + to out-len ( adr ) + to out-adr ( ) make-out-ring copy-out start-out-ring enable-sspa-tx - begin out-len while - copy-out - wait-out - repeat - wait-out - disable-sspa-tx + out-len if copy-out then \ Prefill the second buffer + install-playback-alarm + true to playing? +; + +: audio-out ( adr len -- actual ) tuck start-audio-out ; + +: stop-sound ( -- ) + lock[ + playing? if stop-out then + ]unlock +; + +0 value time-limit +: set-time-limit ( ms -- ) get-msecs + to time-limit ; +: 1sec-time-limit ( -- ) d# 1000 set-time-limit ; +: ?timeout ( -- ) + get-msecs time-limit - 0> if + ." Audio device timeout!" cr + abort + then +; +: wait-out-done ( -- ) + d# 20,000 set-time-limit begin ?timeout playing? 0= until ; -: write ( adr len -- actual ) open-out audio-out ; +: write-done ( -- ) wait-out-done stop-out ; + +: write ( adr len -- actual ) open-out audio-out ; : wait-in ( -- ) buf-timeout 0 do @@ -294,8 +359,11 @@ ; : read ( adr len -- actual ) open-in audio-in ; -: wait-sound ( -- ) ; -: stop-sound ( -- ) ; +: wait-sound ( -- ) + lock[ + begin playing? while d# 10 ms ?end-playing repeat + ]unlock +; 0 [if] \ Notes: @@ -441,8 +509,7 @@ : stereo ; : mono ; -: open ( -- flag ) - audio-clock-on +: init-codec ( -- ) codec-on headphones-inserted? if select-headphones else select-speakers then default-speaker-volume set-speaker-volume @@ -451,9 +518,19 @@ default-mic-gain set-mic-gain default-adc-gain set-adc-gain d# 48000 set-sample-rate +; +0 value open-count +: open ( -- flag ) + open-count 0= if audio-clock-on init-codec then + open-count 1+ to open-count true ; -: close ( -- ) ; +: close ( -- ) + open-count 1 = if + uninstall-playback-alarm codec-off ( audio-clock-off ) + then + open-count 1- 0 max to open-count +; fload ${BP}/forth/lib/isin.fth fload ${BP}/forth/lib/tones.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Thu Nov 25 00:38:16 2010 (r2037) +++ cpu/x86/pc/olpc/security.fth Thu Nov 25 03:31:28 2010 (r2038) @@ -328,7 +328,8 @@ : date-bad? ( -- flag ) current-seconds 0= if - time&date >unix-seconds to current-seconds + ['] time&date catch if true exit then + >unix-seconds to current-seconds then \ earliest is the earliest acceptable date value (in seconds).

1 0

[commit] r2037 - cpu/arm/olpc/1.75 dev/olpc/kb3700
by repository service Nov. 25, 2010

Nov. 25, 2010

Author: wmb Date: Thu Nov 25 00:38:16 2010 New Revision: 2037 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2037 Log: OLPC XO-1.75 - Get board revision from the EC. Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/fw.bth 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 Wed Nov 24 21:33:20 2010 (r2036) +++ cpu/arm/olpc/1.75/devices.fth Thu Nov 25 00:38:16 2010 (r2037) @@ -230,6 +230,7 @@ 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 @@ -281,15 +282,14 @@ : stand-init stand-init root-device -[ifdef] notyet model-name$ 2dup model ( name$ ) " OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property board-revision " board-revision-int" integer-property -[then] + \ The "1-" removes the null byte " SN" find-tag if 1- else " Unknown" then " serial-number" string-property [ifdef] notyet - 8 ec-cmd-b@ dup " ec-version" integer-property + ec-api-ver@ " ec-version" integer-property XXX Get EC name with an EC command " ec-name" string-property Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Wed Nov 24 21:33:20 2010 (r2036) +++ cpu/arm/olpc/1.75/fw.bth Thu Nov 25 00:38:16 2010 (r2037) @@ -126,8 +126,6 @@ fload ${BP}/cpu/x86/pc/olpc/via/banner.fth -h# d00 value board-revision \ Implement me!!! - \ This must be defined after spiui.fth, otherwise spiui will choose some wrong code : rom-pa ( -- adr ) mfg-data-buf mfg-data-offset - ; \ Fake out setwp.fth fload ${BP}/cpu/x86/pc/olpc/setwp.fth Modified: dev/olpc/kb3700/eccmds.fth ============================================================================== --- dev/olpc/kb3700/eccmds.fth Wed Nov 24 21:33:20 2010 (r2036) +++ dev/olpc/kb3700/eccmds.fth Thu Nov 25 00:38:16 2010 (r2037) @@ -37,40 +37,30 @@ loop too-many-retries ; -: (bat-gauge@) ( -- b ) h# 31 1 1 h# 18 do-ec-cmd ; \ 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# 5f 1 1 h# 18 do-ec-cmd ; \ 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 ( -- n ) h# 19 ec-cmd-w@ ; +: board-id@ ( -- n ) h# 19 ec-cmd-w@ ; : reset-ec ( -- ) h# 28 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@ ; + : ec-echo ( ... n -- ... ) dup h# 52 do-ec-cmd ; +: mppt-active@ ( -- b ) h# 3d ec-cmd-b@ ; + +: bat-cause@ ( -- b ) h# 1f ec-cmd-b@ ; + [ifdef] notdef -#define CMD_READ_BATT_ERR_CODE 0x1f -#define CMD_READ_BATTERY_TYPE 0x2c #define CMD_SET_EC_WAKEUP_TIMER 0x36 #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_ACTIVE 0x3d #define CMD_READ_MPPT_LIMIT 0x3e #define CMD_SET_MPPT_LIMIT 0x3f #define CMD_DISABLE_MPPT 0x40 @@ -79,15 +69,12 @@ #define CMD_EXT_SCI_QUERY 0x43 #define CMD_READ_LOCATION 0x44 #define CMD_WRITE_LOCATION 0x45 -#define CMD_KEYBOARD_CMD 0x46 -#define CMD_TOUCHPAD_CMD 0x47 #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 -#define CMD_READ_GUAGE_U16 0x4e #define CMD_ENABLE_MOUSE 0x4f [then] Modified: dev/olpc/kb3700/ecio.fth ============================================================================== --- dev/olpc/kb3700/ecio.fth Wed Nov 24 21:33:20 2010 (r2036) +++ dev/olpc/kb3700/ecio.fth Thu Nov 25 00:38:16 2010 (r2037) @@ -238,6 +238,8 @@ : sci-inhibit ( -- ) h# 32 ec-cmd ; : sci-uninhibit ( -- ) h# 34 ec-cmd ; +: mppt-active@ ( -- b ) h# 3d ec-cmd-b@ ; + : autowack-on ( -- ) 1 33 ec-cmd-b! ; : autowack-off ( -- ) 0 33 ec-cmd-b! ; : autowack-delay ( delay -- ) wbsplit f650 ec! f651 ec! ;

1 0

[commit] r2036 - cpu/arm/olpc/1.75 dev/olpc/kb3700
by repository service Nov. 24, 2010

Nov. 24, 2010

Author: wmb Date: Wed Nov 24 21:33:20 2010 New Revision: 2036 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2036 Log: OLPC XO-1.75 - implemented a bunch of EC commands. Added: dev/olpc/kb3700/eccmds.fth Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/ecflash.fth dev/olpc/kb3700/spicmd.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Nov 24 21:29:04 2010 (r2035) +++ cpu/arm/olpc/1.75/devices.fth Wed Nov 24 21:33:20 2010 (r2036) @@ -228,6 +228,7 @@ devalias keyboard /ec-spi/keyboard +fload ${BP}/dev/olpc/kb3700/eccmds.fth fload ${BP}/cpu/arm/olpc/1.75/ecflash.fth 0 0 " d4208000" " /" begin-package \ USB Host Controller Modified: cpu/arm/olpc/1.75/ecflash.fth ============================================================================== --- cpu/arm/olpc/1.75/ecflash.fth Wed Nov 24 21:29:04 2010 (r2035) +++ cpu/arm/olpc/1.75/ecflash.fth Wed Nov 24 21:33:20 2010 (r2036) @@ -1,20 +1,6 @@ \ See license at end of file purpose: Reflash the EC code -0 value ec-ih -: open-ec ( -- ) - ec-ih 0= if - " /eccmd" open-dev to ec-ih - then - ec-ih 0= abort" Can't open eccmd node" -; -: close-ec ( -- ) - ec-ih if - ec-ih close-dev - 0 to ec-ih - then -; - h# 10000 value /ec-flash char 3 value expected-ec-version @@ -45,24 +31,20 @@ ; : flash-ec ( "filename" -- ) get-ec-file - open-ec - " enter-updater" ec-ih $call-method - ." Erasing ..." " erase-flash" ec-ih $call-method cr - ." Writing ..." load-base /ec-flash 0 " write-flash" ec-ih $call-method cr + " enter-updater" $call-ec + ." Erasing ..." " erase-flash" $call-ec cr + ." Writing ..." load-base /ec-flash 0 " write-flash" $call-ec cr ." Verifying ..." - load-base /ec-flash + /ec-flash 0 " read-flash" ec-ih $call-method + load-base /ec-flash + /ec-flash 0 " read-flash" $call-ec load-base load-base /ec-flash + /ec-flash comp abort" Miscompare!" cr - " reboot-ec" ec-ih $call-method - close-ec + reset-ec ; : read-ec-flash ( -- ) - open-ec - " enter-updater" ec-ih $call-method - flash-buf /ec-flash 0 " read-flash" ec-ih $call-method -\ " reboot-ec" ec-ih $call-method - close-ec + " enter-updater" $call-ec + flash-buf /ec-flash 0 " read-flash" $call-ec +\ " reboot-ec" $call-ec ; : save-ec-flash ( "name" -- ) safe-parse-word $new-file Added: dev/olpc/kb3700/eccmds.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/olpc/kb3700/eccmds.fth Wed Nov 24 21:33:20 2010 (r2036) @@ -0,0 +1,116 @@ +\ See license at end of file +purpose: EC Commands for XO-1.75 and later + +0 value ec-ih +: $call-ec ( ... adr len -- ... ) ec-ih $call-method ; +: do-ec-cmd ( [ args ] #args #results cmd-code -- [ results ] ) + " ec-command" $call-ec abort" EC command failed" +; +stand-init: EC + " /ec-spi" open-dev to ec-ih +; + +: too-many-retries ( -- ) true abort" Too many EC command retries" ; +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-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 ; +: 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@ ; + +: (bat-gauge-id@) ( -- sn0 .. sn7 ) 0 8 h# 17 do-ec-cmd ; +: bat-gauge-id@ ( -- sn0 .. sn7 ) + #ec-retries 0 do + ['] (bat-gauge-id@) catch 0= if unloop exit then + loop + too-many-retries +; +: (bat-gauge@) ( -- b ) h# 31 1 1 h# 18 do-ec-cmd ; \ 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# 5f 1 1 h# 18 do-ec-cmd ; \ 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 ( -- n ) h# 19 ec-cmd-w@ ; +: reset-ec ( -- ) h# 28 ec-cmd ; + +: autowack-on ( -- ) 1 33 ec-cmd-b! ; +: autowack-off ( -- ) 0 33 ec-cmd-b! ; + +: ec-echo ( ... n -- ... ) dup h# 52 do-ec-cmd ; + +[ifdef] notdef +#define CMD_READ_BATT_ERR_CODE 0x1f +#define CMD_READ_BATTERY_TYPE 0x2c +#define CMD_SET_EC_WAKEUP_TIMER 0x36 +#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_ACTIVE 0x3d +#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 CMD_KEYBOARD_CMD 0x46 +#define CMD_TOUCHPAD_CMD 0x47 +#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 +#define CMD_READ_GUAGE_U16 0x4e +#define CMD_ENABLE_MOUSE 0x4f +[then] + +\ 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/spicmd.fth ============================================================================== --- dev/olpc/kb3700/spicmd.fth Wed Nov 24 21:29:04 2010 (r2035) +++ dev/olpc/kb3700/spicmd.fth Wed Nov 24 21:33:20 2010 (r2036) @@ -280,7 +280,6 @@ 0 instance value port# : set-port ( port# -- ) to port# ; -\ : put-data ( byte -- ) port# 2 0 d# 99 ec-command ; \ XXX : get-data? ( -- false | data true ) port# deque? ( false | data true ) poll @@ -292,7 +291,6 @@ loop true \ abort" Timeout waiting for data from device" ; -\ : put-get-data ( cmd -- data | -1 ) put-data get-data ; \ Wait until the device stops sending data : clear-out-buf ( -- ) begin d# 120 ms get-data? while drop repeat ; @@ -331,16 +329,6 @@ >r >r >r 0 0 0 r> r> r> data-command ; -new-device -" " " 2" set-args -" eccmd" name -my-space " reg" integer-property -: open ( -- flag ) - my-unit " set-port" $call-parent - true -; -: close ( -- ) -; 8 buffer: ec-cmdbuf d# 16 buffer: ec-respbuf : expected-response-length ( -- n ) ec-cmdbuf 1+ c@ h# f and ; @@ -357,11 +345,12 @@ dup 5 > abort" Too many EC command arguments" ec-cmdbuf 3 + swap bounds ?do i c! loop ( ) ; -: timed-get-data ( -- b ) +: timed-get-results ( -- b ) get-msecs d# 20 + begin ( limit ) - " get-data?" $call-parent if ( limit data ) - nip exit + 2 deque? if ( limit b ) + nip exit ( -- b ) then ( limit ) + poll ( limit ) dup get-msecs - 0< ( limit ) until ( limit ) drop @@ -370,7 +359,7 @@ : get-results ( -- [ results ] ) ec-respbuf #results bounds ?do - timed-get-data i c! + timed-get-results i c! loop #results 0 ?do \ XXX maybe this loop should go backwards? @@ -380,19 +369,28 @@ : ec-command ( [ args ] #args #results cmd-code -- [ results ] error? ) 0 set-cmdbuf - ec-cmdbuf 8 false " no-data-command" $call-parent + ec-cmdbuf 8 false no-data-command get-results false ; +: put-data ( byte -- ) + 1 0 + port# case + 3 of h# 46 endof + 4 of h# 47 endof + ( default ) 3drop exit + endcase ( byte #args #results cmd ) + ec-command drop +; +: put-get-data ( cmd -- data | -1 ) put-data get-data ; + : enter-updater ( -- ) 0 0 h# 50 1 set-cmdbuf - ec-respbuf 1 true ec-cmdbuf 8 true " data-command" $call-parent + ec-respbuf 1 true ec-cmdbuf 8 true data-command ; -: reboot-ec ( -- ) 0 0 h# 28 ec-command drop ; - create pgm-cmd h# 51 c, h# 84 c, d# 16 c, h# 02 c, h# 00 c, 0 c, 0 c, 0 c, create read-cmd h# 51 c, h# 04 c, d# 16 c, h# 03 c, h# 00 c, 0 c, 0 c, 0 c, create rdstat-cmd h# 51 c, h# 01 c, d# 01 c, h# 05 c, h# 80 c, 0 c, 0 c, 0 c, @@ -405,9 +403,8 @@ lbsplit drop ( low mid hi r: template ) r@ 4 + c! r@ 5 + c! r> 6 + c! ; -: flash-command ( datadr datlen in? template -- ) - 8 true " data-command" $call-parent -; +: flash-command ( datadr datlen in? template -- ) data-command ; + : write-flash-chunk ( adr len offset -- ) \ len limited to 16 bytes for now over pgm-cmd set-offset&len ( adr len ) false pgm-cmd flash-command ( ) @@ -459,8 +456,6 @@ drop ( ) ; -finish-device - new-device " " " 3" set-args fload ${BP}/dev/pckbd.fth

1 0

[commit] r2035 - dev
by repository service Nov. 24, 2010

Nov. 24, 2010

Author: wmb Date: Wed Nov 24 21:29:04 2010 New Revision: 2035 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2035 Log: Changed ps2mouse.fth to use my-space instead of my-unit for set-port; my-unit does not work right. Modified: dev/ps2mouse.fth Modified: dev/ps2mouse.fth ============================================================================== --- dev/ps2mouse.fth Tue Nov 23 23:37:52 2010 (r2034) +++ dev/ps2mouse.fth Wed Nov 24 21:29:04 2010 (r2035) @@ -299,7 +299,7 @@ lock[ identify if \ This port is unresponsive; try the other - my-unit 1- set-port identify if ]unlock true exit then + my-space 1- set-port identify if ]unlock true exit then then ( id ) dup h# ab = if ( id ) @@ -312,7 +312,7 @@ my-port 0= if ]unlock true exit then \ Otherwise look for the mouse on the keyboard port - my-unit 1- set-port identify if ]unlock true exit then ( id ) + my-space 1- set-port identify if ]unlock true exit then ( id ) then ( id ) ]unlock ( id ) @@ -325,7 +325,7 @@ headers : open ( -- flag ) - my-unit set-port + my-space set-port open-count 0= if \ The "force" argument causes the open to succeed even if no mouse

1 0

suported mobos
by Téssio Fechine Nov. 23, 2010

Nov. 23, 2010

Hello, Is there any index page with all the supported motherboards by open firmware?

2 1

[commit] r2034 - cpu/arm/olpc/1.75 dev/mmc/sdhci
by repository service Nov. 23, 2010

Nov. 23, 2010

Author: wmb Date: Tue Nov 23 23:37:52 2010 New Revision: 2034 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2034 Log: SDHCI - solidified support for SDHCI version 3 clock divisor layout and made 50 MHz operation work reasonably well for XO-1.75. Modified: cpu/arm/olpc/1.75/sdhci.fth dev/mmc/sdhci/sdhci.fth Modified: cpu/arm/olpc/1.75/sdhci.fth ============================================================================== --- cpu/arm/olpc/1.75/sdhci.fth Tue Nov 23 23:34:45 2010 (r2033) +++ cpu/arm/olpc/1.75/sdhci.fth Tue Nov 23 23:37:52 2010 (r2034) @@ -5,16 +5,9 @@ fload ${BP}/cpu/arm/olpc/1.75/sdregs.fth fload ${BP}/dev/mmc/sdhci/sdhci.fth - true to avoid-high-speed? +\ true to avoid-high-speed? hex - \ The new clock divisor layout is low 8 bits in [15:8] and high 2 bits in [7:6] - \ The resulting 10-bit value is multiplied by 2 to form the divisor for the - \ 200 MHz base clock. - patch 403 103 card-clock-25 \ n is 4, divisor is 8, clk is 25 MHz - patch 203 003 card-clock-50 \ n is 2, divisor is 4, clk is 50 MHz - patch 043 8003 card-clock-slow \ n is h# 100 (high 2 bits in [7:6], for divisor of 512 from 200 MHz clock - : olpc-card-inserted? ( -- flag ) slot 1 = if d# 31 gpio-pin@ 0= else true then ; Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Tue Nov 23 23:34:45 2010 (r2033) +++ dev/mmc/sdhci/sdhci.fth Tue Nov 23 23:37:52 2010 (r2034) @@ -135,20 +135,24 @@ : card-clock-on ( -- ) h# 2c cw@ 4 or h# 2c cw! ; : card-clock-off ( -- ) h# 2c cw@ 4 invert and h# 2c cw! ; +: sdhci-version3? ( -- flag ) h# fe cw@ h# ff and 2 >= ; : card-clock-slow ( -- ) \ Less than 400 kHz, for init card-clock-off - h# 8003 h# 2c cw! \ Set divisor to 2^128, leaving internal clock on + \ Set divisor, leaving internal clock on + sdhci-version3? if h# 43 else h# 8001 then h# 2c cw! card-clock-on ; : card-clock-25 ( -- ) card-clock-off - h# 103 h# 2c cw! \ Set divisor to 2^1, leaving internal clock on + \ Set divisor, leaving internal clock on + sdhci-version3? if h# 403 else h# 103 then h# 2c cw! card-clock-on ; : card-clock-50 ( -- ) card-clock-off - h# 003 \ division = 2^0, clocks on + \ Set divisor, leaving internal clock on + sdhci-version3? if h# 203 else h# 001 then ?cafe-fpga-quirk @@ -659,6 +663,7 @@ \ Ask if high-speed is supported h# 00ff.fff1 switch-function d# 13 + c@ 2 and if \ cmd6 + 2 ms h# 80ff.fff1 switch-function drop \ Perform the switch cmd6 \ Bump the host controller clock host-high-speed \ Changes the clock edge

1 0