[coreboot-gerrit] New patch to review 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 114b87bffdce9430a7d4707943da6df638502831
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           | 21 +--------------------
 src/arch/x86/include/arch/acpi.h |  2 --
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index af833cb..10212ac 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -100,10 +100,6 @@ void backup_ramstage_section(u32 base, u32 size)
 		return;
 
 	size = ALIGN_UP(size, 4);
-	if (!size) {
-		base = backup_mem->base;
-		size = backup_mem->size;
-	}
 
 	/* FIXME: Sanity check CBMEM. */
 
@@ -114,22 +110,11 @@ void backup_ramstage_section(u32 base, u32 size)
 	backup_mem->magic = RESUME_BACKUP_MAGIC;
 }
 
-/* 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);
-}
-
 extern unsigned char _program, _eprogram;
 
 void acpi_prepare_resume_backup(void)
 {
 	size_t size = (u32)(&_eprogram - &_program);
-	u32 base = (u32) &_program;
 	struct resume_backup *backup_mem;
 
 	if (IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE))
@@ -140,9 +125,7 @@ void acpi_prepare_resume_backup(void)
 
 	/* 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,
-	 * so base and size of the currently running ramstage will match the one
-	 * we will load on resume path.
+	 * be disabled.
 	 */
 	if (IS_ENABLED(CONFIG_LATE_CBMEM_INIT))
 		romstage_ram_stack_maybe_low(0);
@@ -155,8 +138,6 @@ void acpi_prepare_resume_backup(void)
 		return;
 
 	backup_mem->magic = 0;
-	backup_mem->base = base;
-	backup_mem->size = size;
 }
 
 #define WAKEUP_BASE 0x600
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 3bda1c6..66cb1c9 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -629,14 +629,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)