[coreboot-gerrit] Patch set updated for coreboot: ACPI S3: Drop too early resume backup

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15477

-gerrit

commit 1eefff4d9417f65dd2ce3aa8911c5eb1e19b2526
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Mon Jun 27 13:09:56 2016 +0300

    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 at gmail.com>
---
 src/arch/x86/acpi_s3.c           | 17 -----------------
 src/arch/x86/include/arch/acpi.h |  2 --
 2 files changed, 19 deletions(-)

diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index 1892731..1b7976d 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -145,23 +145,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 0b04f56..89041cf 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -695,13 +695,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)