summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2016-06-21 00:03:01 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2016-06-22 12:07:53 +0200
commit8e627a2e51a213b4a71e8aa40667d651fad729b1 (patch)
tree22be48b7e019ea35debb23e0392a21b611da1bf3 /src/arch/x86
parentd132c996a64950ed1c537d8fcfab691e9290c746 (diff)
downloadcoreboot-8e627a2e51a213b4a71e8aa40667d651fad729b1.tar.xz
ACPI S3: Fix prohibited wakeup
No boards affected, resume is always allowed when enabled in the build. Change-Id: I1816557da8201af9e137c389b57852ec20390b6a Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/15275 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/acpi_s3.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 8db906a476..b6bee0d6a6 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -102,7 +102,12 @@ static void acpi_jump_to_wakeup(void *vector)
{
uintptr_t acpi_backup_memory = 0;
- if (HIGH_MEMORY_SAVE && acpi_s3_resume_allowed()) {
+ if (!acpi_s3_resume_allowed()) {
+ printk(BIOS_WARNING, "ACPI: S3 resume not allowed.\n");
+ return;
+ }
+
+ if (HIGH_MEMORY_SAVE) {
acpi_backup_memory = (uintptr_t)cbmem_find(CBMEM_ID_RESUME);
if (!acpi_backup_memory) {