November 2012 - openfirmware - mail.coreboot.org

[commit] r3450 - dev/hdaudio
by repository service Nov. 21, 2012

Nov. 21, 2012

Author: wmb Date: Wed Nov 21 00:28:09 2012 New Revision: 3450 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3450 Log: OLPC XO-1.5 - fixed build problem in audio selftest. Modified: dev/hdaudio/test.fth Modified: dev/hdaudio/test.fth ============================================================================== --- dev/hdaudio/test.fth Wed Nov 21 00:23:58 2012 (r3449) +++ dev/hdaudio/test.fth Wed Nov 21 00:28:09 2012 (r3450) @@ -110,6 +110,7 @@ " 0 set-fg h# ffffffff set-bg single-drawing ( clear-drawing ) wave" evaluate \ key ascii d = if debug-me then ; +[ifndef] $call-screen : $call-screen " $call-screen" evaluate ; [then] : plot-impulse0 ( adr -- ) 0 " set-wave#" $call-screen plot-impulse ; : plot-impulse1 ( adr -- ) 1 " set-wave#" $call-screen plot-impulse ;

1 0

[commit] r3449 - cpu/x86/pc/olpc dev/olpc/dcon
by repository service Nov. 21, 2012

Nov. 21, 2012

Author: wmb Date: Wed Nov 21 00:23:58 2012 New Revision: 3449 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3449 Log: XO-1 - fixed build problem by creating new DCON driver methods "dcon-freeze" and "dcon-unfreeze" on top of the old "set-source" method. Modified: cpu/x86/pc/olpc/gui.fth dev/olpc/dcon/dcon.fth dev/olpc/dcon/mmp2dcon.fth dev/olpc/dcon/viadcon.fth Modified: cpu/x86/pc/olpc/gui.fth ============================================================================== --- cpu/x86/pc/olpc/gui.fth Wed Nov 21 00:20:41 2012 (r3448) +++ cpu/x86/pc/olpc/gui.fth Wed Nov 21 00:23:58 2012 (r3449) @@ -356,8 +356,8 @@ ; : frozen? ( -- flag ) " vga?" $call-dcon 0= ; -: dcon-freeze ( -- ) 0 " set-source" $call-dcon d# 30 ms ; -: dcon-unfreeze ( -- ) 1 " set-source" $call-dcon d# 30 ms ; +: dcon-freeze ( -- ) " dcon-freeze" $call-dcon d# 30 ms ; +: dcon-unfreeze ( -- ) " dcon-unfreeze" $call-dcon d# 30 ms ; \ === Stuff moved from security.fth === Modified: dev/olpc/dcon/dcon.fth ============================================================================== --- dev/olpc/dcon/dcon.fth Wed Nov 21 00:20:41 2012 (r3448) +++ dev/olpc/dcon/dcon.fth Wed Nov 21 00:23:58 2012 (r3449) @@ -104,6 +104,8 @@ \ display-off then ; +: dcon-freeze ( -- ) 0 set-source ; +: dcon-unfreeze ( -- ) 1 set-source ; \ gx_configure_tft(info); Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Wed Nov 21 00:20:41 2012 (r3448) +++ dev/olpc/dcon/mmp2dcon.fth Wed Nov 21 00:23:58 2012 (r3449) @@ -123,6 +123,8 @@ then then ; +: dcon-freeze ( -- ) 0 set-source ; +: dcon-unfreeze ( -- ) 1 set-source ; \ gx_configure_tft(info); Modified: dev/olpc/dcon/viadcon.fth ============================================================================== --- dev/olpc/dcon/viadcon.fth Wed Nov 21 00:20:41 2012 (r3448) +++ dev/olpc/dcon/viadcon.fth Wed Nov 21 00:23:58 2012 (r3449) @@ -126,6 +126,8 @@ repeat ( ) then ; +: dcon-freeze ( -- ) 0 set-source ; +: dcon-unfreeze ( -- ) 1 set-source ; \ gx_configure_tft(info);

1 0

[commit] r3448 - dev/usb2/device/wlan
by repository service Nov. 21, 2012

Nov. 21, 2012

Author: wmb Date: Wed Nov 21 00:20:41 2012 New Revision: 3448 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3448 Log: XO-1 WLAN driver - added stub definition of multifunction? to satisfy new version of libertas.fth Modified: dev/usb2/device/wlan/usb8388.fth Modified: dev/usb2/device/wlan/usb8388.fth ============================================================================== --- dev/usb2/device/wlan/usb8388.fth Wed Nov 21 00:11:00 2012 (r3447) +++ dev/usb2/device/wlan/usb8388.fth Wed Nov 21 00:20:41 2012 (r3448) @@ -4,6 +4,8 @@ headers hex +false constant multifunction? + \ Used by cmd-out below and also by firmware download routine : packet-out ( adr len -- error? ) " send-out" $call-parent ( qtd )

1 0

[commit] r3447 - cpu/x86/pc/olpc
by repository service Nov. 21, 2012

Nov. 21, 2012

Author: wmb Date: Wed Nov 21 00:11:00 2012 New Revision: 3447 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3447 Log: oatstime utility - fixed typo in previous checkin. Modified: cpu/x86/pc/olpc/oatstime.fth Modified: cpu/x86/pc/olpc/oatstime.fth ============================================================================== --- cpu/x86/pc/olpc/oatstime.fth Wed Nov 21 00:10:28 2012 (r3446) +++ cpu/x86/pc/olpc/oatstime.fth Wed Nov 21 00:11:00 2012 (r3447) @@ -317,7 +317,7 @@ " flush-writes" $call-http ; -[ifdef] random +[ifdef] random-long alias nonce-int random-long [else] : nonce-int ( -- n ) time&date >unix-seconds get-msecs xor ;

1 0

[commit] r3446 - cpu/x86/pc/olpc
by repository service Nov. 21, 2012

Nov. 21, 2012

Author: wmb Date: Wed Nov 21 00:10:28 2012 New Revision: 3446 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3446 Log: oatstime utility - simplified the fix in svn 3445 by observing that running one step of a linear congruence adds no entropy to the seed value, thus you might as well just use the seed. Modified: cpu/x86/pc/olpc/oatstime.fth Modified: cpu/x86/pc/olpc/oatstime.fth ============================================================================== --- cpu/x86/pc/olpc/oatstime.fth Tue Nov 20 23:54:29 2012 (r3445) +++ cpu/x86/pc/olpc/oatstime.fth Wed Nov 21 00:10:28 2012 (r3446) @@ -316,14 +316,16 @@ http-write " flush-writes" $call-http ; -[ifndef] random-long -variable rn -: random-long rn @ d# 1103515245 * d# 12345 + h# 7FFFFFFF and dup rn ! ; -time&date >unix-seconds get-msecs xor rn ! + +[ifdef] random +alias nonce-int random-long +[else] +: nonce-int ( -- n ) time&date >unix-seconds get-msecs xor ; [then] + 0 value the-nonce : oats-msg$ ( -- msg$ ) - random-long abs dup to the-nonce ( nonce ) + nonce-int abs dup to the-nonce ( nonce ) " SN" find-tag 0= abort" Machine has no serial number" ?-null ( nonce sn$ ) " serialnum=%s&version=1&nonce=%d" sprintf ;

1 0

[commit] r3445 - cpu/x86/pc/olpc
by repository service Nov. 20, 2012

Nov. 20, 2012

Author: quozl Date: Tue Nov 20 23:54:29 2012 New Revision: 3445 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3445 Log: OLPC XO-1 - fix missing random-long in oatstime utility by using the psuedo-random generator seeded with time and milliseconds since boot Modified: cpu/x86/pc/olpc/oatstime.fth Modified: cpu/x86/pc/olpc/oatstime.fth ============================================================================== --- cpu/x86/pc/olpc/oatstime.fth Tue Nov 20 23:27:07 2012 (r3444) +++ cpu/x86/pc/olpc/oatstime.fth Tue Nov 20 23:54:29 2012 (r3445) @@ -316,6 +316,11 @@ http-write " flush-writes" $call-http ; +[ifndef] random-long +variable rn +: random-long rn @ d# 1103515245 * d# 12345 + h# 7FFFFFFF and dup rn ! ; +time&date >unix-seconds get-msecs xor rn ! +[then] 0 value the-nonce : oats-msg$ ( -- msg$ ) random-long abs dup to the-nonce ( nonce )

1 0

[commit] r3444 - in dev/usb2/hcd: . ehci
by repository service Nov. 20, 2012

Nov. 20, 2012

Author: wmb Date: Tue Nov 20 23:27:07 2012 New Revision: 3444 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3444 Log: USB - Changed selftest logic so that it will not destroy (by wanton reprobing) the setup of devices that were connected prior to the execution of selftest. This fixes OLPC trac #12254 and corrects the fix to OLPC trac #11845. I also made it possible to invoke the fisheye test by supplying the argument "fisheye" to the usb path, as in "test /usb:fisheye" or "test /usb:fisheye/hub" . The fisheye test is only available when diag-switch? is false. Modified: dev/usb2/hcd/device.fth dev/usb2/hcd/ehci/probe.fth dev/usb2/hcd/hcd.fth dev/usb2/hcd/probehub.fth Modified: dev/usb2/hcd/device.fth ============================================================================== --- dev/usb2/hcd/device.fth Tue Nov 20 02:49:48 2012 (r3443) +++ dev/usb2/hcd/device.fth Tue Nov 20 23:27:07 2012 (r3444) @@ -357,6 +357,46 @@ drop ( ) ; +: find-port-node ( port -- true | phandle false) + my-self ihandle>phandle child ( port phandle ) + begin ?dup while ( port phandle ) + " reg" 2 pick get-package-property 0= if ( port phandle adr len ) + decode-int nip nip ( port phandle port1 ) + 2 pick = if ( port phandle ) + \ Check if the node has been disabled + " assigned-address" ( port phandle propname$ ) + 2 pick get-package-property 0= if ( port phandle adr len ) + decode-int nip nip ( port phandle assigned-address ) + -1 <> if ( port phandle ) + nip false exit + then + then ( port phandle ) + then ( port phandle ) + then ( port phandle ) + peer ( port phandle' ) + repeat ( port ) + drop ( ) + true +; + +: .phandle-property ( phandle prop-name$ -- ) + rot get-package-property 0= if ( adr len ) + decode-string type 2drop + then +; +: .usb-device ( port -- ) + find-port-node if + ." Can't find device node for USB port!" cr + else ( phandle ) + dup " device_type" .phandle-property ( phandle ) + ." ," + dup " vendor$" .phandle-property ( phandle ) + ." ," + dup " device$" .phandle-property ( phandle ) + drop ( ) + then +; + : (make-device-node) ( dev port intf -- ) swap ( dev intf port ) 3dup reuse-old-node? if ( dev intf port ) Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Tue Nov 20 02:49:48 2012 (r3443) +++ dev/usb2/hcd/ehci/probe.fth Tue Nov 20 23:27:07 2012 (r3444) @@ -84,9 +84,10 @@ : power-usb-ports ( -- ) ; +: port-changed? ( port# -- flag ) portsc@ 2 and 0<> ; : ports-changed? ( -- flag ) #ports 0 ?do - i portsc@ 2 and if true unloop exit then + i port-changed? if true unloop exit then loop false ; @@ -95,7 +96,7 @@ probe-setup #ports 0 ?do \ For each port - i portsc@ 2 and if \ Connection changed + i port-changed? if \ Connection changed \ i rm-obsolete-children \ Remove obsolete device nodes i probe-root-hub-port \ Probe it else @@ -154,58 +155,36 @@ open-count 0= if free-dma-buf unmap-regs then ; -: .occupied ( port -- ) ." USB 2.0 port " u. ." in use" cr ; : regs{ ( -- prev ) ehci-reg dup 0= if map-regs then ; : }regs ( prev -- ) 0= if unmap-regs then ; -: fisheye ( -- ) - regs{ - #testable-ports 0 ?do - i port-connected? if - i .occupied - else - ." Fisheye pattern out to USB 2.0 port " i u. cr - i test-port-begin - d# 2,000 ms - i test-port-end - 0 i portsc! i reset-port i power-port - then - loop - }regs -; - -: thorough ( -- error? ) - #testable-ports 0 ?do - i port-connected? if - i .occupied - else - ." Please connect a device to USB port " i u. cr - i wait-connect if true unloop exit then - then - loop - false -; - -: sagacity ( -- error? ) +: selftest ( -- error? ) + open 0= if true exit then #testable-ports 0 ?do - ." USB port " i u. ." ... " + ." USB port " i u. ." : " i port-connected? if - i wait-connect if true unloop exit then + ." In use - " + i .usb-device cr else - ." Empty" cr + diagnostic-mode? if + ." Please connect a device" cr + i wait-connect if true unloop exit then + i .usb-device cr + else + fisheye? if + ." Fisheye pattern" cr + i test-port-begin + d# 2,000 ms + i test-port-end + 0 i portsc! i reset-port i power-port + else + ." Empty" cr + then + then then loop false -; - -: selftest ( -- error? ) - regs{ ( prev ) - diagnostic-mode? if - thorough - else - sagacity - then ( prev error? ) - swap }regs ( error? ) + close ; headers Modified: dev/usb2/hcd/hcd.fth ============================================================================== --- dev/usb2/hcd/hcd.fth Tue Nov 20 02:49:48 2012 (r3443) +++ dev/usb2/hcd/hcd.fth Tue Nov 20 23:27:07 2012 (r3444) @@ -116,12 +116,15 @@ \ " rm-usb-children" $find if execute else 3drop then \ ; +false instance value fisheye? + : parse-my-args ( -- ) my-args begin dup while ascii , left-parse-string ( rem$' opt$ ) 2dup " debug" $= if debug-on then 2dup " noprobe" $= if true to noprobe? then + 2dup " fisheye" $= if true to fisheye? then 2drop ( rem$ ) repeat ( rem$ ) 2drop ( ) Modified: dev/usb2/hcd/probehub.fth ============================================================================== --- dev/usb2/hcd/probehub.fth Tue Nov 20 02:49:48 2012 (r3443) +++ dev/usb2/hcd/probehub.fth Tue Nov 20 23:27:07 2012 (r3444) @@ -195,24 +195,31 @@ ." Get-port-status failed for hub port " r@ u. cr r> drop true exit ( -- true ) then ( ) + ." Hub port " r@ u. ." : " ( ) hub-buf c@ 8 and if \ Connected ( ) - ." Hub port " r@ u. ." in over current" cr + ." In over current" cr ( ) r> drop true exit ( -- true ) then ( ) hub-buf c@ 1 and if \ Connected ( ) - ." Hub port " r@ u. ." in use" cr ( ) + ." In use - " ( ) + r@ .usb-device cr ( ) else ( ) diagnostic-mode? if ( ) - ." Please connect a device to USB hub port " r@ u. cr ( ) - r@ wait-hub-connect if r> drop true exit then ( ) - else ( ) - ." Fisheye pattern out to USB hub port " r@ u. cr ( ) - r@ 4 test-hub-port ( ) - d# 2,000 ms ( ) - r@ untest-hub-port ( ) - r@ reset-hub-port r@ power-hub-port ( ) - then ( ) - then ( ) + ." Please connect a device" cr ( ) + r@ wait-hub-connect if r> drop true exit then ( ) + r@ .usb-device cr ( ) + else ( ) + " fisheye?" $call-parent if ( ) + ." Fisheye pattern" cr ( ) + r@ 4 test-hub-port ( ) + d# 2,000 ms ( ) + r@ untest-hub-port ( ) + r@ reset-hub-port r@ power-hub-port ( ) + else ( ) + ." Empty" cr ( ) + then ( ) + then ( ) + then ( ) r> drop false ;

1 0

[commit] r3443 - cpu/arm/olpc
by repository service Nov. 20, 2012

Nov. 20, 2012

Author: quozl Date: Tue Nov 20 02:49:48 2012 New Revision: 3443 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3443 Log: OLPC XO-4 - touchscreen firmware programming, fix INCREDIBLE slowness problem #12327 by following TI specification, convert progress bar to using hex file byte position instead of load address, since load address is outside our control. Modified: cpu/arm/olpc/bsl.fth Modified: cpu/arm/olpc/bsl.fth ============================================================================== --- cpu/arm/olpc/bsl.fth Mon Nov 19 23:37:03 2012 (r3442) +++ cpu/arm/olpc/bsl.fth Tue Nov 20 02:49:48 2012 (r3443) @@ -86,6 +86,14 @@ [then] \ These are MMP2/3 dependent +\ Section 1.4 of TI slau319c.pdf says to wait 1.2 ms after receiving a +\ character from MSP430 BSL prior to sending a new character. +0 value bsl-time +: set-bsl-time ( -- ) + \ MMP2 Timer 0 runs at 6.5 MHz so 1.2 ms is 1200 * 13 / 2 ticks + timer0@ [ d# 1200 d# 13 2 */ ] literal + to bsl-time +; +: wait-send ( -- ) begin timer0@ bsl-time - 0>= until ; : bsl-baud ( baud-rate -- ) \ 9600,8,e,1 uart-base >r ( baud-rate r: uart-base ) @@ -96,11 +104,14 @@ r> to uart-base ( ) ; -: bsl-send ( char -- ) uart-base >r bsl-uart-base to uart-base uemit r> to uart-base ; +: bsl-send ( char -- ) + wait-send + uart-base >r bsl-uart-base to uart-base uemit r> to uart-base +; : receive? ( -- false | char true ) uart-base >r bsl-uart-base to uart-base - ukey? if ukey true else false then + ukey? if ukey true set-bsl-time else false then r> to uart-base ; @@ -116,6 +127,7 @@ touch-tck-gpio# gpio-dir-out d# 9600 bsl-baud + set-bsl-time ; : bsl-close ( -- ) touch-rst-gpio# gpio-dir-in @@ -144,7 +156,7 @@ : flush-bsl get-msecs d# 2000 + ( limit ) begin - receive? 0= if drop exit then ( limit char ) + receive? 0= if drop exit then ( limit char ) drop dup get-msecs - 0< ( limit timeout? ) until drop true abort" BSL flush timeout" @@ -224,7 +236,6 @@ defer bsl-progress ' 2drop is bsl-progress ( offset size -- ) : rx-data-block ( adr len device-adr -- ) - dup h# 8000 - h# 8000 bsl-progress over h# 12 frame( ( adr len device-adr ) send-summed ( adr len ) \ device address dup send-summed ( adr len ) \ data length @@ -491,6 +502,7 @@ force-erase ( ) ." Programming" cr begin ( ) + ifd @ ftell ifd @ fsize bsl-progress [char] . emit bsl-line-buf d# 100 ifd @ read-line abort" Read line failed" while ( len )

1 0

[commit] r3442 - dev/olpc/kb3700
by repository service Nov. 19, 2012

Nov. 19, 2012

Author: quozl Date: Mon Nov 19 23:37:03 2012 New Revision: 3442 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3442 Log: OLPC - report NiMH battery cooling status bit Modified: dev/olpc/kb3700/batstat.fth Modified: dev/olpc/kb3700/batstat.fth ============================================================================== --- dev/olpc/kb3700/batstat.fth Sat Nov 17 05:20:25 2012 (r3441) +++ dev/olpc/kb3700/batstat.fth Mon Nov 19 23:37:03 2012 (r3442) @@ -107,6 +107,7 @@ dup h# 20 and if ." charging " then dup h# 40 and if ." discharging " then dup h# 80 and if ." trickle " then + dup h# 100 and if ." cooling " then else ." No battery " then

1 0

[commit] r3441 - in cpu: arm/olpc x86/pc/olpc
by repository service Nov. 17, 2012

Nov. 17, 2012

Author: quozl Date: Sat Nov 17 05:20:25 2012 New Revision: 3441 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3441 Log: OLPC - use additional graphical indicators for different reflash operations, yellow dots for EC, and plus signs for touchscreen Modified: cpu/arm/olpc/build-fw.fth cpu/x86/pc/olpc/gui.fth Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Sat Nov 17 04:10:07 2012 (r3440) +++ cpu/arm/olpc/build-fw.fth Sat Nov 17 05:20:25 2012 (r3441) @@ -861,13 +861,13 @@ update-ec-flash? if ['] ?enough-power catch ?dup if ( error ) - show-no-power - .error - ." Skipping EC reflash, not enough power" cr - d# 1000 ms + show-no-power + .error + ." Skipping EC reflash, not enough power" cr + d# 1000 ms else - jots ['] jot to edi-progress - update-ec-flash + jots-ec ['] jot to edi-progress + update-ec-flash then then [ifdef] update-nn-flash? @@ -881,7 +881,7 @@ ." Skipping NN reflash, not enough power" cr d# 1000 ms else - jots ['] jot to bsl-progress + jots-nn ['] jot to bsl-progress update-nn-flash then then Modified: cpu/x86/pc/olpc/gui.fth ============================================================================== --- cpu/x86/pc/olpc/gui.fth Sat Nov 17 04:10:07 2012 (r3440) +++ cpu/x86/pc/olpc/gui.fth Sat Nov 17 05:20:25 2012 (r3441) @@ -404,14 +404,6 @@ prep-565 4drop to dot-adr ( ) ; -: jots ( -- ) \ bottom left corner, chip and progress dots - d# 25 d# 772 set-icon-xy " spi" show-icon - bar-x-last bar-y set-icon-xy " yellowdot" show-icon - read-dot - -1 to last-dot# - bar-x-last bar-x - #dots / to dot-spacing -; - : jot ( offset size -- ) dot-adr 0= if 2drop exit then ( offset size ) #dots swap */ ( dot# ) @@ -426,6 +418,29 @@ then ; +: jots-init + d# 25 d# 772 set-icon-xy " spi" show-icon + -1 to last-dot# + bar-x-last bar-x - #dots / to dot-spacing +; + +: jots-bracket ( icon$ -- ) + d# 20 d# 800 set-icon-xy 2dup show-icon \ left and above + d# 20 d# 857 set-icon-xy 2dup show-icon \ left and below + d# 120 d# 857 set-icon-xy 2dup show-icon \ right and below + d# 120 d# 800 set-icon-xy show-icon \ right and above +; + +: jots-prep ( -- ) + bar-x-last bar-y set-icon-xy " yellowdot" show-icon + read-dot +; + +\ bottom left corner, chip and progress dots +: jots jots-init jots-prep ; +: jots-nn jots-init " plus" jots-bracket jots-prep ; +: jots-ec jots-init " yellowdot" jots-bracket jots-prep ; + 0 [if] : test-jots-flash \ XO-4 B1 13ms page jots t( /flash 0 do i /flash jot /flash-page +loop )t

1 0