From 8e627a2e51a213b4a71e8aa40667d651fad729b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Tue, 21 Jun 2016 00:03:01 +0300
Subject: ACPI S3: Fix prohibited wakeup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
src/arch/x86/acpi_s3.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
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) {
--
cgit v1.2.3