From d4b58259c4ecb0e68586282b5cde194f66de2bba Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 21 Jan 2021 16:16:58 +0200 Subject: soc/intel/baytrail,broadwell: Use bootstate for save_wake_source() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I01be1b9dfefcfcf037de4153e9540c7258dc160f Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/49818 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/soc/intel/baytrail/ramstage.c | 28 +++++++++++++++++----------- src/soc/intel/broadwell/ramstage.c | 26 +++++++++++++++++--------- 2 files changed, 34 insertions(+), 20 deletions(-) (limited to 'src/soc/intel') diff --git a/src/soc/intel/baytrail/ramstage.c b/src/soc/intel/baytrail/ramstage.c index 0c955e3073..f1401e2411 100644 --- a/src/soc/intel/baytrail/ramstage.c +++ b/src/soc/intel/baytrail/ramstage.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -117,15 +118,9 @@ static void fill_in_pattrs(void) } /* Save bit index for first enabled event in PM1_STS for \_SB._SWS */ -static void save_acpi_wake_source(void) +static void pm_fill_gnvs(struct global_nvs *gnvs, const struct chipset_power_state *ps) { - struct chipset_power_state *ps = acpi_get_pm_state(); - struct global_nvs *gnvs = acpi_get_gnvs(); uint16_t pm1; - - if (!ps || !gnvs) - return; - pm1 = ps->pm1_sts & ps->pm1_en; /* Scan for first set bit in PM1 */ @@ -143,6 +138,21 @@ static void save_acpi_wake_source(void) gnvs->pm1i); } +static void acpi_save_wake_source(void *unused) +{ + const struct chipset_power_state *ps; + struct global_nvs *gnvs = acpi_get_gnvs(); + if (!gnvs) + return; + + if (acpi_pm_state_for_wake(&ps) < 0) + return; + + pm_fill_gnvs(gnvs, ps); +} + +BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, acpi_save_wake_source, NULL); + static void baytrail_enable_2x_refresh_rate(void) { u32 reg; @@ -164,10 +174,6 @@ void baytrail_init_pre_device(struct soc_intel_baytrail_config *config) /* Allow for SSE instructions to be executed. */ write_cr4(read_cr4() | CR4_OSFXSR | CR4_OSXMMEXCPT); - /* Indicate S3 resume to rest of ramstage. */ - if (acpi_is_wakeup_s3()) - save_acpi_wake_source(); - /* Run reference code. */ baytrail_run_reference_code(); diff --git a/src/soc/intel/broadwell/ramstage.c b/src/soc/intel/broadwell/ramstage.c index 93bc01dda0..0078939145 100644 --- a/src/soc/intel/broadwell/ramstage.c +++ b/src/soc/intel/broadwell/ramstage.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -12,16 +13,11 @@ #include /* Save bit index for PM1_STS and GPE_STS for ACPI _SWS */ -static void save_acpi_wake_source(void) +static void pm_fill_gnvs(struct global_nvs *gnvs, const struct chipset_power_state *ps) { - struct chipset_power_state *ps = acpi_get_pm_state(); - struct global_nvs *gnvs = acpi_get_gnvs(); uint16_t pm1; int gpe_reg; - if (!ps || !gnvs) - return; - pm1 = ps->pm1_sts & ps->pm1_en; /* Scan for first set bit in PM1 */ @@ -63,10 +59,22 @@ static void save_acpi_wake_source(void) gnvs->pm1i, gnvs->gpei); } -void broadwell_init_pre_device(void *chip_info) +static void acpi_save_wake_source(void *unused) { - if (acpi_is_wakeup_s3()) - save_acpi_wake_source(); + const struct chipset_power_state *ps; + struct global_nvs *gnvs = acpi_get_gnvs(); + if (!gnvs) + return; + if (acpi_pm_state_for_wake(&ps) < 0) + return; + + pm_fill_gnvs(gnvs, ps); +} + +BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, acpi_save_wake_source, NULL); + +void broadwell_init_pre_device(void *chip_info) +{ broadwell_run_reference_code(); } -- cgit v1.2.3