summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTing Shen <phoenixshen@google.com>2021-10-06 16:22:24 +0800
committerCommit Bot <commit-bot@chromium.org>2021-10-12 04:06:36 +0000
commit0c0797019c370affe03d8265c5fb9ab541ed4984 (patch)
treec7a1c0bd0cc8e671bb8f49f214f71f842128aa56
parenteeb5d0d332c8c762fab1b79afd2f187f88c12621 (diff)
downloadchrome-ec-0c0797019c370affe03d8265c5fb9ab541ed4984.tar.gz
power/mt8192: set correct initial power state for EFS2
In EFS2, the boot flow happens in RW, so we should not set power state to S0 by default. BUG=b:185726892 TEST=1. Verify AP bootable and able to update EC-RW in following scenarios: a. old RW b. corrupted (not-bootable) RW 2. DISABLE_EC_SOFTWARE_SYNC vboot flag works. 3. manual sysjump won't reboot AP. BRANCH=main Signed-off-by: Ting Shen <phoenixshen@google.com> Change-Id: Ic088a1ccf80fc49424cc1eeb3ff7b946836e5b68 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3207813 Reviewed-by: Eric Yilun Lin <yllin@google.com> Commit-Queue: Ting Shen <phoenixshen@chromium.org> Tested-by: Ting Shen <phoenixshen@chromium.org>
-rw-r--r--power/mt8192.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/power/mt8192.c b/power/mt8192.c
index 323994faea..f1c8e994c1 100644
--- a/power/mt8192.c
+++ b/power/mt8192.c
@@ -207,7 +207,8 @@ enum power_state power_chipset_init(void)
gpio_enable_interrupt(GPIO_AP_EC_WARM_RST_REQ);
gpio_enable_interrupt(GPIO_AP_IN_SLEEP_L);
- if (system_get_reset_flags() & EC_RESET_FLAG_SYSJUMP) {
+ if (system_get_reset_flags() & EC_RESET_FLAG_SYSJUMP &&
+ !IS_ENABLED(CONFIG_VBOOT_EFS2)) {
if ((power_get_signals() & IN_ALL_S0) == IN_ALL_S0) {
disable_sleep(SLEEP_MASK_AP_RUN);
power_signal_enable_interrupt(GPIO_AP_EC_WATCHDOG_L);