diff options
| author | Wai-Hong Tam <waihong@google.com> | 2020-07-23 15:03:28 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-29 07:22:12 +0000 |
| commit | e89e1066873cabb59aa1350dd07c2238d460ea72 (patch) | |
| tree | fef0fa4d01913eb80af2b8ea4faa44739531b82c | |
| parent | 841576b5f94628d758fed7e78a03b800a6249b18 (diff) | |
| download | chrome-ec-e89e1066873cabb59aa1350dd07c2238d460ea72.tar.gz | |
power/intel_x86: Add a config check for S0ix
The S0ix requires the CONFIG_POWER_TRACK_HOST_SLEEP_STATE enabled;
otherwise, a compilation error happens. Add a config check for it
and simplify some #ifdef clauses.
BRANCH=None
BUG=b:162083524
TEST=make buildall -j
TEST=Removing the CONFIG_POWER_TRACK_HOST_SLEEP_STATE on hatch caused
a fail.
Change-Id: Ic685d1ca5d05d705fcf6bb43717fc05f6526274e
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2321871
Reviewed-by: Evan Green <evgreen@chromium.org>
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
| -rw-r--r-- | include/config.h | 4 | ||||
| -rw-r--r-- | power/intel_x86.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/config.h b/include/config.h index 78fd4b71cf..0c9596c08a 100644 --- a/include/config.h +++ b/include/config.h @@ -5224,6 +5224,10 @@ #error "Cannot use CONFIG_CHIPSET_SLP_S3_L_OVERRIDE if SLP_S3 is a virtual wire" #endif +#if defined(CONFIG_POWER_S0IX) && !defined(CONFIG_POWER_TRACK_HOST_SLEEP_STATE) +#error "Must enable CONFIG_POWER_TRACK_HOST_SLEEP_STATE for S0ix" +#endif + /*****************************************************************************/ /* diff --git a/power/intel_x86.c b/power/intel_x86.c index 8457c3bb0a..52e46b107a 100644 --- a/power/intel_x86.c +++ b/power/intel_x86.c @@ -208,7 +208,6 @@ static void handle_chipset_reset(void) } DECLARE_HOOK(HOOK_CHIPSET_RESET, handle_chipset_reset, HOOK_PRIO_FIRST); -#ifdef CONFIG_POWER_TRACK_HOST_SLEEP_STATE #ifdef CONFIG_POWER_S0IX_FAILURE_DETECTION static uint16_t slp_s0ix_timeout; @@ -326,7 +325,6 @@ void power_reset_host_sleep_state(void) NULL); } -#endif /* CONFIG_POWER_TRACK_HOST_SLEEP_STATE */ #endif /* CONFIG_POWER_S0IX */ void chipset_throttle_cpu(int throttle) |