summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVic Yang <victoryang@chromium.org>2013-05-27 07:26:02 +0800
committerChromeBot <chrome-bot@google.com>2013-05-28 12:54:02 -0700
commit5d66f23d216aad16b4b908cd10b206cc2f230eb0 (patch)
tree0d026dfe0311d2c49ebe923b7f7eec32adf1002b
parenteb18f65941265b4c71a256a7610c36416df10032 (diff)
downloadchrome-ec-5d66f23d216aad16b4b908cd10b206cc2f230eb0.tar.gz
spring: Keep system power on sysjump
If the AP is already on, the kernel should handle low-power event. We shouldn't power off the system on sysjump. BUG=chrome-os-partner:18318 TEST=None BRANCH=spring Change-Id: I4e80c61a25d2fa503d0c97e22dc2f4ad9c44f716 Signed-off-by: Vic Yang <victoryang@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/56706 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
-rw-r--r--common/gaia_power.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/common/gaia_power.c b/common/gaia_power.c
index 856210fff2..b0589a84f9 100644
--- a/common/gaia_power.c
+++ b/common/gaia_power.c
@@ -546,10 +546,13 @@ static int wait_for_power_on(void)
}
#ifdef HAS_TASK_CHARGER
- if (charge_keep_power_off()) {
+ /*
+ * If the system is already on (value == 1), the kernel
+ * would handle low power condition and we should not
+ * shutdown the system from EC.
+ */
+ if (value != 1 && charge_keep_power_off()) {
CPRINTF("[%T power on ignored due to low battery]\n");
- if (value == 1) /* System already on */
- power_off();
continue;
}
#endif