diff options
| author | Vic Yang <victoryang@google.com> | 2015-01-06 16:12:07 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-08 00:37:56 +0000 |
| commit | 9fa9307567fd03ad059723ac64bbbb796469c865 (patch) | |
| tree | 7bfa5a40ae480bb92d669f5d81dfad99272a33b6 /power/tegra.c | |
| parent | d16df875f11b0b5b2b2cdda271bd8934e85b50f7 (diff) | |
| download | chrome-ec-9fa9307567fd03ad059723ac64bbbb796469c865.tar.gz | |
tegra: Preserve sleep mask on sysjump
If we sysjump while the AP is running, the AP_RUN sleep mask should be
preserved. Otherwise, the EC goes into low power idle while the AP is
still up.
BRANCH=Ryu
BUG=chrome-os-partner:34230
TEST=Without this change, bit 0 becomes 0 after a sysjump. With this, it
doesn't.
Change-Id: I55cecff3275402f7974c6078a9c203bafce2a2f9
Signed-off-by: Vic Yang <victoryang@google.com>
Reviewed-on: https://chromium-review.googlesource.com/238918
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>
Commit-Queue: Vic Yang <victoryang@chromium.org>
Diffstat (limited to 'power/tegra.c')
| -rw-r--r-- | power/tegra.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/power/tegra.c b/power/tegra.c index 8b3c3c766a..5efd41e61d 100644 --- a/power/tegra.c +++ b/power/tegra.c @@ -265,10 +265,13 @@ enum power_state power_chipset_init(void) init_power_state = POWER_G3; } else { /* In the SYSJUMP case, we check if the AP is on */ - if (power_get_signals() & IN_XPSHOLD) + if (power_get_signals() & IN_XPSHOLD) { init_power_state = POWER_S0; - else + disable_sleep(SLEEP_MASK_AP_RUN); + } else { init_power_state = POWER_G3; + enable_sleep(SLEEP_MASK_AP_RUN); + } } /* Leave power off only if requested by reset flags */ |