[coreboot-gerrit] New patch to review for coreboot: ACPI S3: Fix prohibited wakeup

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15275

-gerrit

commit 739227e2ee568fe0068c629852bf44c71dc0a158
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Tue Jun 21 00:03:01 2016 +0300

    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 at gmail.com>
---
 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 8db906a..b6bee0d 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) {