[coreboot-gerrit] Patch set updated for coreboot: ACPI S3: Drop 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 b4dd2ccd0733d5a92965352b329b38f98f291349
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Mon Jun 27 13:09:56 2016 +0300

    ACPI S3: Drop early resume backup
    
    No longer needed as low memory backup is implemented as part of
    the ramstage loader, after MTRRs are set to write-back cache for
    better performance.
    
    Change-Id: I5f5ad94bae2afef915927b9737c79431b6f75f22
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/arch/x86/acpi_s3.c           | 13 +------------
 src/arch/x86/include/arch/acpi.h |  2 --
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index c744eb5..741e5cf 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -143,24 +143,13 @@ void backup_ramstage_section(uintptr_t base, size_t size)
 
 	/* We are called from ramstage loader, do not rely on previously
 	 * loaded ramstage for location. */
-	if (size)
-		acpi_backup_container(base, size);
+	acpi_backup_container(base, size);
 
 	/* Back up the OS-controlled memory where ramstage will be loaded. */
 	memcpy((void*)backup_mem->cbmem, (void*)backup_mem->lowmem, backup_mem->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)
-{
-	backup_ramstage_section(0, 0);
-}
-
 /* 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 f40b9df..6fecd8c 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -634,14 +634,12 @@ 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
 #define acpi_slp_type 0
 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)