August 2012 - openfirmware - mail.coreboot.org

[commit] r3149 - dev
by repository service Aug. 10, 2012

Aug. 10, 2012

Author: quozl Date: Fri Aug 10 07:20:13 2012 New Revision: 3149 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3149 Log: OLPC XO-1.5 XO-1.75 - libertas, change baseband register interpretation to match new data supplied Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Fri Aug 10 02:15:54 2012 (r3148) +++ dev/libertas.fth Fri Aug 10 07:20:13 2012 (r3149) @@ -2194,10 +2194,22 @@ 2 .r ; -: .bpp-antenna ( antenna -- ) - dup h# 30 = if ." 1" drop exit then - dup h# 70 = if ." 2" drop exit then - 2 .r +: .rx-antenna ( antenna -- ) + 6 rshift + case + b# 00 of ." 0" endof + b# 01 of ." 1" endof + b# 10 of ." d" endof + endcase +; + +: .tx-antenna ( antenna -- ) + 6 rshift + case + b# 00 of ." 0" endof + b# 01 of ." 1" endof + b# 10 of ." r" endof + endcase ; : show-antenna ( -- ) @@ -2209,10 +2221,8 @@ get-antenna ( base antenna ) hex ." ant" .antenna ( base ) - ." rx " - h# 3f bbp-reg@ .bpp-antenna - ." tx " - h# 40 bbp-reg@ .bpp-antenna + ." rx " h# 3f bbp-reg@ .rx-antenna + ." tx " h# 40 bbp-reg@ .tx-antenna base ! ;

1 0

[commit] r3148 - cpu/arm/olpc
by repository service Aug. 10, 2012

Aug. 10, 2012

Author: rsmith Date: Fri Aug 10 02:15:54 2012 New Revision: 3148 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3148 Log: OLPC CL4 - Fixup automatic power up after EC reboot The location of the magic value for telling the EC to power back up on a power off changed with the switch to the io3790. This fixes 'bye' as well. Modified: cpu/arm/olpc/ecflash.fth Modified: cpu/arm/olpc/ecflash.fth ============================================================================== --- cpu/arm/olpc/ecflash.fth Fri Aug 10 00:25:40 2012 (r3147) +++ cpu/arm/olpc/ecflash.fth Fri Aug 10 02:15:54 2012 (r3148) @@ -26,7 +26,11 @@ load-base swap ?ec-image-valid ; \ Tells the EC to auto-restart after power cycling -: set-ec-reboot ( -- ) 1 h# f018 edi-b! ; +: set-ec-reboot ( -- ) + 1 + kb9010? if h# ff01 else h# f018 then + edi-b! +; : ?reflash-ec-flags ( adr -- ) use-edi-spi ( adr ) edi-open-active ( adr ) \ avoids holding EC in reset

1 0

[commit] r3147 - cpu/arm/olpc
by repository service Aug. 9, 2012

Aug. 9, 2012

Author: pgf Date: Fri Aug 10 00:25:40 2012 New Revision: 3147 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3147 Log: bsl.fth: don't modify mfp settings on cl4 the pin settings established by cforth are correct on cl4-a2. Modified: cpu/arm/olpc/bsl.fth Modified: cpu/arm/olpc/bsl.fth ============================================================================== --- cpu/arm/olpc/bsl.fth Thu Aug 9 22:34:22 2012 (r3146) +++ cpu/arm/olpc/bsl.fth Fri Aug 10 00:25:40 2012 (r3147) @@ -51,9 +51,12 @@ \ The pin setup should be done in CForth, but it's complicated by \ the fact that the touch-enabled CL2 uses GPIO 56 differently from \ the ordinary one -[ifdef] olpc-cl2 3 d# 55 af! 3 d# 56 af! [then] \ Setup pins for UART2 +[ifdef] olpc-cl2 + 3 d# 55 af! \ Setup pins for UART2 + 3 d# 56 af! 0 touch-tck-gpio# af! \ Set to GPIO function 1 touch-rst-gpio# af! \ Set to GPIO function (AF0 is SM_BELn for this pin) +[then] ; 0 [if]

1 0

[commit] r3146 - cpu/arm/olpc
by repository service Aug. 9, 2012

Aug. 9, 2012

Author: rsmith Date: Thu Aug 9 22:34:22 2012 New Revision: 3146 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3146 Log: OLPC CL4 - Fix slow EC programming speed The pll trim values are in special locations rather than normal XDATA locations. The XO-4 trim routine was using the wrong read method to get the pll trim values. Modified: cpu/arm/olpc/edi.fth Modified: cpu/arm/olpc/edi.fth ============================================================================== --- cpu/arm/olpc/edi.fth Thu Aug 9 14:29:04 2012 (r3145) +++ cpu/arm/olpc/edi.fth Thu Aug 9 22:34:22 2012 (r3146) @@ -317,15 +317,15 @@ dup 4 or ecsts edi-b! ( old-ecsts ) \ chipid is now pllcfg2 xbis edi-b@ h# 3f and ( old-ecsts xbis-bits ) - h# 81 edi-b@ 3 and 6 lshift or ( old-ecsts xbis-value ) + h# 81 trim@ 3 and 6 lshift or ( old-ecsts xbis-value ) xbis edi-b! ( old-ecsts ) - h# 82 edi-b@ h# f and 4 lshift ( old-ecsts pll-high ) - h# 83 edi-b@ h# f0 and 4 rshift or ( old-ecsts pll-value ) + h# 82 trim@ h# f and 4 lshift ( old-ecsts pll-high ) + h# 83 trim@ h# f0 and 4 rshift or ( old-ecsts pll-value ) pllcfg edi-b! ( old-ecsts ) pllcfg2 edi-b@ h# 3f and ( old-ecsts pll2-bits ) - h# 82 edi-b@ h# 30 and 2 lshift or ( old-ecsts pll2-value ) + h# 82 trim@ h# 30 and 2 lshift or ( old-ecsts pll2-value ) pllcfg2 edi-b! ( old-ecsts ) ecsts edi-b! ( )

1 0

[commit] r3145 - cpu/arm/mmp2
by repository service Aug. 9, 2012

Aug. 9, 2012

Author: wmb Date: Thu Aug 9 14:29:04 2012 New Revision: 3145 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3145 Log: OLPC CL4 - touch up the MFPR to GPIO mapping tables. Modified: cpu/arm/mmp2/mfpr.fth Modified: cpu/arm/mmp2/mfpr.fth ============================================================================== --- cpu/arm/mmp2/mfpr.fth Thu Aug 9 14:28:19 2012 (r3144) +++ cpu/arm/mmp2/mfpr.fth Thu Aug 9 14:29:04 2012 (r3145) @@ -31,7 +31,11 @@ 224 w, 228 w, 22C w, 230 w, 234 w, 238 w, 23C w, 240 w, \ 144->151 248 w, 24C w, 254 w, 258 w, 14C w, 150 w, 154 w, 158 w, \ 152->159 250 w, 210 w, 20C w, 208 w, 204 w, 1EC w, 1E8 w, 1E4 w, \ 160->167 - 1E0 w, 2BC w, 2C0 w, 2C8 w, \ 168->171 + 1E0 w, \ 168 +[ifdef] mmp3 + 2BC w, 2C0 w, 2C8 w, \ 169->171 +[then] +here mfpr-offsets - /w / constant #mfprs : gpio>mfpr ( gpio# -- mfpr-pa ) mfpr-offsets swap wa+ w@ @@ -40,7 +44,7 @@ : dump-mfprs ( -- ) base @ - d# 172 0 do decimal i 3 u.r space i gpio>mfpr io@ 4 hex u.r cr loop + #mfprs 0 do decimal i 3 u.r space i gpio>mfpr io@ 4 hex u.r cr loop base ! ; @@ -115,7 +119,10 @@ d# 166 h# 1e8 +mfpr d# 167 h# 1e4 +mfpr d# 168 h# 1e0 +mfpr +[ifdef] mmp3 + d# 169 d# 170 h# 2c0 +mfpr-range \ PXA2128 only d# 171 h# 2c8 +mfpr \ PXA2128 only +[then] h# 15b h# 15c h# 140 +mfpr-range \ MFPR_PIN_TWSI1_SCL - MFPR_PIN_TWSI1_SDA h# 15d h# 15e h# 2bc +mfpr-range \ MFPR_PIN_TWSI4_SCL - MFPR_PIN_TWSI4_SDA h# 159 h# 2c4 +mfpr \ MFPR_PIN_PMIC_INT

1 0

[commit] r3144 - cpu/arm/mmp2
by repository service Aug. 9, 2012

Aug. 9, 2012

Author: wmb Date: Thu Aug 9 14:28:19 2012 New Revision: 3144 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3144 Log: OLPC CL4 - added some MMP3-specific entries to the list of clock reset registers. Modified: cpu/arm/mmp2/apbc.fth cpu/arm/mmp2/pmua.fth Modified: cpu/arm/mmp2/apbc.fth ============================================================================== --- cpu/arm/mmp2/apbc.fth Thu Aug 9 14:27:13 2012 (r3143) +++ cpu/arm/mmp2/apbc.fth Thu Aug 9 14:28:19 2012 (r3144) @@ -44,6 +44,7 @@ " UART4" +string \ 32 " RIPC" +string \ 33 " THSENS1" +string \ 34 +" CORESIGHT" +string \ 35 " clock-output-names" property : +int encode-int encode+ ; @@ -85,6 +86,7 @@ h# 88 +int h# 77 +int h# 17 +int d# 26,000,000 +int \ 32 UART4 h# 8c +int h# 77 +int h# 7 +int d# 26,000,000 +int \ 33 RIPC h# 90 +int h# 77 +int h# 7 +int d# 26,000,000 +int \ 34 THSENS1 +h# 94 +int h# 7 +int h# 7 +int d# 26,000,000 +int \ 35 CORESIGHT " clock-enable-registers" property end-package Modified: cpu/arm/mmp2/pmua.fth ============================================================================== --- cpu/arm/mmp2/pmua.fth Thu Aug 9 14:27:13 2012 (r3143) +++ cpu/arm/mmp2/pmua.fth Thu Aug 9 14:28:19 2012 (r3144) @@ -38,6 +38,13 @@ " ISP" +string \ 22 " EPD" +string \ 23 " APB2" +string \ 24 +" SPMI" +string \ 25 +" EPD" +string \ 26 +" USB3SS" +string \ 27 +" SDH4" +string \ 28 +" DSA" +string \ 29 +" TPIU" +string \ 30 +" ISP" +string \ 31 " clock-output-names" property : +int encode-int encode+ ; @@ -69,6 +76,15 @@ h# 120 +int h# 3f +int h# 3f +int d# 0 +int \ 22 ISP h# 124 +int h# 1b +int h# 1b +int d# 0 +int \ 23 EPD h# 134 +int h# 12 +int h# 12 +int d# 0 +int \ 24 APB2 +[ifdef] mmp3 +h# 140 +int h# 1b +int h# 1b +int d# 0 +int \ 25 SPMI - XXX may need to set clock divisor bits +h# 144 +int h# 21b +int h# 21b +int d# 0 +int \ 26 EPD +h# 148 +int h# 9 +int h# 9 +int d# 0 +int \ 27 USB3SS +h# 15c +int h# 1b +int h# 1b +int d# 0 +int \ 28 SDH4 +h# 164 +int h# f +int h# f +int d# 0 +int \ 29 DSA xx +h# 18c +int h# 12 +int h# 12 +int d# 0 +int \ 30 TPIU +h# 224 +int h# 1b +int h# 1b +int d# 0 +int \ 31 ISP Need to do the redundancy dance +[then] " clock-enable-registers" property end-package

1 0

[commit] r3143 - cpu/x86/pc/olpc
by repository service Aug. 9, 2012

Aug. 9, 2012

Author: wmb Date: Thu Aug 9 14:27:13 2012 New Revision: 3143 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3143 Log: OLPC - Load the crypto code in stand-init, because demand-loading it during WLAN startup can mess up resolution of later path components. Modified: cpu/x86/pc/olpc/crypto.fth Modified: cpu/x86/pc/olpc/crypto.fth ============================================================================== --- cpu/x86/pc/olpc/crypto.fth Thu Aug 9 10:28:22 2012 (r3142) +++ cpu/x86/pc/olpc/crypto.fth Thu Aug 9 14:27:13 2012 (r3143) @@ -19,6 +19,9 @@ true to crypto-loaded? false ; +stand-init: Crypto + load-crypto drop +; : unload-crypto ( -- ) crypto-loaded? 0= if exit then verify-base /verify mem-release

1 0

[commit] r3142 - in cpu/arm/olpc: . 1.75 cl4
by repository service Aug. 9, 2012

Aug. 9, 2012

Author: quozl Date: Thu Aug 9 10:28:22 2012 New Revision: 3142 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3142 Log: OLPC CL4 - Neonode touchscreen driver, bare bones Added: cpu/arm/olpc/nn-touchscreen.fth Modified: cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/gpiopins.fth cpu/arm/olpc/cl4/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Thu Aug 9 10:27:52 2012 (r3141) +++ cpu/arm/olpc/1.75/fw.bth Thu Aug 9 10:28:22 2012 (r3142) @@ -25,6 +25,7 @@ fload ${BP}/cpu/arm/olpc/1.75/sdhci.fth fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth fload ${BP}/cpu/arm/olpc/1.75/usb.fth +fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth fload ${BP}/cpu/arm/olpc/rm3150-touchscreen.fth fload ${BP}/cpu/arm/olpc/1.75/compass.fth fload ${BP}/cpu/arm/olpc/1.75/switches.fth Modified: cpu/arm/olpc/1.75/gpiopins.fth ============================================================================== --- cpu/arm/olpc/1.75/gpiopins.fth Thu Aug 9 10:27:52 2012 (r3141) +++ cpu/arm/olpc/1.75/gpiopins.fth Thu Aug 9 10:28:22 2012 (r3142) @@ -66,3 +66,4 @@ d# 14 constant touch-hd-gpio# d# 98 constant touch-tck-gpio# d# 152 constant touch-rst-gpio# +d# 99 constant touch-scr-gpio# Modified: cpu/arm/olpc/cl4/fw.bth ============================================================================== --- cpu/arm/olpc/cl4/fw.bth Thu Aug 9 10:27:52 2012 (r3141) +++ cpu/arm/olpc/cl4/fw.bth Thu Aug 9 10:28:22 2012 (r3142) @@ -18,7 +18,7 @@ fload ${BP}/cpu/arm/olpc/cl4/sdhci.fth fload ${BP}/cpu/arm/olpc/1.75/lcdcfg.fth fload ${BP}/cpu/arm/olpc/1.75/usb.fth -\ fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth +fload ${BP}/cpu/arm/olpc/nn-touchscreen.fth fload ${BP}/cpu/arm/olpc/cl4/switches.fth fload ${BP}/cpu/arm/olpc/cl4/leds.fth fload ${BP}/cpu/arm/olpc/cl4/testitems.fth Added: cpu/arm/olpc/nn-touchscreen.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/nn-touchscreen.fth Thu Aug 9 10:28:22 2012 (r3142) @@ -0,0 +1,139 @@ +\ See license at end of file +purpose: Driver and diagnostic for Neonode zForce MultiSensing I2C Touchscreen + +0 0 " 4,a0" " /twsi" begin-package +my-space encode-int my-address encode-int encode+ " reg" property + +\ XXX these are really platform-related, not touchscreen-related +: targets? ( -- flag ) final-test? ; +: .tsmsg ( -- ) 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr ; + +fload ${BP}/cpu/arm/olpc/touchscreen-common.fth + +: reset ( -- ) touch-rst-gpio# dup gpio-clr gpio-set d# 250 ms ; +: no-data? ( -- false | true ) touch-scr-gpio# gpio-pin@ ; + +d# 250 constant /packet +/packet buffer: packet +0 value packet-size + +: in? ( -- false | true ) + no-data? if false then + + packet 2 " twsi-read" $call-parent ( ) + packet 1+ c@ ( size ) + dup 2+ to packet-size ( size ) + + packet 2+ swap " twsi-read" $call-parent ( ) + true +; + +: out ( byte ... bytes# -- ) " twsi-out" $call-parent ; + +defer process +' noop to process + +: expect ( id msecs -- ) + get-msecs + ( id limit ) + begin + in? if + process + over packet 2+ c@ ( id limit received-id ) + = if 2drop exit then + then ( id limit ) + dup get-msecs - 0< ( id limit timeout? ) + until ( id limit ) + 2drop ( ) +; + +: read-boot-complete ( -- ) h# 07 d# 10 expect ; + +: initialise ( -- ) h# ee h# 01 h# 01 3 out h# 01 d# 10 expect ; + +: set-resolution ( -- ) + set-geometry + h# ee h# 05 h# 02 screen-w wbsplit screen-h wbsplit 7 out + h# 02 d# 10 expect +; + +: start ( -- ) h# ee h# 01 h# 04 3 out ; + +: deactivate ( -- ) h# ee h# 01 h# 00 3 out h# 00 d# 10 expect ; + +: configure ( -- ) + read-boot-complete + initialise + set-resolution + start +; + +: open ( -- okay? ) + my-unit " set-address" $call-parent + no-data? if reset then + no-data? if false exit then + ['] configure catch if false exit then + true +; + +: close + deactivate +; + +: stream-poll? ( -- false | x y buttons true ) + in? if + packet 2+ c@ h# 04 = if + packet 4 + w@ packet 6 + w@ ( x y ) + packet 8 + c@ 3 and 0= ( x y down? ) + true ( x y buttons true ) + else + false + then + else + false + then +; + +: selftest + open 0= if + ." No touchscreen present" cr false exit + then + + \ FIXME: graphically show data on screen until key + begin + in? if + ." rx: " packet packet-size bounds do + i c@ 0 <# # # #> type space + loop cr + then + key? + until + key drop + + close false +; + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2012 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] r3141 - cpu/arm/mmp2
by repository service Aug. 9, 2012

Aug. 9, 2012

Author: quozl Date: Thu Aug 9 10:27:52 2012 New Revision: 3141 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3141 Log: ARM - TWSI, add twsi-read for reading bytes from a device into a buffer Modified: cpu/arm/mmp2/twsi.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Thu Aug 9 03:49:54 2012 (r3140) +++ cpu/arm/mmp2/twsi.fth Thu Aug 9 10:27:52 2012 (r3141) @@ -151,6 +151,13 @@ 1- 0 ?do dup c@ 0 twsi-putbyte 1+ loop ( adr' ) c@ bbu_ICR_STOP twsi-putbyte ( ) ; +: twsi-read ( adr len -- ) + dup 0= if 2drop exit then ( adr len ) + slave-address 1 or twsi-start ( adr len ) + + 1- 0 ?do 0 twsi-getbyte over c! 1+ loop ( adr' ) + bbu_ICR_STOP bbu_ICR_ACKNAK or twsi-getbyte swap c! ( ) +; : twsi-b@ ( reg -- byte ) 1 1 twsi-get ; : twsi-b! ( byte reg -- ) 2 twsi-out ;

1 0

[commit] r3140 - cpu/arm/olpc
by repository service Aug. 9, 2012

Aug. 9, 2012

Author: wmb Date: Thu Aug 9 03:49:54 2012 New Revision: 3140 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3140 Log: OLPC ARM - Checked in swhash.fth Added: cpu/arm/olpc/swhash.fth Added: cpu/arm/olpc/swhash.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/swhash.fth Thu Aug 9 03:49:54 2012 (r3140) @@ -0,0 +1,45 @@ +: sha1 ( data$ -- hash$ ) load-crypto throw " sha1" crypto-hash ; +: sha-256 ( data$ -- hash$ ) load-crypto throw " sha256" crypto-hash ; +: md5 ( data$ -- hash$ ) load-crypto throw " md5" crypto-hash ; + +: convert-crypto-args ( data$n..data$1 n -- 0 data$n..data$1 ) + \ signature-bad? wants the end of data to be marked by a 0 length + \ so we move the n data strings to the return stack, push a 0, + \ then move the strings back. We can't use do..loop because it + \ interferes with the return stack. + dup ( data$n..data$1 n rem ) + begin dup while ( data$n..data$1 n rem ) + 2swap 2>r ( data$n..data$m n rem r: data$ .. ) + 1- ( data$n..data$m n rem' r: data$ .. ) + repeat ( n 0 r: data$ .. ) + drop ( n r: data$ .. ) + + 0 swap ( 0 n r: data$ .. ) + begin dup while ( rem r: data$ .. ) + 2r> rot ( 0 data$n .. rem r: data$ .. ) + 1- ( 0 data$n .. rem' r: data$ .. ) + repeat ( 0 data$n.. 0 r: data$ .. ) + drop ( 0 data$n..data$1 ) +; + +d# 128 buffer: hashbuf +: hash-n ( data$n..data$1 n hashname$ -- result$ ) + load-crypto throw + 2>r ( data$n..data$1 n r: hashname$ ) + + convert-crypto-args ( 0 data$n..data$1 r: hashname$ ) + + \ The 0 above hashlen tells the crypto function to perform the hash + \ only, without signature checking, returning the length of the + \ hash result in hashlen. + hashbuf d# 128 hashlen 0 2r> ( 0 data$.. sig$ key$ hashname$ ) + + signature-bad? h# fffff and abort" Hash failed" ( ) + hashbuf hashlen @ +; + +\ For use by hmacsha1 in the wifi supplicant package +d# 20 constant /sha1-digest +alias sha1-digest hashbuf + +: sha1-n ( data$n..data$1 n -- digest$ ) " sha1" hash-n ;

1 0