ACPI S3: Do some minor cleanup
Drop extra function in the middle and adjust the post_code()
to happen right before jump to wakeup vector.
Change-Id: I951c3292f5dbf52a58471da9de94b0c4f4ca7c20
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42613
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 2802bd3..e805ca3 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -55,18 +55,6 @@
extern unsigned char __wakeup;
extern unsigned int __wakeup_size;
-static void acpi_jump_to_wakeup(void *vector)
-{
- /* Copy wakeup trampoline in place. */
- memcpy((void *)WAKEUP_BASE, &__wakeup, __wakeup_size);
-
- set_boot_successful();
-
- timestamp_add_now(TS_ACPI_WAKE_JUMP);
-
- acpi_do_wakeup((uintptr_t)vector);
-}
-
void __weak mainboard_suspend_resume(void)
{
}
@@ -79,8 +67,15 @@
/* Call mainboard resume handler first, if defined. */
mainboard_suspend_resume();
+ /* Copy wakeup trampoline in place. */
+ memcpy((void *)WAKEUP_BASE, &__wakeup, __wakeup_size);
+
+ set_boot_successful();
+
+ timestamp_add_now(TS_ACPI_WAKE_JUMP);
+
post_code(POST_OS_RESUME);
- acpi_jump_to_wakeup(wake_vec);
+ acpi_do_wakeup((uintptr_t)wake_vec);
die("Failed the jump to wakeup vector\n");
}