From ac0dc4a8401e4531aa60a56d9ad4dfa0450eca78 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Wed, 18 Nov 2020 07:40:21 +0200 Subject: ACPI S3: Replace stashed acpi_slp_typ value MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We currently have a mixture of calls used to determine global ACPI S3 state. Reduce the boilerplate, ultimately acpi_wakeup_is_s3() should be the only to keep. Change-Id: Iff950d2bcf7eacbbdd40865abf62c35a2e8c3c69 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/47694 Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/include/acpi/acpi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/include') diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h index 3b9e9776e9..fa24902331 100644 --- a/src/include/acpi/acpi.h +++ b/src/include/acpi/acpi.h @@ -49,6 +49,7 @@ #include #include #include +#include #include #define RSDP_SIG "RSD PTR " /* RSDT pointer signature */ @@ -1078,7 +1079,6 @@ unsigned long acpi_create_lpi_desc_ncst(acpi_lpi_desc_ncst_t *lpi_desc, uint16_t void __noreturn acpi_resume(void *wake_vec); void mainboard_suspend_resume(void); void *acpi_find_wakeup_vector(void); -int acpi_handoff_wakeup_s3(void); /* ACPI_Sn assignments are defined to always equal the sleep state numbers */ enum { @@ -1134,7 +1134,7 @@ static inline int acpi_is_wakeup_s3(void) if (ENV_ROMSTAGE_OR_BEFORE) return (acpi_get_sleep_type() == ACPI_S3); - return acpi_handoff_wakeup_s3(); + return romstage_handoff_is_resume(); } static inline uintptr_t acpi_align_current(uintptr_t current) -- cgit v1.2.3