From b8c7ea0f697110aae87d1cbd345ffdeab08e8623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 17 Nov 2020 16:41:38 +0200 Subject: ACPI S3: Replace acpi_is_wakeup() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was supposed to return true for both S2 and S3, but level S2 was never stored in acpi_slp_type or otherwise implemented. Change-Id: Ida0165e647545069c0d42d38b9f45a95e78dacbe Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/47693 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/arch/x86/acpi_s3.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/arch') diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c index af4ab5efa5..1c304321a2 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -12,7 +12,7 @@ #if ENV_RAMSTAGE || ENV_POSTCAR -/* This is filled with acpi_is_wakeup() call early in ramstage. */ +/* This is filled with acpi_is_wakeup_s3() call early in ramstage. */ static int acpi_slp_type = -1; static void acpi_handoff_wakeup(void) @@ -28,13 +28,6 @@ static void acpi_handoff_wakeup(void) } } -int acpi_is_wakeup(void) -{ - acpi_handoff_wakeup(); - /* Both resume from S2 and resume from S3 restart at CPU reset */ - return (acpi_slp_type == ACPI_S3 || acpi_slp_type == ACPI_S2); -} - int acpi_is_wakeup_s3(void) { acpi_handoff_wakeup(); -- cgit v1.2.3