From 6b5d1199ec3a807a0b347cef36334b07f6b21f67 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Wed, 13 Jul 2016 11:54:12 -0500 Subject: [PATCH] UPSTREAM: soc/intel/braswell: don't duplicate setting ACPI sleep state The ramstage main() in lib/hardwaremain.c has the logic to set the ACPI sleep state based on romstage_handoff. Thus, there's no need to do it a second time. BUG=None BRANCH=None TEST=None Change-Id: I88af301024fd6f868f494a737d2cce14d85f8241 Original-Signed-off-by: Aaron Durbin Original-Reviewed-on: https://review.coreboot.org/15661 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Kysti Mlkki Original-Reviewed-by: Furquan Shaikh Original-Reviewed-by: Lee Leahy Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/360820 Reviewed-by: Duncan Laurie --- src/soc/intel/braswell/ramstage.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c index 155c8a2e46..1b71f92472 100644 --- a/src/soc/intel/braswell/ramstage.c +++ b/src/soc/intel/braswell/ramstage.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -131,13 +130,6 @@ static void fill_in_pattrs(void) attrs->bclk_khz = cpu_bus_freq_khz(); } -static inline void set_acpi_sleep_type(int val) -{ -#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) - acpi_slp_type = val; -#endif -} - /* Save wake source information for calculating ACPI _SWS values */ int soc_fill_acpi_wake(uint32_t *pm1, uint32_t **gpe0) { @@ -155,19 +147,10 @@ int soc_fill_acpi_wake(uint32_t *pm1, uint32_t **gpe0) static void s3_resume_prepare(void) { global_nvs_t *gnvs; - struct romstage_handoff *romstage_handoff; gnvs = cbmem_add(CBMEM_ID_ACPI_GNVS, sizeof(global_nvs_t)); - - romstage_handoff = cbmem_find(CBMEM_ID_ROMSTAGE_INFO); - if (romstage_handoff == NULL || romstage_handoff->s3_resume == 0) { - if (gnvs != NULL) - memset(gnvs, 0, sizeof(global_nvs_t)); - set_acpi_sleep_type(0); - return; - } - - set_acpi_sleep_type(3); + if (!acpi_is_wakeup_s3() && gnvs) + memset(gnvs, 0, sizeof(global_nvs_t)); } static void set_board_id(void)