Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42613 )
Change subject: ACPI S3: Minor cleanup ......................................................................
ACPI S3: Minor cleanup
Drop extra function in the middle and adjust the post_code() to happen wright before jump to wakeup vector.
Change-Id: I951c3292f5dbf52a58471da9de94b0c4f4ca7c20 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/arch/x86/acpi_s3.c 1 file changed, 8 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/42613/1
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c index fef04ac..814719a 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -56,18 +56,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) { } @@ -88,8 +76,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"); }
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42613 )
Change subject: ACPI S3: Minor cleanup ......................................................................
Patch Set 1: Code-Review+2
(2 comments)
https://review.coreboot.org/c/coreboot/+/42613/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42613/1//COMMIT_MSG@7 PS1, Line 7: Minor cleanup Do some minor cleanup
https://review.coreboot.org/c/coreboot/+/42613/1//COMMIT_MSG@10 PS1, Line 10: wright right
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42613 )
Change subject: ACPI S3: Minor cleanup ......................................................................
Abandoned
Kyösti Mälkki has restored this change. ( https://review.coreboot.org/c/coreboot/+/42613 )
Change subject: ACPI S3: Minor cleanup ......................................................................
Restored
Hello build bot (Jenkins), Angel Pons,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42613
to look at the new patch set (#2).
Change subject: ACPI S3: Do some minor cleanup ......................................................................
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 --- M src/arch/x86/acpi_s3.c 1 file changed, 8 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/42613/2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42613 )
Change subject: ACPI S3: Do some minor cleanup ......................................................................
Patch Set 2: Code-Review+2
(2 comments)
https://review.coreboot.org/c/coreboot/+/42613/1//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/42613/1//COMMIT_MSG@7 PS1, Line 7: Minor cleanup
Do some minor cleanup
Done
https://review.coreboot.org/c/coreboot/+/42613/1//COMMIT_MSG@10 PS1, Line 10: wright
right
Done
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42613 )
Change subject: ACPI S3: Do some minor cleanup ......................................................................
Patch Set 2: Code-Review+1
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42613 )
Change subject: ACPI S3: Do some minor cleanup ......................................................................
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 --- M src/arch/x86/acpi_s3.c 1 file changed, 8 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
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"); }
-
Angel Pons (Code Review) -
Felix Held (Code Review)
-
Kyösti Mälkki (Code Review)