diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 17:30:07 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:52:05 +0000 |
| commit | 6b6198063344d96f2f957a0d2346ae5e05e30283 (patch) | |
| tree | f947bc89be3284bbd2b3d936c1776890413d865e | |
| parent | 1ff6bd60f692e8900f82a449b9fe7b1299d24581 (diff) | |
| download | chrome-ec-6b6198063344d96f2f957a0d2346ae5e05e30283.tar.gz | |
Revert "system: Allow hibernate to clear AP_OFF flag"
This reverts commit 23149261dc4a9429a1c98aa829e02d4a3ec5103a.
BUG=b:200823466
TEST=make buildall -j
Change-Id: Ie27d454c485e9f2341bac9320b3ad629b96efe50
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273440
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
| -rw-r--r-- | common/system.c | 8 | ||||
| -rw-r--r-- | include/ec_commands.h | 3 | ||||
| -rw-r--r-- | include/system.h | 3 |
3 files changed, 2 insertions, 12 deletions
diff --git a/common/system.c b/common/system.c index b2982b12d0..47b53e352e 100644 --- a/common/system.c +++ b/common/system.c @@ -856,14 +856,6 @@ static int handle_pending_reboot(enum ec_reboot_cmd cmd) system_disable_jump(); return EC_SUCCESS; #ifdef CONFIG_HIBERNATE - case EC_REBOOT_HIBERNATE_CLEAR_AP_OFF: -#ifdef CONFIG_POWER_BUTTON_INIT_IDLE - CPRINTS("Clearing AP_OFF"); - chip_save_reset_flags( - chip_read_reset_flags() & - ~EC_RESET_FLAG_AP_OFF); -#endif - /* Intentional fall-through */ case EC_REBOOT_HIBERNATE: CPRINTS("system hibernating"); system_hibernate(0, 0); diff --git a/include/ec_commands.h b/include/ec_commands.h index 0f4cfb67cf..d01e629df7 100644 --- a/include/ec_commands.h +++ b/include/ec_commands.h @@ -4929,8 +4929,7 @@ enum ec_reboot_cmd { /* (command 3 was jump to RW-B) */ EC_REBOOT_COLD = 4, /* Cold-reboot */ EC_REBOOT_DISABLE_JUMP = 5, /* Disable jump until next reboot */ - EC_REBOOT_HIBERNATE = 6, /* Hibernate EC */ - EC_REBOOT_HIBERNATE_CLEAR_AP_OFF = 7, /* and clears AP_OFF flag */ + EC_REBOOT_HIBERNATE = 6 /* Hibernate EC */ }; /* Flags for ec_params_reboot_ec.reboot_flags */ diff --git a/include/system.h b/include/system.h index df29e16669..59604b0964 100644 --- a/include/system.h +++ b/include/system.h @@ -14,9 +14,8 @@ #include "console.h" #include "timer.h" -/* Per chip implementation to save/read raw EC_RESET_FLAG_ flags. */ +/* Per chip implementation to save raw EC_RESET_FLAG_ flags. */ void chip_save_reset_flags(int flags); -uint32_t chip_read_reset_flags(void); /* System images */ enum system_image_copy_t { |