Changeset 3358

Timestamp:

Oct 11, 2012 12:12:48 AM (7 months ago)

Author:

rsmith

Message:

OLPC ARM: Update strp so it gets a valid suspend power reading

Use the ec-sus-pwr command rather than ec-max-pwr for getting the
power when the host is in suspend. ec-sus-pwr only takes a reading if
the EC thinks the host is in suspend.
Even with that a more delay was required for the time spent in
suspend than what wake1 was providing. The EC only samples the gauge
every 100ms and the gauge itself only updates every 88ms. Wake1 was
setting up a 1 second rtc wakeup but by the time the host actually
makes it into suspend the EC didn't have enough time left to get a
good consistent reading.
This patch makes a wake2 with a 2 second target and updates the
suspend test to use it.

Location:

cpu/arm

Files:

• mmp2/rtc.fth (modified) (2 diffs)
• olpc/4.0/ec-version.fth (modified) (1 diff)
• olpc/suspend.fth (modified) (1 diff)

cpu/arm/mmp2/rtc.fth

@@ -41 +41 @@
 ;
 : wake1  ( -- )  ['] cancel-alarm 1 rtc-wake  ;
+: wake2  ( -- )  ['] cancel-alarm 2 rtc-wake  ;
 : alarm-in-3  ( -- )  ['] take-alarm 3 rtc-wake  ;
 : wakeup-loop  ( -- )
@@ -47 +48 @@
       5 0  do
          cr i .
-         wake1  strp
+         wake2  strp
          d# 500 ms
          key? if unloop unloop exit  then

cpu/arm/olpc/4.0/ec-version.fth

@@ -1 +1 @@
 \ The EC microcode
 macro: EC_PLATFORM cl4
-macro: EC_VERSION 7_0_2_02
+macro: EC_VERSION 7_0_2_03
 
 \ Alternate command for getting EC microcode, for testing new versions.

cpu/arm/olpc/suspend.fth

@@ -216 +216 @@
 ;
 
-: strp  ( -- )  ec-rst-pwr  str  ec-max-pwr .d ." mW " soc .%  space  ;
+: strp  ( -- )  ec-rst-pwr  str  ec-sus-pwr .d ." mW " soc .%  space  ;