October 2011 - openfirmware - mail.coreboot.org

[commit] r2588 - cpu/arm cpu/arm/mmp2 cpu/mips cpu/x86 cpu/x86/build cpu/x86/pc ofw/core ofw/fcode
by repository service Oct. 11, 2011

Oct. 11, 2011

Author: wmb Date: Tue Oct 11 20:17:44 2011 New Revision: 2588 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2588 Log: Added a FirmWorks-specific extension FCode "us" for microsecond-granularity delays. Modified: cpu/arm/getms.fth cpu/arm/mmp2/timer.fth cpu/mips/getms.fth cpu/x86/acpitimer.fth cpu/x86/build/builder.dic cpu/x86/pc/getms.fth cpu/x86/tsc.fth ofw/core/ofwcore.fth ofw/fcode/extcodes.fth Modified: cpu/arm/getms.fth ============================================================================== --- cpu/arm/getms.fth Tue Oct 11 20:09:09 2011 (r2587) +++ cpu/arm/getms.fth Tue Oct 11 20:17:44 2011 (r2588) @@ -22,7 +22,8 @@ c; : 1ms ( -- ) ms-factor spins ; -: us ( #microseconds -- ) us-factor * spins ; +: (us) ( #microseconds -- ) us-factor * spins ; +' (us) to us : (ms) ( #ms -- ) dup ms/tick 3 * u> interrupts-enabled? and if ( #ms ) Modified: cpu/arm/mmp2/timer.fth ============================================================================== --- cpu/arm/mmp2/timer.fth Tue Oct 11 20:09:09 2011 (r2587) +++ cpu/arm/mmp2/timer.fth Tue Oct 11 20:17:44 2011 (r2588) @@ -92,13 +92,14 @@ ; ' (ms) to ms -: us ( delay-us -- ) +: (us) ( delay-us -- ) d# 13 2 */ timer0@ + ( limit ) begin ( limit ) dup timer0@ - ( limit delta ) 0< until ( limit ) drop ; +' (us) to us \ Timing tools variable timestamp Modified: cpu/mips/getms.fth ============================================================================== --- cpu/mips/getms.fth Tue Oct 11 20:09:09 2011 (r2587) +++ cpu/mips/getms.fth Tue Oct 11 20:17:44 2011 (r2588) @@ -24,7 +24,8 @@ begin dup count@ - 0<= until \ Loop until target time reached drop ( ) ; -: us ( #microseconds -- ) us-factor * ticks ; +: (us) ( #microseconds -- ) us-factor * ticks ; +' (us) to us : (ms) ( #ms -- ) dup ms/tick 3 * u> ticks-enabled? and if ( #ms ) Modified: cpu/x86/acpitimer.fth ============================================================================== --- cpu/x86/acpitimer.fth Tue Oct 11 20:09:09 2011 (r2587) +++ cpu/x86/acpitimer.fth Tue Oct 11 20:17:44 2011 (r2588) @@ -24,7 +24,7 @@ ; [ifdef] use-acpi-delays -: us ( us -- ) acpi-us ; +' acpi-us to us ' acpi-ms to ms [then] Modified: cpu/x86/build/builder.dic ============================================================================== Binary file (source and/or target). No diff available. Modified: cpu/x86/pc/getms.fth ============================================================================== --- cpu/x86/pc/getms.fth Tue Oct 11 20:09:09 2011 (r2587) +++ cpu/x86/pc/getms.fth Tue Oct 11 20:17:44 2011 (r2588) @@ -40,7 +40,8 @@ c; : 1ms ( -- ) ms-factor spins ; -: us ( #microseconds -- ) us-factor * spins ; +: (us) ( #microseconds -- ) us-factor * spins ; +' (us) to us : (ms) ( #ms -- ) dup ms/tick 3 * u> interrupts-enabled? and if ( #ms ) Modified: cpu/x86/tsc.fth ============================================================================== --- cpu/x86/tsc.fth Tue Oct 11 20:09:09 2011 (r2587) +++ cpu/x86/tsc.fth Tue Oct 11 20:17:44 2011 (r2588) @@ -33,7 +33,8 @@ ' (get-msecs) to get-msecs : 1ms ( -- ) ms-factor spins ; -: us ( #microseconds -- ) us-factor * spins ; +: (us) ( #microseconds -- ) us-factor * spins ; +' (us) to us [ifdef] use-timestamp-counter : (ms) ( #ms -- ) 0 ?do 1ms loop ; Modified: ofw/core/ofwcore.fth ============================================================================== --- ofw/core/ofwcore.fth Tue Oct 11 20:09:09 2011 (r2587) +++ ofw/core/ofwcore.fth Tue Oct 11 20:17:44 2011 (r2588) @@ -100,6 +100,7 @@ d# 10 value ms/tick defer get-msecs ( -- n ) ' 0 is get-msecs defer ms ( n -- ) ' drop is ms +defer us ( n -- ) ' drop is us \ Enabling/disabling interrupts Modified: ofw/fcode/extcodes.fth ============================================================================== --- ofw/fcode/extcodes.fth Tue Oct 11 20:09:09 2011 (r2587) +++ ofw/fcode/extcodes.fth Tue Oct 11 20:17:44 2011 (r2588) @@ -12,3 +12,5 @@ vfw 076 2 byte-code: $instructions ( name$ -- ) vfw 077 2 byte-code: instructions-done ( -- ) vfw 078 2 byte-code: instructions-idle ( -- ) + +vfw 079 2 byte-code: us ( -- )

1 0

[commit] r2587 - cpu/arm/mmp2 cpu/arm/olpc/1.75 cpu/x86/pc/olpc dev
by repository service Oct. 11, 2011

Oct. 11, 2011

Author: wmb Date: Tue Oct 11 20:09:09 2011 New Revision: 2587 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2587 Log: OLPC - changed the names of device methods "suspend" and "resume" to "sleep" and "wake", thus eliminating a name conflict with the global "resume" command - makes debugging easier. Modified: cpu/arm/mmp2/dramrecal.fth cpu/arm/olpc/1.75/lcd.fth cpu/arm/olpc/1.75/usb.fth cpu/x86/pc/olpc/wlantest.fth dev/libertas.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Mon Oct 10 18:35:23 2011 (r2586) +++ cpu/arm/mmp2/dramrecal.fth Tue Oct 11 20:09:09 2011 (r2587) @@ -681,7 +681,7 @@ else " dcon-suspend" $call-screen then - " suspend" $call-screen + " sleep" $call-screen " set-ack" $call-ec \ 0 h# 54 pmua! \ Kill the SDIO 0 clocks - insignificant savings @@ -690,18 +690,18 @@ sleep-mask 4 and if wlan-stay-on else - " /wlan" " suspend" execute-device-method drop + " /wlan" " sleep" execute-device-method drop wlan-power-off then \ saves 100 mW ; : screen-on ( -- ) sleep-mask 4 and 0= if wlan-power-on - " /wlan" " resume" execute-device-method drop + " /wlan" " wake" execute-device-method drop then sleep-mask 2 and 0= if keyboard-power-on then " clr-ack" $call-ec - " resume" $call-screen + " wake" $call-screen sleep-mask 1 and if \ DCON power up dcon-unfreeze else Modified: cpu/arm/olpc/1.75/lcd.fth ============================================================================== --- cpu/arm/olpc/1.75/lcd.fth Mon Oct 10 18:35:23 2011 (r2586) +++ cpu/arm/olpc/1.75/lcd.fth Tue Oct 11 20:09:09 2011 (r2587) @@ -214,12 +214,12 @@ flush-cursor-bits ( ) ; 0 value saved-mode -: suspend ( -- ) +: sleep ( -- ) h# 190 lcd@ to saved-mode 0 h# 190 lcd! lcd-clocks-off ; -: resume ( -- ) +: wake ( -- ) lcd-clocks-on saved-mode h# 190 lcd! ; Modified: cpu/arm/olpc/1.75/usb.fth ============================================================================== --- cpu/arm/olpc/1.75/usb.fth Mon Oct 10 18:35:23 2011 (r2586) +++ cpu/arm/olpc/1.75/usb.fth Tue Oct 11 20:09:09 2011 (r2587) @@ -22,8 +22,8 @@ \ Port 3 is left \ Port 4 is right lower " 3,4,2" " usb-hub-test-list" string-property - : suspend ( -- ) true to first-open? ; - : resume ( -- ) ; + : sleep ( -- ) true to first-open? ; + : wake ( -- ) ; end-package \ Turn on USB power after a delay, to ensure that USB devices are reset correctly on boot @@ -126,7 +126,7 @@ : suspend-usb ( -- ) detach-usb-keyboard - " /usb" " suspend" execute-device-method drop + " /usb" " sleep" execute-device-method drop ; : has-children? ( devspec$ -- flag ) locate-device if false else child 0<> then @@ -134,7 +134,7 @@ : any-usb-devices? ( -- flag ) " /usb/hub" has-children? ; : resume-usb ( -- ) init-usb - " /usb" " resume" execute-device-method drop + " /usb" " wake" execute-device-method drop any-usb-devices? if d# 2000 ms \ USB misses devices if you probe too soon then Modified: cpu/x86/pc/olpc/wlantest.fth ============================================================================== --- cpu/x86/pc/olpc/wlantest.fth Mon Oct 10 18:35:23 2011 (r2586) +++ cpu/x86/pc/olpc/wlantest.fth Tue Oct 11 20:09:09 2011 (r2587) @@ -19,7 +19,7 @@ begin " /wlan" open-dev >r " autostart" r@ $call-method - " sleep" r@ $call-method + " host-sleep-activate" r@ $call-method r> close-dev 5 ms s Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Mon Oct 10 18:35:23 2011 (r2586) +++ dev/libertas.fth Tue Oct 11 20:09:09 2011 (r2587) @@ -604,8 +604,8 @@ ds-not-ready to driver-state reset-host-bus ; -: suspend ( -- ) reset-wlan ; -: resume ( -- ) ; +: sleep ( -- ) reset-wlan ; +: wake ( -- ) ; : marvel-get-hw-spec ( -- true | adr false ) d# 38 h# 03 ( CMD_GET_HW_SPEC ) prepare-cmd @@ -1731,7 +1731,6 @@ : unicast-wakeup ( -- ) wake-on-unicast host-sleep-config ; : broadcast-wakeup ( -- ) wake-on-unicast wake-on-broadcast or host-sleep-config ; -: sleep ( -- ) host-sleep-activate ; [ifdef] notdef CMD_ACT_MESH_...

1 0

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

Oct. 10, 2011

Author: wmb Date: Mon Oct 10 18:35:23 2011 New Revision: 2586 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2586 Log: OLPC trac 11315 - pass a null cmdline to Linux in secure mode, paving the way for Linux to be responsible for its own non-optional settings. Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Fri Oct 7 22:21:02 2011 (r2585) +++ cpu/x86/pc/olpc/security.fth Mon Oct 10 18:35:23 2011 (r2586) @@ -1231,7 +1231,7 @@ 2drop ( ) ['] secure-load-ramdisk to load-ramdisk " init-program" $find if - set-cmdline +\ set-cmdline execute sound-end go

1 0

[commit] r2585 - dev/geode/ac97
by repository service Oct. 7, 2011

Oct. 7, 2011

Author: wmb Date: Fri Oct 7 22:21:02 2011 New Revision: 2585 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2585 Log: OLPC XO-1 - trac #11311 - Fix audio in Linux by leaving the Geode's AC97 device enabled and responsive on the PCI bus, instead of turning it off. Modified: dev/geode/ac97/ac97.fth Modified: dev/geode/ac97/ac97.fth ============================================================================== --- dev/geode/ac97/ac97.fth Wed Oct 5 02:52:45 2011 (r2584) +++ dev/geode/ac97/ac97.fth Fri Oct 7 22:21:02 2011 (r2585) @@ -40,7 +40,9 @@ ; : unmap-regs ( -- ) au /chipbase " map-out" $call-parent - 0 4 my-w! + \ Don't turn off the command register; it breaks Linux due to a complex interaction + \ with emulated PCI registers on Geode. + \ 0 4 my-w! ; : dma-alloc ( size -- virt ) " dma-alloc" $call-parent ;

1 0

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

Oct. 5, 2011

Author: wmb Date: Wed Oct 5 02:52:45 2011 New Revision: 2584 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2584 Log: Q4B11 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 Wed Oct 5 02:49:00 2011 (r2583) +++ cpu/arm/olpc/1.75/fw-version.fth Wed Oct 5 02:52:45 2011 (r2584) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 10 +macro: FW_MINOR 11

1 0

[commit] r2583 - cpu/arm/mmp2 dev
by repository service Oct. 5, 2011

Oct. 5, 2011

Author: wmb Date: Wed Oct 5 02:49:00 2011 New Revision: 2583 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2583 Log: OLPC XO-1.75 - trac #11300 - WLAN now works after suspend/resume. Previously, it worked after suspend/resume only if it had not been opened prior to suspend. Modified: cpu/arm/mmp2/dramrecal.fth dev/libertas.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Wed Oct 5 02:47:39 2011 (r2582) +++ cpu/arm/mmp2/dramrecal.fth Wed Oct 5 02:49:00 2011 (r2583) @@ -687,10 +687,18 @@ \ 0 h# 54 pmua! \ Kill the SDIO 0 clocks - insignificant savings \ 0 h# 58 pmua! \ Kill the SDIO 1 clocks - insignificant savings sleep-mask 2 and 0= if keyboard-power-off then \ Should save about 17 mW - sleep-mask 4 and if wlan-stay-on else wlan-power-off then \ saves 100 mW + sleep-mask 4 and if + wlan-stay-on + else + " /wlan" " suspend" execute-device-method drop + wlan-power-off + then \ saves 100 mW ; : screen-on ( -- ) - sleep-mask 4 and 0= if wlan-power-on then + sleep-mask 4 and 0= if + wlan-power-on + " /wlan" " resume" execute-device-method drop + then sleep-mask 2 and 0= if keyboard-power-on then " clr-ack" $call-ec " resume" $call-screen Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Wed Oct 5 02:47:39 2011 (r2582) +++ dev/libertas.fth Wed Oct 5 02:49:00 2011 (r2583) @@ -604,6 +604,8 @@ ds-not-ready to driver-state reset-host-bus ; +: suspend ( -- ) reset-wlan ; +: resume ( -- ) ; : marvel-get-hw-spec ( -- true | adr false ) d# 38 h# 03 ( CMD_GET_HW_SPEC ) prepare-cmd

1 0

[commit] r2582 - cpu/arm/olpc
by repository service Oct. 5, 2011

Oct. 5, 2011

Author: wmb Date: Wed Oct 5 02:47:39 2011 New Revision: 2582 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2582 Log: OLPC XO-1.75 - change the loop structure in put-data to make it easier to debug. Modified: cpu/arm/olpc/spcmd.fth Modified: cpu/arm/olpc/spcmd.fth ============================================================================== --- cpu/arm/olpc/spcmd.fth Wed Oct 5 02:09:47 2011 (r2581) +++ cpu/arm/olpc/spcmd.fth Wed Oct 5 02:47:39 2011 (r2582) @@ -141,11 +141,12 @@ : put-data ( byte -- ) get-msecs d# 100 + ( byte time-limit ) begin ( byte time-limit ) + h# c4 reg@ 7 and ( byte time-limit flag ) + while ( byte time-limit ) dup get-msecs - 0< if ( byte time-limit ) 2drop exit ( -- ) then ( byte time-limit ) - h# c4 reg@ 7 and 0= ( byte time-limit flag ) - until ( byte time-limit ) + repeat ( byte time-limit ) drop ( byte ) port# bwjoin h# 40 reg! ( ) ;

1 0

[commit] r2581 - cpu/arm/mmp2
by repository service Oct. 5, 2011

Oct. 5, 2011

Author: wmb Date: Wed Oct 5 02:09:47 2011 New Revision: 2581 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2581 Log: OLPC XO-1.75 - trac #11299 - made trackpad (mouse) work after suspend/resume by not resetting the APBC_MPMU clock. Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Wed Oct 5 02:00:46 2011 (r2580) +++ cpu/arm/mmp2/dramrecal.fth Wed Oct 5 02:09:47 2011 (r2581) @@ -161,7 +161,7 @@ 3 h# 90 +apbc io-clr \ THSENS1 \ h# 38 apbc-set-rst - h# 74 apbc-set-rst \ MPMU + \ h# 74 apbc-set-rst \ MPMU - resetting this kills TIMER2, used by the SP PS/2 h# 78 apbc-set-rst \ IPC h# 90 apbc-set-rst \ THSENS1 ;

1 0

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

Oct. 5, 2011

Author: wmb Date: Wed Oct 5 02:00:46 2011 New Revision: 2580 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2580 Log: OLPC XO-1.75 - touchscreen driver selftest display formatting (added a cr). Modified: cpu/arm/olpc/1.75/rm3150-touchscreen.fth Modified: cpu/arm/olpc/1.75/rm3150-touchscreen.fth ============================================================================== --- cpu/arm/olpc/1.75/rm3150-touchscreen.fth Wed Oct 5 00:28:02 2011 (r2579) +++ cpu/arm/olpc/1.75/rm3150-touchscreen.fth Wed Oct 5 02:00:46 2011 (r2580) @@ -252,7 +252,7 @@ : selftest ( -- error? ) open 0= if \ ." Touchscreen open failed" true exit - ." No touchscreen present" false exit + ." No touchscreen present" cr false exit then \ Being able to open the touchpad is good enough in SMT mode

1 0

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

Oct. 4, 2011

Author: wmb Date: Wed Oct 5 00:28:02 2011 New Revision: 2579 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2579 Log: OLPC XO-1.75 - trac #11292 - touchscreen absence - the usual case - is not reported as a selftest error. Modified: cpu/arm/olpc/1.75/rm3150-touchscreen.fth Modified: cpu/arm/olpc/1.75/rm3150-touchscreen.fth ============================================================================== --- cpu/arm/olpc/1.75/rm3150-touchscreen.fth Wed Oct 5 00:21:03 2011 (r2578) +++ cpu/arm/olpc/1.75/rm3150-touchscreen.fth Wed Oct 5 00:28:02 2011 (r2579) @@ -251,7 +251,8 @@ : selftest ( -- error? ) open 0= if - ." Touchscreen open failed" true exit +\ ." Touchscreen open failed" true exit + ." No touchscreen present" false exit then \ Being able to open the touchpad is good enough in SMT mode

1 0