openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2573 - in cpu/arm: mmp2 olpc/1.75
by repository service 04 Oct '11

04 Oct '11

Author: wmb Date: Tue Oct 4 02:42:45 2011 New Revision: 2573 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2573 Log: OLPC XO-1.75 - trac #11095 - implemented lid switch power-off. Modified: cpu/arm/mmp2/timer.fth cpu/arm/olpc/1.75/switches.fth Modified: cpu/arm/mmp2/timer.fth ============================================================================== --- cpu/arm/mmp2/timer.fth Tue Oct 4 02:05:46 2011 (r2572) +++ cpu/arm/mmp2/timer.fth Tue Oct 4 02:42:45 2011 (r2573) @@ -168,8 +168,13 @@ then ; code wfi ( -- ) wfi c; + +defer do-lid +: lid-off ( -- ) ['] noop to do-lid ; +lid-off + : safe-idle ( -- ) can-idle? if wfi then - \ do-lid + do-lid ; ' safe-idle to stdin-idle Modified: cpu/arm/olpc/1.75/switches.fth ============================================================================== --- cpu/arm/olpc/1.75/switches.fth Tue Oct 4 02:05:46 2011 (r2572) +++ cpu/arm/olpc/1.75/switches.fth Tue Oct 4 02:42:45 2011 (r2573) @@ -36,6 +36,39 @@ ['] all-switch-states catch ; +false value lid-already-down? +0 value lid-down-time +d# 10000 constant lid-shutdown-ms +d# 2000 constant lid-warning-ms +0 value lid-warned? + +: ?lid-shutdown ( -- ) + lid? if + lid-already-down? if + get-msecs lid-down-time - ( ms ) + + dup lid-warning-ms >= lid-warned? 0= and if + ." Lid switch is active - Powering off in 8 seconds" cr + ." Type lid-off to disable this function" cr + true to lid-warned? + then ( ms ) + + lid-shutdown-ms >= if + ." Powering off after 10 seconds of lid down" cr + power-off + then + else + get-msecs to lid-down-time + true to lid-already-down? + then + else + false to lid-already-down? + false to lid-warned? + then +; +: lid-on ( -- ) ['] ?lid-shutdown to do-lid ; +' lid-on to do-lid + end-package \ LICENSE_BEGIN

1 0

[commit] r2572 - cpu/arm/olpc/1.75 dev ofw/wifi
by repository service 04 Oct '11

04 Oct '11

Author: wmb Date: Tue Oct 4 02:05:46 2011 New Revision: 2572 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2572 Log: OLPC XO-1.75 - WLAN and LED selftest - reduced the overhead of the association test part of the WLAN selftest, and eliminated the console scanning messages that occur during the WLAN LED selftest. Modified: cpu/arm/olpc/1.75/leds.fth dev/libertas.fth ofw/wifi/eapol.fth Modified: cpu/arm/olpc/1.75/leds.fth ============================================================================== --- cpu/arm/olpc/1.75/leds.fth Mon Oct 3 23:36:09 2011 (r2571) +++ cpu/arm/olpc/1.75/leds.fth Tue Oct 4 02:05:46 2011 (r2572) @@ -19,7 +19,7 @@ ols-led-ec-control ols-assy-mode-on - " /wlan" test-dev " /wlan" test-dev \ Twice for longer flashing + " /wlan:quiet" test-dev " /wlan:quiet" test-dev \ Twice for longer flashing d# 20 0 do hdd-led-on d# 100 ms hdd-led-off d# 100 ms loop ols-assy-mode-off Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Mon Oct 3 23:36:09 2011 (r2571) +++ dev/libertas.fth Tue Oct 4 02:05:46 2011 (r2572) @@ -1865,11 +1865,14 @@ \ Normal operation should have force-open? be false. false instance value force-open? +false instance value quiet? + : parse-args ( $ -- ) false to use-promiscuous? begin ?dup while ascii , left-parse-string 2dup " debug" $= if debug-on then + 2dup " quiet" $= if true to quiet? then \ Used by LED selftest 2dup " promiscuous" $= if true to use-promiscuous? then " force" $= if true to force-open? then repeat drop @@ -2088,9 +2091,8 @@ : reset ( -- flag ) reset-nic ; -: test-association ( -- error? ) - passive-scan - " OLPCOFW" " scan-ssid?" $call-supplicant if +: test-association ( adr len -- error? ) + " OLPCOFW" " select-ssid?" $call-supplicant if " (do-associate)" $call-supplicant if \ Success " target-mac$" $call-supplicant disassociate @@ -2103,7 +2105,6 @@ \ There is no OLPCOFW access point, so we don't try associating false then - active-scan ; : (scan-wifi) ( -- error? ) @@ -2123,9 +2124,15 @@ ." ERROR: No access points seen" cr true then - else ( adr len ) - drop .ssids ( ) - test-association ( error? ) + else ( adr len ) + \ Quiet mode is for the benefit of the LEDs test, so we can flash + \ the WLAN LEDS without distracting messages appearing on the screen + quiet? if ( adr len ) + 2drop false ( error? ) + else + over .ssids ( adr len ) + test-association ( error? ) + then ( error? ) then then Modified: ofw/wifi/eapol.fth ============================================================================== --- ofw/wifi/eapol.fth Mon Oct 3 23:36:09 2011 (r2571) +++ ofw/wifi/eapol.fth Tue Oct 4 02:05:46 2011 (r2572) @@ -581,7 +581,7 @@ swap /string ( adr' len' ) ( R: ie-type ) r> (find-ie) ( adr' len' true | false ) ; -: find-ssid ( ssid$ adr -- adr' true | false ) +: find-ssid ( ssid$ scanbuf-adr -- ap-adr' true | false ) false swap ( ssid$ flag adr ) dup 3 + ( ssid$ flag 'ap ) swap 2 + c@ ( ssid$ flag 'ap #ap ) @@ -725,7 +725,7 @@ kt-wep of wep-ok? endof ( default ) pmk-ok? swap endcase - dup if ." found" else ." Keys in wifi-cfg are not valid" then cr + dup 0= if ." Keys in wifi-cfg are not valid - " then ; h# 0050.f201 constant wpa-tag @@ -777,19 +777,36 @@ valid? 0= or ; +: (select-ssid?) ( ssid$ -- found? ) + scanbuf find-ssid 0= if false exit then ( ap-adr ) + init-common-rates ( ap-adr ) + ssid-valid? 0= if false exit then ( ) + true valid! ( ) + report-associate-info ( ) + true ( found? ) +; +: select-ssid? ( volatile-scanbuf-adr,len ssid$ -- found? ) + ssid! ( volatile-scanbuf$ ) + dup /buf > if ( volatile-scanbuf$ ) + ." Scan buffer too long" cr ( volatile-scanbuf$ ) + 2drop false exit ( -- found? ) + then ( volatile-scanbuf$ ) + scanbuf swap move ( ) + ssid$ (select-ssid?) ( found? ) +; + : scan-ssid? ( ssid$ -- found? ) - dup 0= if 2drop false exit then - ssid! - ssid$ " set-ssid" $call-parent - ??cr ." Scan for: " ssid$ type space - scanbuf /buf scan 0= if ." not found" cr false exit then - debug? if scanbuf .scan then - ssid$ scanbuf find-ssid 0= if ." not found" cr false exit then - init-common-rates - ssid-valid? 0= if exit then - true valid! - report-associate-info - true + dup 0= if 2drop false exit then ( ssid$ ) + ssid! ( ) + ssid$ " set-ssid" $call-parent ( ) + ??cr ." Scan for: " ssid$ type space ( ) + scanbuf /buf scan if ( ) + debug? if scanbuf .scan then ( ) + ssid$ (select-ssid?) ( found? ) + dup if ." found" else ." failed" then cr + else ( ) + ." not found" cr false ( found? ) + then ( found? ) ; : try-scan ( -- okay? ) wifi-ssid$ scan-ssid? if true exit then

1 0

[commit] r2571 - cpu/arm/olpc/1.75
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:36:09 2011 New Revision: 2571 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2571 Log: OLPC XO-1.75 - Removed some redundant code. Modified: cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Mon Oct 3 23:27:28 2011 (r2570) +++ cpu/arm/olpc/1.75/devices.fth Mon Oct 3 23:36:09 2011 (r2571) @@ -4,26 +4,8 @@ \ h# 30000 +io to uart-base \ UART1 base address on MMP2 d# 26000000 to uart-clock-frequency -: init-clocks - -1 h# 51024 io! \ PMUM_CGR_PJ - everything on - h# 07 h# 15064 io! \ APBC_AIB_CLK_RST - reset, functional and APB clock on - h# 03 h# 15064 io! \ APBC_AIB_CLK_RST - release reset, functional and APB clock on - h# 13 h# 1502c io! \ APBC_UART1_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) - h# 13 h# 15034 io! \ APBC_UART3_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) - h# c1 h# 1e0c8 io! \ GPIO29 = af1 for UART1 RXD - h# c1 h# 1e0cc io! \ GPIO30 = af1 for UART1 TXD - h# c4 h# 1e260 io! \ GPIO115 = af4 for UART3 RXD - h# c4 h# 1e264 io! \ GPIO116 = af4 for UART3 TXD -; - -: inituarts ( -- ) - init-clocks - - h# 40 1 uart! \ Marvell-specific UART Enable bit - 3 3 uart! \ 8 bits, no parity - 7 2 uart! \ Clear and enable FIFOs - d# 115200 baud -; +\ CForth has already set up the serial port +: inituarts ( -- ) ; fload ${BP}/forth/lib/sysuart.fth \ Set console I/O vectors to UART

1 0

[commit] r2570 - cpu/arm/mmp2 dev/olpc/kb3700
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:27:28 2011 New Revision: 2570 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2570 Log: OLPC XO-1.75 - Use apbc! instead of explict numeric address. Modified: cpu/arm/mmp2/devices.fth cpu/arm/mmp2/keypad.fth cpu/arm/mmp2/mfpr.fth cpu/arm/mmp2/spimaster.fth cpu/arm/mmp2/thermal.fth dev/olpc/kb3700/spicmd.fth Modified: cpu/arm/mmp2/devices.fth ============================================================================== --- cpu/arm/mmp2/devices.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/devices.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -3,13 +3,13 @@ d# 26000000 to uart-clock-frequency : init-clocks - -1 h# 051024 io! \ PMUM_CGR_PJ - everything on - h# 07 h# 015064 io! \ APBC_AIB_CLK_RST - reset, functional and APB clock on - h# 03 h# 015064 io! \ APBC_AIB_CLK_RST - release reset, functional and APB clock on - h# 13 h# 015034 io! \ APBC_UART3_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) - h# c1 h# 01e120 io! \ GPIO51 = af1 for UART3 RXD - h# c1 h# 01e124 io! \ GPIO52 = af1 for UART3 TXD - h# 1b h# 282854 io! \ SD0 clocks + -1 h# 1024 mpmu! \ PMUM_CGR_PJ - everything on + h# 07 h# 64 apbc! \ APBC_AIB_CLK_RST - reset, functional and APB clock on + h# 03 h# 64 apbc! \ APBC_AIB_CLK_RST - release reset, functional and APB clock on + h# 13 h# 34 apbc! \ APBC_UART3_CLK_RST - VCTCXO, functional and APB clock on (26 mhz) + h# c1 d# 51 af! \ GPIO51 = af1 for UART3 RXD + h# c1 d# 51 af! \ GPIO52 = af1 for UART3 TXD + h# 1b h# 54 pmua! \ SD0 clocks ; : inituarts ( -- ) Modified: cpu/arm/mmp2/keypad.fth ============================================================================== --- cpu/arm/mmp2/keypad.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/keypad.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -2,8 +2,8 @@ purpose: Driver for Armada 610/MMP2 keypad controller : keypad-on ( -- ) - 5 h# 015018 io! \ Clock on with reset asserted - 1 h# 015018 io! \ Clock on, release reset + 5 h# 18 apbc! \ Clock on with reset asserted + 1 h# 18 apbc! \ Clock on, release reset 1 ms ; : kp! ( n offset -- ) h# 012000 + io! ; Modified: cpu/arm/mmp2/mfpr.fth ============================================================================== --- cpu/arm/mmp2/mfpr.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/mfpr.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -1,8 +1,8 @@ purpose: Pin multiplexing for ARMADA 610 chip (no board details) : aib-unlock - h# baba h# 015068 io! \ Unlock sequence - h# eb10 h# 01506c io! + h# baba h# 68 apbc! \ Unlock sequence + h# eb10 h# 6c apbc! ; : acgr-clocks-on ( -- ) h# 0818.F33C acgr-pa io! \ Turn on all clocks Modified: cpu/arm/mmp2/spimaster.fth ============================================================================== --- cpu/arm/mmp2/spimaster.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/spimaster.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -39,10 +39,10 @@ enable ; -: ssp1-clk-on 7 h# 015050 io! 3 h# 015050 io! ; -\ : ssp2-clk-on 7 h# 015054 io! 3 h# 015052 io! ; -\ : ssp3-clk-on 7 h# 015058 io! 3 h# 015058 io! ; -\ : ssp4-clk-on 7 h# 01505c io! 3 h# 01505c io! ; +: ssp1-clk-on 7 h# 50 apbc! 3 h# 50 apbc! ; +\ : ssp2-clk-on 7 h# 54 apbc! 3 h# 52 apbc! ; +\ : ssp3-clk-on 7 h# 58 apbc! 3 h# 58 apbc! ; +\ : ssp4-clk-on 7 h# 5c apbc! 3 h# 5c apbc! ; : wb ( byte -- ) ssp-ssdr rl! ; : rb ( -- byte ) ssp-ssdr rl@ . ; Modified: cpu/arm/mmp2/thermal.fth ============================================================================== --- cpu/arm/mmp2/thermal.fth Mon Oct 3 23:17:21 2011 (r2569) +++ cpu/arm/mmp2/thermal.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -4,8 +4,8 @@ h# 013200 value thermal-base : init-thermal-sensor ( -- ) thermal-base io@ h# 400 and if exit then - 3 h# 015090 io! \ Enable clocks to thermal sensor - h# 10000 thermal-base io! \ Enable sensing + 7 h# 90 apbc! 3 h# 90 apbc! \ Enable clocks to thermal sensor + h# 10000 thermal-base io! \ Enable sensing ; \ thermal watchdog is enabled by CForth Modified: dev/olpc/kb3700/spicmd.fth ============================================================================== --- dev/olpc/kb3700/spicmd.fth Mon Oct 3 23:17:21 2011 (r2569) +++ dev/olpc/kb3700/spicmd.fth Mon Oct 3 23:27:28 2011 (r2570) @@ -114,10 +114,10 @@ enable ; -\ : ssp1-clk-on 7 h# 015050 io! 3 h# 015050 io! ; -\ : ssp2-clk-on 7 h# 015054 io! 3 h# 015052 io! ; -: ssp3-clk-on 7 h# 015058 io! 3 h# 015058 io! ; -\ : ssp4-clk-on 7 h# 01505c io! 3 h# 01505c io! ; +\ : ssp1-clk-on 7 h# 50 apbc! 3 h# 50 apbc! ; +\ : ssp2-clk-on 7 h# 54 apbc! 3 h# 52 apbc! ; +: ssp3-clk-on 7 h# 58 apbc! 3 h# 58 apbc! ; +\ : ssp4-clk-on 7 h# 5c apbc! 3 h# 5c apbc! ; : wb ( byte -- ) ssp-ssdr rl! ; \ Debugging tool : rb ( -- byte ) ssp-ssdr rl@ . ; \ Debugging tool

1 0

[commit] r2569 - dev
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:17:21 2011 New Revision: 2569 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2569 Log: Libertas WLAN driver - access ssid-reset? in a way that works both from FCode and hard-compiled. Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Mon Oct 3 23:16:03 2011 (r2568) +++ dev/libertas.fth Mon Oct 3 23:17:21 2011 (r2569) @@ -2094,7 +2094,7 @@ " (do-associate)" $call-supplicant if \ Success " target-mac$" $call-supplicant disassociate - true to ssid-reset? + " true to ssid-reset?" ['] evaluate catch if 2drop then false else true

1 0

[commit] r2568 - cpu/arm/mmp2
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:16:03 2011 New Revision: 2568 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2568 Log: OLPC 1.75 - fixed error in currently-unused code introduced by a recent change. Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Mon Oct 3 23:13:33 2011 (r2567) +++ cpu/arm/mmp2/dramrecal.fth Mon Oct 3 23:16:03 2011 (r2568) @@ -151,8 +151,8 @@ mov pc,r1 c; -: apbc-clr-rst ( offset -- ) +apbc 4 swap io-clr ; -: apbc-set-rst ( offset -- ) +apbc 4 swap io-set ; +: apbc-clr-rst ( offset -- ) 4 swap +apbc io-clr ; +: apbc-set-rst ( offset -- ) 4 swap +apbc io-set ; : disable-apbc-clks ( -- ) \ 3 h# 38 +apbc io-clr \ GPIO @@ -570,10 +570,10 @@ h# b0 d# 15 af! \ Wake SP on rotate key h# 220 d# 71 af! \ Wake SP on KBD CLK falling edge h# 221 d# 160 af! \ Wake SP on TPD CLK falling edge - h# 4c +mpmu h# 20.0000 io-set \ Keypress wakes SP + h# 20.0000 h# 4c +mpmu io-set \ Keypress wakes SP ['] disable-int40 d# 40 interrupt-handler! d# 40 enable-interrupt \ SP to PJ4 communications interrupt - 1 h# 29.00cc 1 io-clr \ Unmask the inter-processor communications interrupt + 1 h# 29.00cc io-clr \ Unmask the inter-processor communications interrupt ; : breadcrumb ( n -- ) h# d000.0110 l! ;

1 0

[commit] r2567 - in cpu/arm: mmp2 olpc/1.75
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 23:13:33 2011 New Revision: 2567 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2567 Log: OLPC XO-1.75 - Added suspend/resume test to "test /memory", cleaning up rtc.fth in the process. Modified: cpu/arm/mmp2/dramrecal.fth cpu/arm/mmp2/rtc.fth cpu/arm/olpc/1.75/probemem.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Mon Oct 3 22:57:06 2011 (r2566) +++ cpu/arm/mmp2/dramrecal.fth Mon Oct 3 23:13:33 2011 (r2567) @@ -296,7 +296,6 @@ 1 swap lshift and 0<> ( flag ) ; -: icu@ ( offset -- value ) h# 28.2000 + io@ ; : .masked ( irq# -- ) dup /l* h# 10c + icu@ ( irq# masked ) 1 and if ( irq# ) @@ -571,10 +570,10 @@ h# b0 d# 15 af! \ Wake SP on rotate key h# 220 d# 71 af! \ Wake SP on KBD CLK falling edge h# 221 d# 160 af! \ Wake SP on TPD CLK falling edge - h# 4c mpmu@ h# 20.0000 or h# 4c mpmu! \ Keypress wakes SP + h# 4c +mpmu h# 20.0000 io-set \ Keypress wakes SP ['] disable-int40 d# 40 interrupt-handler! d# 40 enable-interrupt \ SP to PJ4 communications interrupt - h# 2900cc io@ 1 invert and h# 2900cc io! \ Unmask the communications interrupt + 1 h# 29.00cc 1 io-clr \ Unmask the inter-processor communications interrupt ; : breadcrumb ( n -- ) h# d000.0110 l! ; Modified: cpu/arm/mmp2/rtc.fth ============================================================================== --- cpu/arm/mmp2/rtc.fth Mon Oct 3 22:57:06 2011 (r2566) +++ cpu/arm/mmp2/rtc.fth Mon Oct 3 23:13:33 2011 (r2567) @@ -1,96 +1,34 @@ +\ See license at end of file purpose: Driver for MMP2 internal RTC -\ This code was written as a test/demonstration of using -\ the MMP2 internal RTC to generate alarm interrupts. -\ It is not currently used by anything, and should it -\ ever be needed, it should be put in a device node. +\ Interrupt 5 combines two interrupt inputs, RTC INT (bit 1) and RTC ALARM (bit 0) +: int5-mask ( -- offset ) h# 16c +icu ; +: int5-status@ ( -- value ) h# 154 icu@ ; -: int5-mask! ( value -- ) h# 28.216c io! ; -: int5-mask@ ( -- value ) h# 28.216c io@ ; -: int5-status@ ( -- value ) h# 28.2154 io@ ; -: enable-rtc ( -- ) h# 81 h# 01.5000 io! ; +: enable-rtc ( -- ) h# 81 0 apbc! ; \ Turn on the clock for the internal RTC : enable-rtc-wakeup ( -- ) - h# 004c mpmu@ h# 2.0010 or h# 004c mpmu! - h# 104c mpmu@ h# 2.0010 or h# 104c mpmu! + h# 2.0010 h# 104c +mpmu io-set ; : soc-rtc@ ( offset -- value ) h# 01.0000 + io@ ; : soc-rtc! ( value offset -- value ) h# 01.0000 + io! ; : cancel-alarm ( -- ) 0 8 soc-rtc! - int5-mask@ 1 or int5-mask! \ Mask alarm + 1 int5-mask io-set \ Mask alarm ; -: take-alarm ( -- ) - ." Alarm fired" cr - cancel-alarm -; -: alarm-in-3 ( -- ) - enable-rtc \ Turn on clocks - - int5-mask@ 1 invert and int5-mask! \ Unmask alarm - enable-rtc-wakeup - 0 soc-rtc@ d# 3 + 4 soc-rtc! \ Set alarm for 3 seconds from now - 7 8 soc-rtc! \ Ack old interrupts and enable new ones - ['] take-alarm 5 interrupt-handler! - 5 enable-interrupt -; -: alarm-in-1 ( -- ) - enable-rtc \ Turn on clocks - - int5-mask@ 1 invert and int5-mask! \ Unmask alarm - enable-rtc-wakeup - 0 soc-rtc@ d# 1 + 4 soc-rtc! \ Set alarm for 3 seconds from now - 7 8 soc-rtc! \ Ack old interrupts and enable new ones - ['] cancel-alarm 5 interrupt-handler! - 5 enable-interrupt -; -: wake1 ( -- ) - enable-rtc \ Turn on clocks - - int5-mask@ 1 invert and int5-mask! \ Unmask alarm - enable-rtc-wakeup - 0 soc-rtc@ d# 2 + 4 soc-rtc! \ Set alarm for 2 seconds from now - 7 8 soc-rtc! \ Ack old interrupts and enable new ones - ['] cancel-alarm 5 interrupt-handler! - 5 enable-interrupt -; -: alarm1 ( -- ) - enable-rtc \ Turn on clocks +: take-alarm ( -- ) ." Alarm fired" cr cancel-alarm ; +: rtc-wake ( handler-xt #seconds -- ) + enable-rtc ( handler-xt #seconds ) \ Turn on clocks - int5-mask@ 1 invert and int5-mask! \ Unmask alarm - enable-rtc-wakeup - 0 soc-rtc@ d# 1 + 4 soc-rtc! \ Set alarm for 3 seconds from now - 7 8 soc-rtc! \ Ack old interrupts and enable new ones - ['] take-alarm 5 interrupt-handler! - 5 enable-interrupt -; -: test1 - 0 - begin - alarm1 - str - (cr dup . 1+ - d# 500 ms - key? until -; -: test2 - 0 - begin - wake1 - str - (cr dup . 1+ - d# 500 ms - key? until -; -: test3 - 0 - begin - wake1 - str - cr dup . 1+ - d# 500 ms - key? until -; -: test4 + 1 int5-mask io-clr ( handler-xt #seconds ) \ Unmask alarm + enable-rtc-wakeup ( handler-xt #seconds ) + 0 soc-rtc@ + 4 soc-rtc! ( handler-xt ) \ Set alarm for 2 seconds from now + 7 8 soc-rtc! ( handler-xt ) \ Ack old interrupts and enable new ones + 5 interrupt-handler! ( ) + 5 enable-interrupt ( ) +; +: wake1 ( -- ) ['] cancel-alarm 1 rtc-wake ; +: alarm-in-3 ( -- ) ['] take-alarm 3 rtc-wake ; +: wakeup-loop ( -- ) d# 1000000 0 do 0 d# 13 at-xy i .d 5 0 do @@ -101,11 +39,47 @@ loop 5 +loop ; +alias test4 wakeup-loop -\ test3 -\ wake1 str cr - -\ patch noop cr take-alarm test1 -\ patch (cr cr take-alarm test1 +: s3-selftest ( -- error? ) + \ The general failure mode here is that it won't wake up, so + \ it's hard to return a real error code. We just have to rely + \ on the operator. + ." Testing suspend/resume" cr + ." Sleeping for 3 seconds .. " d# 100 ms + ec-rst-pwr ['] cancel-alarm 3 rtc-wake str ec-max-pwr ( power ) + \ Negative power is consumed from battery, positive is supplied to battery + dup d# -250 < if ( power ) + ." System used too much power during suspend - " negate .d ." mW" cr ( ) + true ( error? ) + else ( power ) + drop false ( error? ) + then ( error? ) +; +dev /memory +[ifdef] test-s3 ' s3-selftest to test-s3 [then] +dend -\ : cx cr d# 400 ms ; patch cx cr take-alarm test1 +\ LICENSE_BEGIN +\ Copyright (c) 2011 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: cpu/arm/olpc/1.75/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Mon Oct 3 22:57:06 2011 (r2566) +++ cpu/arm/olpc/1.75/probemem.fth Mon Oct 3 23:13:33 2011 (r2567) @@ -60,6 +60,8 @@ [then] : .chunk ( adr len -- ) ." Testing address 0x" swap 8u.h ." length 0x" 8u.h cr ; +defer test-s3 ( -- error? ) ' false is test-s3 + : test-mem ( adr len -- ) \ Test a chunk 'o memory 2>r 2r@ 0 mem-claim to p-adr ( ) ( r: adr len ) @@ -101,12 +103,12 @@ 2dup .chunk ( adr len this-len r: this-padr ) test-mem ( adr len ) mem-fail? if ( adr len ) - 2drop true exit ( -- error ) + 2drop true exit ( -- error? ) then ( adr len ) repeat ( adr len ) 2drop ( ) - mem-fail? + test-s3 ( error? ) ; device-end

1 0

[commit] r2566 - cpu/arm/mmp2
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 22:57:06 2011 New Revision: 2566 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2566 Log: Added license text to a file. Modified: cpu/arm/mmp2/socregs.fth Modified: cpu/arm/mmp2/socregs.fth ============================================================================== --- cpu/arm/mmp2/socregs.fth Mon Oct 3 22:56:16 2011 (r2565) +++ cpu/arm/mmp2/socregs.fth Mon Oct 3 22:57:06 2011 (r2566) @@ -25,3 +25,27 @@ : apbc@ ( offset -- l ) +apbc io@ ; : apbc! ( l offset -- ) +apbc io! ; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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] r2565 - in cpu/arm: mmp2 olpc/1.75
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 22:56:16 2011 New Revision: 2565 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2565 Log: OLPC XO-1.75 - Moved register access words for SoC-level cross-function registers into a separate file. Added: cpu/arm/mmp2/socregs.fth Modified: cpu/arm/olpc/1.75/prefw.bth Added: cpu/arm/mmp2/socregs.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/socregs.fth Mon Oct 3 22:56:16 2011 (r2565) @@ -0,0 +1,27 @@ +\ See license at end of file +purpose: Register access words for MMP2 registers used by many functional units + +: +io ( offset -- va ) io-va + ; +: io! ( value offset -- ) +io l! ; +: io@ ( offset -- value ) +io l@ ; + +: +apbc ( offset -- io-offset ) h# 01.5000 + ; \ APB Clock Unit +: +pmua ( offset -- io-offset ) h# 28.2800 + ; \ CPU Power Management Unit +: +mpmu ( offset -- io-offset ) h# 05.0000 + ; \ Main Power Management Unit +: +scu ( offset -- io-offset ) h# 28.2c00 + ; \ System Control Unit +: +icu ( offset -- io-offset ) h# 28.2000 + ; \ Interrupt Controller Unit + +: io-set ( mask offset -- ) dup io@ rot or swap io! ; +: io-clr ( mask offset -- ) dup io@ rot invert and swap io! ; + +: icu@ ( offset -- value ) +icu io@ ; +: icu! ( value offset -- ) +icu io! ; + +: mpmu@ ( offset -- l ) +mpmu io@ ; +: mpmu! ( l offset -- ) +mpmu io! ; + +: pmua@ ( offset -- l ) +pmua io@ ; +: pmua! ( l offset -- ) +pmua io! ; + +: apbc@ ( offset -- l ) +apbc io@ ; +: apbc! ( l offset -- ) +apbc io! ; Modified: cpu/arm/olpc/1.75/prefw.bth ============================================================================== --- cpu/arm/olpc/1.75/prefw.bth Mon Oct 3 18:44:20 2011 (r2564) +++ cpu/arm/olpc/1.75/prefw.bth Mon Oct 3 22:56:16 2011 (r2565) @@ -163,26 +163,7 @@ fload ${BP}/forth/lib/selstr.fth -\ : +io ( offset -- va ) io-va + ; -: +io ( offset -- va ) dup h# 0040.0000 >= if debug-me then io-va + ; -: io! ( value offset -- ) +io l! ; -: io@ ( offset -- value ) +io l@ ; - -: +apbc ( offset -- io-offset ) h# 01.5000 + ; -: +pmua ( offset -- io-offset ) h# 28.2800 + ; -: +mpmu ( offset -- io-offset ) h# 05.0000 + ; -: +scu ( offset -- io-offset ) h# 28.2c00 + ; -: +icu ( offset -- io-offset ) h# 28.2000 + ; - -: io-set ( mask offset -- ) dup io@ rot or swap io! ; -: io-clr ( mask offset -- ) dup io@ rot invert and swap io! ; - - -: mpmu@ ( offset -- l ) +mpmu io@ ; -: mpmu! ( l offset -- ) +mpmu io! ; - -: pmua@ ( offset -- l ) +pmua io@ ; -: pmua! ( l offset -- ) +pmua io! ; +fload ${BP}/cpu/arm/mmp2/socregs.fth \ MMP2 registers used by many functional units fload ${BP}/cpu/arm/mmp2/hash.fth \ Hashes - SHA1, SHA-256, MD5 fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation

1 0

[commit] r2564 - cpu/x86/pc/olpc/via
by repository service 03 Oct '11

03 Oct '11

Author: wmb Date: Mon Oct 3 18:44:20 2011 New Revision: 2564 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2564 Log: XO-1.5 - fixed a stack comment in probemem.fth; no functional change. Modified: cpu/x86/pc/olpc/via/probemem.fth Modified: cpu/x86/pc/olpc/via/probemem.fth ============================================================================== --- cpu/x86/pc/olpc/via/probemem.fth Sat Oct 1 21:53:08 2011 (r2563) +++ cpu/x86/pc/olpc/via/probemem.fth Mon Oct 3 18:44:20 2011 (r2564) @@ -105,7 +105,7 @@ then ( rem$ ) repeat 2drop ( ) - test-s3 ( ) + test-s3 ( error? ) ; device-end

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware