diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2020-08-18 16:46:07 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-08-18 21:47:04 +0000 |
| commit | bc932aea929e058ab7561fc341fbea59d18240a0 (patch) | |
| tree | 5c2d5c0849b818f57da510c0da44708f658f7c10 | |
| parent | d75d74f27e526d2b6ac4f3ef972cc744d89c14ab (diff) | |
| download | chrome-ec-bc932aea929e058ab7561fc341fbea59d18240a0.tar.gz | |
Revert "power: Don't boot after waking up from hibernation"
This reverts commit 8db6eb89540a0ca72e29633ffbfd1eac10d6ad6a.
Reason for revert: See chromium:1073960
Original change's description:
> power: Don't boot after waking up from hibernation
>
> When a device shuts down and is idle for 60 mins (configurable), EC
> enters hibernation. When an AC adapter is plugged, the system boots.
> This is not expected behavior and not consistent with the behavior
> that the system stays off on AC plug-in before hibernation.
>
> This patch fixes the above inconsistency by storing AP_OFF flag before
> entering hibernation after 60 mins idle in S5.
>
> Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
>
> BUG=chromium:1073960
> BRANCH=none
> TEST=Verified Bloog stays off after waking up from hibernation on
> AC plug-in.
>
> Change-Id: I097bee97164284dd4c35f8bf9389c76319fd676a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2176555
> Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
> Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
> Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
> Auto-Submit: Daisuke Nojiri <dnojiri@chromium.org>
Bug: chromium:1073960
Change-Id: I2792dd6d868118ffcba533a3cdb5195cc7d71b76
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2363099
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Auto-Submit: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | power/common.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/power/common.c b/power/common.c index 2dab633ef1..8806c9a3b6 100644 --- a/power/common.c +++ b/power/common.c @@ -440,12 +440,6 @@ static enum power_state power_common_state(enum power_state state) &target, now)) { case CRITICAL_SHUTDOWN_HIBERNATE: CPRINTS("Hibernate due to G3 idle"); - if (IS_ENABLED(CONFIG_VBOOT_EFS2)) { - uint32_t reset_flags; - reset_flags = chip_read_reset_flags() | - EC_RESET_FLAG_AP_OFF; - chip_save_reset_flags(reset_flags); - } system_hibernate(0, 0); break; #ifdef CONFIG_BATTERY_CUT_OFF |