diff options
| author | Aseda Aboagye <aaboagye@google.com> | 2020-03-16 14:16:23 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-03-17 00:50:55 +0000 |
| commit | f270fc5d420c54fd26579fe7d5c7ce2bf0ddd936 (patch) | |
| tree | ec803e1edc59eb29ba54bc98dbce9b36b70cd973 /power | |
| parent | 20188601a1cd3b4be8a89f4e3b3ef812fb619545 (diff) | |
| download | chrome-ec-f270fc5d420c54fd26579fe7d5c7ce2bf0ddd936.tar.gz | |
power/icelake: Transition to G3 when S5 fails
This commit fixes a bug where we were forcefully setting the chipset
state to G3 instead of transitioning to G3 from our failed S5 attempt.
This was causing an issue where we had turned on some power rails in
trying to reach S5, but when reaching S5 failed, we "assumed" G3 and
therefore skipped turning off the rails we had enabled.
BUG=b:151479266
BRANCH=hatch
TEST=Build and flash on waddledoo that isn't booting to S0. Verify that
PP3300_A and PP5000_U are turned off when the sequencing fails and that
DPWROK is not asserted after the failure.
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: Ic7af003270c239088b4364e82783aae56a45fa33
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2106372
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Auto-Submit: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/icelake.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/power/icelake.c b/power/icelake.c index fadfb8d3a6..2d177dd14f 100644 --- a/power/icelake.c +++ b/power/icelake.c @@ -276,8 +276,8 @@ enum power_state power_handle_state(enum power_state state) */ if (power_wait_signals_timeout(IN_PCH_SLP_SUS_DEASSERTED, IN_PCH_SLP_SUS_WAIT_TIME_USEC) != EC_SUCCESS) { - CPRINTS("SLP_SUS_L didn't go high! Assuming G3."); - return POWER_G3; + CPRINTS("SLP_SUS_L didn't go high! Going back to G3."); + return POWER_S5G3; } break; |