October 2011 - openfirmware - mail.coreboot.org

[commit] r2608 - in cpu: arm/olpc/1.75/build x86/pc/alex/build x86/pc/biosload/build
by repository service Oct. 15, 2011

Oct. 15, 2011

Author: wmb Date: Sat Oct 15 22:46:56 2011 New Revision: 2608 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2608 Log: svn ignore Modified: cpu/arm/olpc/1.75/build/ (props changed) cpu/x86/pc/alex/build/ (props changed) cpu/x86/pc/biosload/build/ (props changed)

1 0

[commit] r2607 - dev/usb2/device/dediprog
by repository service Oct. 15, 2011

Oct. 15, 2011

Author: wmb Date: Sat Oct 15 18:40:20 2011 New Revision: 2607 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2607 Log: Added poorly-tested Dediprog SF100 SPI FLASH programmer driver - not used in any builds. Added: dev/usb2/device/dediprog/ dev/usb2/device/dediprog/dediprog.fth Added: dev/usb2/device/dediprog/dediprog.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/device/dediprog/dediprog.fth Sat Oct 15 18:40:20 2011 (r2607) @@ -0,0 +1,167 @@ +\ See license at end of file +purpose: Dediprog SF100 SPI FLASH programmer driver + +\ Mostly untested + +\ VID: 0483 PID: dada + +0 instance value inbuf +0 instance value outbuf + +: alloc-buffers ( -- ) + h# 10 dma-alloc to inbuf + h# 10 dma-alloc to outbuf +; +: free-buffers ( -- ) + inbuf h# 10 dma-free + outbuf h# 10 dma-free +; +: ?error ( usberr -- ) + ?dup if + noop \ Patch debug-me here if desired + push-hex + ." Dediprog: USB error " . cr + pop-base + then +; +: set-millivolts ( mv -- ) + case + 0 of 0 endof + d# 1800 of h# 12 endof + d# 2500 of h# 11 endof + d# 3300 of h# 10 endof + d# 3500 of h# 10 endof + ( -- ) ." Unsupported voltage" cr abort + endcase + >r 0 0 h# ff r> h# 42 9 control-set ?error +; +\ Speed# 0 1 2 3 4 5 6 7 +\ KHz 24000 , 8000 , 12000 , 3000 , 2180 , 1500 , 750 , 375 , +\ Divisor 1 3 2 8 11 16 32 64 +\ Base clock frequency is 24 MHz = 24000 kHz + +: set-speed ( speed# -- ) + >r 0 0 h# ff r> h# 42 h# 61 control-set ?error +; +0 value offset +: seek ( d.offset -- error? ) + if ." Dediprog: seek offset too large" cr drop true exit then + to offset + false +; + +: spi-read ( adr len start -- actual ) + +; +: send ( readadr,len writeadr,len -- ) + 2 pick if 1 else 0 then >r ( readadr,len writeadr,len r: readlen ) + r> h# ff h# 42 1 control-set ?error ( readadr,len ) + dup if + 0 h# bb8 h# c2 1 control-get ?error drop + else + 2drop + then +; +: check-devicestring ( -- error? ) + 0 inbuf c! +\ inbuf 1 h# ef03 0 h# c3 7 control-get ... \ From rsmith snoop + inbuf 1 0 0 h# c3 h# 7 control-get if true exit then ( actual ) + 1 <> if true exit then + inbuf c@ h# ff <> if true exit then + inbuf h# 10 h# ff h# ff h# c2 h# 8 control-get if true exit then + h# 10 <> if true exit then + ." Opened " inbuf h# 10 type cr + " SF100" inbuf swap comp 0= +; +: command-a ( -- ) + 0 inbuf c! inbuf 1 0 0 h# c3 h# b control-get ?error ( n ) + 1 <> ?error + inbuf c@ h# 6f <> ?error +; +: command-c ( -- ) 0 0 0 0 h# 42 4 control-set ?error ; +: write ( adr len -- ) +; +: open ( -- flag ) + set-device? if false exit then + device set-target + reset? if + configuration set-config if + ." userial: set-config failed" cr + false exit + then + bulk-in-pipe bulk-out-pipe reset-bulk-toggles + then + alloc-buffers + inbuf h# 10 bulk-in-pipe begin-bulk-in + command-a + command-a + check-devicstring if free-buffers false exit then + dediprog-command-c + d# 3500 set-millivolts + + true +; +: close ( -- ) + 0 set-millivolts +; +\ Send sequence +\ w 9f r4 ef 30 11 00 +\ w 9f r3 ef 30 11 +\ w 9f r2 ef 30 +\ w 15 r2 00 00 +\ w4 ab 00 00 00 r3 10 10 10 +\ w4 ab 00 00 00 r2 10 10 +\ w4 90 00 00 00 r3 ef 10 ef +\ w4 90 00 00 00 r2 ef 10 +\ set-voltage 0 +\ device string +\ CTL: 42 07 0009 0007 0 +\ set-voltage 0x10 (3V3) +\ set-speed 0x02 +\ set-voltage 0 +\ device string +\ command-a +\ command-a +\ command-a +\ set-voltage 0 +\ command-a +\ device string +\ CTL: 42 07 0009 0005 0 +\ set-voltage 0x10 +\ device string (c3,07 c2,08) +\ CTL: 42 07 0009 0005 0 +\ set-voltage 0x10 + +\ CTL: 42 20 0000 0000 4 Data: 80 00 00 02 +\ Bulk IN EP 82: 512 bytes: 02 01 01 02 01 5d ff ff ff ff 02 ... +\ Bulk IN EP 82: 512 bytes: 09 b5 75 82 ... +\ ... +\ Last one is URB 220, data: ff .. ff 09 b2 c2 54 +\ URB 221: +\ CTL: 42 20 0000 00ff 0 +\ set-voltage 0x10 +\ CTL: 42 01 00ff 0001 1 wdata: 05 -> 00 status (01 bit is write in progress) +\ CTL: 42 01 00ff 0001 1 wdata: 06 write-enable +\ CTL: 42 01 00ff 0001 1 wdata: 05 -> 02 status (02 bit is write-enable) + +\ CTL: 42 01 00ff 0001 4 wdata: d8 00 00 00 erase (adr-hi,mid,lo) +\ CTL: 42 01 00ff 0001 1 wdata: 05 -> 03 status + +\ again again ... eventually returns 00 instead of 03 at URB 264, 266 + +\ CTL: 42 01 00ff 0001 1 wdata: 06 write-enable +\ CTL: 42 01 00ff 0001 1 wdata: 05 -> 02 status + +\ CTL: 42 30 0000 0000 4 wdata: 00 01 00 01 + +\ URB 271 +\ Bulk out EP 02 512 bytes data: 02 01 01 02 01 5d ff ff ff ff ff 02 05 fc ... + +\ many more +\ URB 527 +\ CTL: 42 01 00ff 0001 1 wdata: 05 +\ CTL: C2 01 0bb8 0000 1 rdata: 00 +\ set-voltage 0 +\ CTL: 42 07 0009 0006 0 +\ set-voltage 0 +\ set-voltage 0

1 0

[commit] r2606 - cpu/arm/olpc/1.75
by repository service Oct. 14, 2011

Oct. 14, 2011

Author: wmb Date: Sat Oct 15 01:53:00 2011 New Revision: 2606 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2606 Log: OLPC XO-1.75 - trac #11314 - suppress CForth complaint when using early serial interaction with OFW. The fix also requires a corresponding change to CForth. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Fri Oct 14 04:21:56 2011 (r2605) +++ cpu/arm/olpc/1.75/fw.bth Sat Oct 15 01:53:00 2011 (r2606) @@ -120,6 +120,8 @@ \ d# 1000 i-key-wait if rotate-button? if protect-fw + \ Make the frame buffer visible so CForth won't complain about OFW not starting + h# 8009.1100 h# 20.b190 io! ." Interacting" cr hex interact then \ Turn on USB power here to overlap the time with other startup actions

1 0

[commit] r2605 - cpu/x86/pc/olpc
by repository service Oct. 14, 2011

Oct. 14, 2011

Author: quozl Date: Fri Oct 14 04:21:56 2011 New Revision: 2605 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2605 Log: Q2E48 (note that this version was not svn head at this point, but rather svn 2393 with svn 2585, 2589, 2603 and 2604) Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Fri Oct 14 03:16:49 2011 (r2604) +++ cpu/x86/pc/olpc/versions.fth Fri Oct 14 04:21:56 2011 (r2605) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 47 +macro: FW_MINOR 48 \ The EC microcode macro: EC_VERSION e35

1 0

[commit] r2604 - dev
by repository service Oct. 14, 2011

Oct. 14, 2011

Author: wmb Date: Fri Oct 14 03:16:49 2011 New Revision: 2604 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2604 Log: OLPC XO-1 - trac # 11335 - keyboard - call olpc-set-ec-keymap to ensure that the right mapping table is used. Modified: dev/pckbd.fth Modified: dev/pckbd.fth ============================================================================== --- dev/pckbd.fth Fri Oct 14 01:48:15 2011 (r2603) +++ dev/pckbd.fth Fri Oct 14 03:16:49 2011 (r2604) @@ -285,6 +285,7 @@ begin d# 50 timed-read 0= while drop true to keyboard-present? + olpc-set-ec-keymap exit repeat keyboard-present? if exit then

1 0

[commit] r2603 - cpu/x86/pc/olpc
by repository service Oct. 13, 2011

Oct. 13, 2011

Author: wmb Date: Fri Oct 14 01:48:15 2011 New Revision: 2603 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2603 Log: OLPC XO-1 - trac #11336 - Fixed stack bug in ofw-model$ that caused auto-firmware-reflash failure. Modified: cpu/x86/pc/olpc/banner.fth Modified: cpu/x86/pc/olpc/banner.fth ============================================================================== --- cpu/x86/pc/olpc/banner.fth Thu Oct 13 06:52:37 2011 (r2602) +++ cpu/x86/pc/olpc/banner.fth Fri Oct 14 01:48:15 2011 (r2603) @@ -5,11 +5,11 @@ : ofw-model$ ( -- adr len ) " /openprom" find-package drop ( phandle ) - " model" rot get-package-property if - " ??? ????? ???" - else - decode-string - then + " model" rot get-package-property if ( ) + " ??? ????? ???" ( adr len ) + else ( adr len ) + decode-string 2nip ( adr len' ) + then ( adr len ) ; : ofw-version$ ( -- adr len ) ofw-model$ drop 6 + 7 -trailing

1 0

[commit] r2602 - cpu/arm/olpc/1.75
by repository service Oct. 13, 2011

Oct. 13, 2011

Author: wmb Date: Thu Oct 13 06:52:37 2011 New Revision: 2602 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2602 Log: OLPC XO-1.75 - Fixed oops in previous checkin. Modified: cpu/arm/olpc/1.75/probemem.fth Modified: cpu/arm/olpc/1.75/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Thu Oct 13 06:27:05 2011 (r2601) +++ cpu/arm/olpc/1.75/probemem.fth Thu Oct 13 06:52:37 2011 (r2602) @@ -94,7 +94,7 @@ ; : map-dma ( -- ) - dma-mem-va >physical dup /dma-mem map-sections + dma-mem-va >physical h# c02 over /dma-mem map-sections ; : selftest ( -- error? ) map-dma

1 0

[commit] r2601 - cpu/arm/olpc/1.75
by repository service Oct. 13, 2011

Oct. 13, 2011

Author: wmb Date: Thu Oct 13 06:27:05 2011 New Revision: 2601 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2601 Log: OLPC XO-1.75 - Fixed regression that caused test /memory to fail; the DMA region was no longer mapped virtual=physical. Modified: cpu/arm/olpc/1.75/prefw.bth cpu/arm/olpc/1.75/probemem.fth Modified: cpu/arm/olpc/1.75/prefw.bth ============================================================================== --- cpu/arm/olpc/1.75/prefw.bth Thu Oct 13 03:13:55 2011 (r2600) +++ cpu/arm/olpc/1.75/prefw.bth Thu Oct 13 06:27:05 2011 (r2601) @@ -64,6 +64,9 @@ ; ' (cpu-arch to cpu-arch +[ifndef] virtual-mode +fload ${BP}/cpu/arm/mmp2/mmuon.fth +[then] fload ${BP}/cpu/arm/olpc/1.75/probemem.fth \ Memory probing stand-init: Probing memory @@ -77,8 +80,6 @@ ; fload ${BP}/ofw/core/initdict.fth \ Dynamic dictionary allocation fload ${BP}/arch/arm/loadarea.fth \ Allocate and map program load area -[else] -fload ${BP}/cpu/arm/mmp2/mmuon.fth [then] \ XXX should be elsewhere Modified: cpu/arm/olpc/1.75/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Thu Oct 13 03:13:55 2011 (r2600) +++ cpu/arm/olpc/1.75/probemem.fth Thu Oct 13 06:27:05 2011 (r2601) @@ -93,7 +93,11 @@ then ( ) ; +: map-dma ( -- ) + dma-mem-va >physical dup /dma-mem map-sections +; : selftest ( -- error? ) + map-dma false to mem-fail?

1 0

[commit] r2600 - cpu/arm/olpc/1.75
by repository service Oct. 13, 2011

Oct. 13, 2011

Author: quozl Date: Thu Oct 13 03:13:55 2011 New Revision: 2600 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2600 Log: Q4B12 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 Oct 13 03:07:05 2011 (r2599) +++ cpu/arm/olpc/1.75/fw-version.fth Thu Oct 13 03:13:55 2011 (r2600) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 11 +macro: FW_MINOR 12

1 0

[commit] r2599 - cpu/arm/olpc/1.75
by repository service Oct. 13, 2011

Oct. 13, 2011

Author: wmb Date: Thu Oct 13 03:07:05 2011 New Revision: 2599 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2599 Log: OLPC XO-1.75 - support for new accelerometer chip. Modified: cpu/arm/olpc/1.75/accelerometer.fth cpu/arm/olpc/1.75/roller.fth Modified: cpu/arm/olpc/1.75/accelerometer.fth ============================================================================== --- cpu/arm/olpc/1.75/accelerometer.fth Wed Oct 12 23:49:29 2011 (r2598) +++ cpu/arm/olpc/1.75/accelerometer.fth Thu Oct 13 03:07:05 2011 (r2599) @@ -1,9 +1,8 @@ - hex -0 0 " 6,3a" " /twsi" begin-package +0 0 " " " /twsi" begin-package " accelerometer" name -my-address my-space encode-phys " reg" property +\ my-address my-space encode-phys " reg" property \ This is for the stand-alone accelerometer chip LIS33DETR @@ -11,15 +10,18 @@ : acc-reg@ ( reg# -- b ) 1 1 " smbus-out-in" $call-parent ; : acc-reg! ( b reg# -- ) 2 0 " smbus-out-in" $call-parent ; : ctl1! ( b -- ) h# 20 acc-reg! ; +: ctl4! ( b -- ) h# 23 acc-reg! ; : accelerometer-on ( -- ) h# 47 ctl1! ; : accelerometer-off ( -- ) h# 07 ctl1! ; : bext ( b -- n ) dup h# 80 and if h# ffffff00 or then ; +: wext ( b -- n ) dup h# 8000 and if h# ffff0000 or then ; : acceleration@ ( -- x y z ) - h# 29 acc-reg@ bext - h# 2b acc-reg@ bext - h# 2d acc-reg@ bext + h# 28 acc-reg@ h# 29 acc-reg@ bwjoin wext 5 >>a + h# 2a acc-reg@ h# 2b acc-reg@ bwjoin wext 5 >>a + h# 2c acc-reg@ h# 2d acc-reg@ bwjoin wext 5 >>a ; + : t+ ( x1 y1 z1 x2 y2 z2 -- x3 y3 z3 ) >r >r >r ( x1 y1 z1 r: z2 y2 x2 ) rot r> + ( y1 z1 x3 r: z2 y2 ) @@ -35,12 +37,12 @@ \ Averaging a lot of samples reduces the effect of vibration : average-acceleration@ ( -- x y z ) acceleration@ ( x y z ) - d# 127 0 do + d# 64 0 do acceleration@ t+ ( x' y' z' ) loop - rot 7 >>a - rot 7 >>a - rot 7 >>a + rot 6 >>a + rot 6 >>a + rot 6 >>a ; : delay ( -- ) d# 30 ms ; @@ -60,25 +62,28 @@ \ - Mitch's unit, 32 \ - James' A3, 41 (on rubber mat on bare ground) \ - James' A2, 39 -d# 50 value max-delta -: out-of-range? ( delta -- error? ) 3 max-delta between 0= ; + +d# 50 value min-x +d# 50 value min-y +d# 150 value min-z +d# 100 value max-x +d# 100 value max-y +d# 300 value max-z +: range? ( delta max-delta -- error? ) between 0= ; : error? ( dx dy dz -- error? ) - out-of-range? if ." X axis error" cr 2drop true exit then ( dx dy ) - out-of-range? if ." Y axis error" cr drop true exit then ( dx ) - out-of-range? if ." X axis error" cr true exit then ( ) + min-z max-z range? if ." Z axis error" cr 2drop true exit then ( dx dy ) + min-y max-y range? if ." Y axis error" cr drop true exit then ( dx ) + min-x max-x range? if ." X axis error" cr true exit then ( ) false ; -: selftest ( -- error? ) - open 0= if true exit then - - final-test? if accelerometer-off false exit then - +: lis33de-selftest ( -- error? ) \ Use the device's selftest function to force a change in one direction delay ( ) average-acceleration@ ( x y z ) - h# 4f ctl1! delay ( x y z ) \ Set the STM bit + h# 4f ctl1! ( x y z ) \ Set the STM bit + delay average-acceleration@ t- ( dx dy dz ) \ STM applies negative bias to Y, but our deltas are inverted \ because we subtract the new measurement from the old. @@ -89,15 +94,70 @@ \ Use the device's selftest function to force a change in the opposite direction accelerometer-on delay ( ) \ Back to normal - STM and STP both off average-acceleration@ ( x y z ) - h# 57 ctl1! delay ( x y z ) \ Set the STP bit + h# 57 ctl1! ( x y z ) \ Set the STP bit + delay average-acceleration@ t- ( dx dy dz ) \ STP applies negative bias to X and Z, but our deltas are inverted \ because we subtract the new measurement from the old. swap negate swap ( dx dy' dz ) error? if accelerometer-off true exit then + false +; +: lis3dhtr-selftest ( -- ) + \ Use the device's selftest function to force a change in one direction + delay ( ) + average-acceleration@ ( x y z ) + h# 0a ctl4! ( x y z ) \ High res, Selftest mode 0 + delay + average-acceleration@ t- ( dx dy dz ) + rot negate rot negate rot negate + h# 08 ctl4! ( x y z ) \ High res, Normal mode + error? if accelerometer-off true exit then + + \ Use the device's selftest function to force a change in the opposite direction + accelerometer-on delay ( ) \ Back to normal - STM and STP both off + average-acceleration@ ( x y z ) + h# 0c ctl4! ( x y z ) \ High res, Selftest mode 1 + delay + average-acceleration@ t- ( dx dy dz ) + h# 08 ctl4! ( x y z ) \ High res, Normal mode + error? if accelerometer-off true exit then accelerometer-off false ; +defer lis-selftest +: selftest ( -- error? ) + open 0= if true exit then + + final-test? if accelerometer-off false exit then + + lis-selftest +; + +: probe ( -- ) + h# 3a 6 " set-address" $call-parent + d# 25,000 " set-bus-speed" $call-parent + ['] accelerometer-on catch if + \ The attempt to talk at the old address failed, so we assume the new chip + \ Support for new LIS3DHTR chip + d# 50 to min-x d# 50 to min-y d# 50 to min-z + d# 150 to max-x d# 150 to max-y d# 300 to max-z + h# 32 6 encode-phys " reg" property + ['] lis3dhtr-selftest to lis-selftest + else + accelerometer-off + \ Something responded to the old address, so we assume it's the old chip + \ Support for old LIS33DE chip + d# 20 to min-x d# 20 to min-y d# 20 to min-z + d# 400 to max-x d# 400 to max-y d# 400 to max-z + h# 3a 6 encode-phys " reg" property + ['] lis33de-selftest to lis-selftest + then +; end-package + +stand-init: Accelerometer + " /accelerometer" " probe" execute-device-method drop +; Modified: cpu/arm/olpc/1.75/roller.fth ============================================================================== --- cpu/arm/olpc/1.75/roller.fth Wed Oct 12 23:49:29 2011 (r2598) +++ cpu/arm/olpc/1.75/roller.fth Thu Oct 13 03:07:05 2011 (r2599) @@ -75,7 +75,7 @@ d# 19 d# 20 a/b>fraction value damping -d# 1 d# 10 a/b>fraction value acc-scale +d# 1 d# 80 a/b>fraction value acc-scale d# 20 constant ball-radius d# 40 constant ball-diameter

1 0