diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2016-06-27 13:09:56 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-04-09 12:06:51 +0000 |
| commit | 5e32f41b438d92d47d777cb8df70c02ea45e8f70 (patch) | |
| tree | c43c29dbd9970b326e86a8f8b2a5c36f63fcba43 | |
| parent | 2c3fd499cf0672a8da669e40be84112a02b5a77c (diff) | |
| download | coreboot-5e32f41b438d92d47d777cb8df70c02ea45e8f70.tar.xz | |
ACPI S3: Drop too early resume backup
No longer needed as low memory backup is implemented as part of
the ramstage loader, when the actual requirement of the ramstage
to load is known.
Change-Id: I5f5ad94bae2afef915927b9737c79431b6f75f22
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/15477
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/arch/x86/acpi_s3.c | 18 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/acpi.h | 2 |
2 files changed, 0 insertions, 20 deletions
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c index 90f2c4ee7b..bb8c3c5a8a 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -159,24 +159,6 @@ void backup_ramstage_section(uintptr_t base, size_t size) backup_mem->valid = 1; } -/* Make backup of low-memory region, relying on the base and size - * of the ramstage that was loaded before entry to ACPI S3. - * - * DEPRECATED - */ -void acpi_prepare_for_resume(void) -{ - struct resume_backup *backup_mem = cbmem_find(CBMEM_ID_RESUME); - if (!backup_mem) - return; - - /* Back up the OS-controlled memory where ramstage will be loaded. */ - memcpy((void *)(uintptr_t)backup_mem->cbmem, - (void *)(uintptr_t)backup_mem->lowmem, - (size_t)backup_mem->size); - backup_mem->valid = 1; -} - /* Let's prepare the ACPI S3 Resume area now already, so we can rely on * it being there during reboot time. If this fails, ACPI resume will * be disabled. We assume that ramstage does not change while in suspend, diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 5418420342..fe0c6f25b0 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -799,13 +799,11 @@ int acpi_is_wakeup(void); int acpi_is_wakeup_s3(void); int acpi_is_wakeup_s4(void); #endif -void acpi_prepare_for_resume(void); #else static inline int acpi_is_wakeup(void) { return 0; } static inline int acpi_is_wakeup_s3(void) { return 0; } static inline int acpi_is_wakeup_s4(void) { return 0; } -static inline void acpi_prepare_for_resume(void) { } #endif static inline uintptr_t acpi_align_current(uintptr_t current) |