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>
This commit is contained in:
Kyösti Mälkki 2016-06-21 00:03:01 +03:00
parent d132c996a6
commit 8e627a2e51
1 changed files with 6 additions and 1 deletions

View File

@ -102,7 +102,12 @@ static void acpi_jump_to_wakeup(void *vector)
{ {
uintptr_t acpi_backup_memory = 0; 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); acpi_backup_memory = (uintptr_t)cbmem_find(CBMEM_ID_RESUME);
if (!acpi_backup_memory) { if (!acpi_backup_memory) {