ACPI S3: Clean up resume path
Remove the obscure path in source code, where ACPI S3 resume
was prohibited and acpi_resume() would return and continue
to BS_WRITE_TABLES.
The condition when ACPI S3 would be prohibited needs to be
checked early in romstage already. For the time being, there
has been little interest to have CMOS option to disable
ACPI S3 resume feature.
Change-Id: If5105912759427f94f84d46d1a3141aa75cbd6ef
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42498
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 4276027..3fe50c9 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -169,9 +169,9 @@
if (CONFIG(HAVE_ACPI_RESUME)) {
arch_bootstate_coreboot_exit();
acpi_resume(wake_vector);
+ /* We will not come back. */
}
-
- return BS_WRITE_TABLES;
+ die("Failed OS resume\n");
}
static boot_state_t bs_write_tables(void *arg)