From 3cb0e278e5fb7eda075b199638ea479c931c249b Mon Sep 17 00:00:00 2001 From: Bora Guvendik Date: Fri, 28 Sep 2018 16:19:00 -0700 Subject: soc/intel/common: add acpi_get_sleep_type to pmclib Change-Id: I3f4123657a375211f802a7d484a15353f9a256e9 Signed-off-by: Bora Guvendik Reviewed-on: https://review.coreboot.org/28795 Tested-by: build bot (Jenkins) Reviewed-by: Hannah Williams --- src/soc/intel/cannonlake/romstage/power_state.c | 8 -------- src/soc/intel/common/block/pmc/pmclib.c | 8 ++++++++ src/soc/intel/skylake/pmutil.c | 8 -------- 3 files changed, 8 insertions(+), 16 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/cannonlake/romstage/power_state.c b/src/soc/intel/cannonlake/romstage/power_state.c index b62e5fd4b8..838a056a9e 100644 --- a/src/soc/intel/cannonlake/romstage/power_state.c +++ b/src/soc/intel/cannonlake/romstage/power_state.c @@ -24,14 +24,6 @@ #include #include -int acpi_get_sleep_type(void) -{ - struct chipset_power_state *ps; - - ps = pmc_get_power_state(); - return ps->prev_sleep_state; -} - static inline int deep_s3_enabled(void) { uint32_t deep_s3_pol; diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c index 52bfaecd3d..3fb386642a 100644 --- a/src/soc/intel/common/block/pmc/pmclib.c +++ b/src/soc/intel/common/block/pmc/pmclib.c @@ -93,6 +93,14 @@ __weak void pmc_soc_restore_power_failure(void) */ } +int acpi_get_sleep_type(void) +{ + struct chipset_power_state *ps; + + ps = pmc_get_power_state(); + return ps->prev_sleep_state; +} + static uint32_t pmc_reset_smi_status(void) { uint32_t smi_sts = inl(ACPI_BASE_ADDRESS + SMI_STS); diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c index 2c399c7ade..2e1d1713e1 100644 --- a/src/soc/intel/skylake/pmutil.c +++ b/src/soc/intel/skylake/pmutil.c @@ -309,11 +309,3 @@ void soc_fill_power_state(struct chipset_power_state *ps) printk(BIOS_DEBUG, "GBLRST_CAUSE: %08x %08x\n", ps->gblrst_cause[0], ps->gblrst_cause[1]); } - -int acpi_get_sleep_type(void) -{ - struct chipset_power_state *ps; - - ps = pmc_get_power_state(); - return ps->prev_sleep_state; -} -- cgit v1.2.3