summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWai-Hong Tam <waihong@google.com>2020-08-10 15:38:02 -0700
committerCommit Bot <commit-bot@chromium.org>2020-08-11 04:25:57 +0000
commit76d37a8137e8585e01e99db1764c12f8d1ceb3a7 (patch)
tree8038bbd077f5c9170731acf06836bff538f9573a
parent9b0b66a699ff0a6af1d0c8b10b3551fc37b9c588 (diff)
downloadchrome-ec-76d37a8137e8585e01e99db1764c12f8d1ceb3a7.tar.gz
sc7180: Fix the S3 state check
Should use the CHIPSET_STATE_SUSPEND to check if it is in S3, instead of CHIPSET_STATE_STANDBY, which is actually the S0ix state. BRANCH=None BUG=b:148149387 TEST=Hached to make EC in S3 and then trigger AP warm reset. Noticed the the CHIPSET_RESET_HOOK triggered and entered the if clause. > [90.811712 power state 2 = S3, in 0x001c] [90.812383 power state 2 = S3, in 0x001d] [90.867572 power state 2 = S3, in 0x001e] [90.944061 power state 2 = S3, in 0x001c] [90.944957 power state 2 = S3, in 0x001d] [91.000530 power state 2 = S3, in 0x001e] [91.101117 power state 2 = S3, in 0x001c] [91.101785 power state 2 = S3, in 0x001d] [91.156711 power state 2 = S3, in 0x001e] [91.157318 Chipset reset: exit s3] [91.157659 Handle sleep: 0] 12 signal changes: 90.811621 +0.000000 PS_HOLD => 0 90.812012 +0.000391 AP_RST_L => 0 90.867371 +0.055359 AP_RST_L => 1 90.867483 +0.000112 PS_HOLD => 1 90.943970 +0.076487 PS_HOLD => 0 90.944357 +0.000387 AP_RST_L => 0 91.000328 +0.055971 AP_RST_L => 1 91.000441 +0.000113 PS_HOLD => 1 91.100809 +0.100368 PS_HOLD => 0 91.101183 +0.000374 AP_RST_L => 0 91.156510 +0.055327 AP_RST_L => 1 91.156623 +0.000113 PS_HOLD => 1 Change-Id: I8a3f2fec7e7c0ca784d5d742e5e9352fa019b18e Signed-off-by: Wai-Hong Tam <waihong@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2346601 Reviewed-by: Stephen Boyd <swboyd@chromium.org>
-rw-r--r--power/sc7180.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/power/sc7180.c b/power/sc7180.c
index 69c64206d4..aa62c20ca2 100644
--- a/power/sc7180.c
+++ b/power/sc7180.c
@@ -858,7 +858,7 @@ static void power_reset_host_sleep_state(void)
static void handle_chipset_reset(void)
{
- if (chipset_in_state(CHIPSET_STATE_STANDBY)) {
+ if (chipset_in_state(CHIPSET_STATE_SUSPEND)) {
CPRINTS("Chipset reset: exit s3");
power_reset_host_sleep_state();
task_wake(TASK_ID_CHIPSET);