summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaveh Jalali <caveh@chromium.org>2020-10-07 02:43:22 -0700
committerCommit Bot <commit-bot@chromium.org>2020-10-13 13:57:19 +0000
commit449221a82b6bb789bcb279169a0daffcf0c57a1d (patch)
treec0e011fec8fef48447526c533a3aa59d6ce883a1
parentacc9ba3fab24b3e6a75cc962be9c7f99d034c2a5 (diff)
downloadchrome-ec-stabilize-13532.B-master.tar.gz
npcx: allow hibernate timeout when LCT is availablestabilize-13532.B-master
The npcx9 supports LCT (long countdown timers). When enabled, hibernate can wake up using the LCT module. BRANCH=none BUG=b:144427579,b:165777478 TEST=verified error message is present on volteer but not on npcx9_evb binary. Signed-off-by: Caveh Jalali <caveh@chromium.org> Change-Id: Id154153fa1a44b538bce1e3e752ea78b199befa6 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2454985 Reviewed-by: CH Lin <chlin56@nuvoton.com> Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
-rw-r--r--common/system.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/system.c b/common/system.c
index 206f74181c..1f353d49a6 100644
--- a/common/system.c
+++ b/common/system.c
@@ -1071,7 +1071,8 @@ __maybe_unused static int command_hibernate(int argc, char **argv)
microseconds = strtoi(argv[2], NULL, 0);
if (seconds || microseconds) {
- if (IS_ENABLED(CONFIG_HIBERNATE_PSL)) {
+ if (IS_ENABLED(CONFIG_HIBERNATE_PSL) &&
+ !IS_ENABLED(NPCX_LCT_SUPPORT)) {
ccprintf("Hibernating with timeout not supported "
"when PSL is enabled.\n");
return EC_ERROR_INVAL;