AMD fam10: Remove HAVE_ACPI_RESUME support

Change-Id: I62bbba8cfe515b3cae413582ff8d062a20e6741b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/15474
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

2 files changed, 4 insertions, 53 deletions

diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index aa8222bc9d..dfa4c3d618 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -27,6 +27,7 @@
 #include <cpu/amd/car.h>
 #include <cpu/amd/msr.h>
 #include <arch/acpi.h>
+#include <program_loading.h>
 #include <romstage_handoff.h>
 
 #include "cpu/amd/car/disable_cache_as_ram.c"
@@ -44,12 +45,6 @@
 #define print_car_debug(format, arg...)
 #endif
 
-static size_t backup_size(void)
-{
-	size_t car_size = car_data_size();
-	return ALIGN_UP(car_size + 1024, 1024);
-}
-
 static void memcpy_(void *d, const void *s, size_t len)
 {
 	print_car_debug(" Copy [%08x-%08x] to [%08x - %08x] ...",
@@ -58,13 +53,6 @@ static void memcpy_(void *d, const void *s, size_t len)
 	memcpy(d, s, len);
 }
 
-static void memset_(void *d, int val, size_t len)
-{
-	print_car_debug(" Fill [%08x-%08x] ...",
-	(uint32_t) d, (uint32_t) (d + len - 1));
-	memset(d, val, len);
-}
-
 static int memcmp_(void *d, const void *s, size_t len)
 {
 	print_car_debug(" Compare [%08x-%08x] with [%08x - %08x] ...",
@@ -73,41 +61,6 @@ static int memcmp_(void *d, const void *s, size_t len)
 	return memcmp(d, s, len);
 }
 
-static void prepare_romstage_ramstack(int s3resume)
-{
-	size_t backup_top = backup_size();
-	print_car_debug("Prepare CAR migration and stack regions...");
-
-	if (s3resume) {
-		void *resume_backup_memory =
-		acpi_backup_container(CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
-		if (resume_backup_memory)
-			memcpy_(resume_backup_memory
-			+ HIGH_MEMORY_SAVE - backup_top,
-				(void *)(CONFIG_RAMTOP - backup_top),
-				backup_top);
-	}
-	memset_((void *)(CONFIG_RAMTOP - backup_top), 0, backup_top);
-
-	print_car_debug(" Done\n");
-}
-
-static void prepare_ramstage_region(int s3resume)
-{
-	size_t backup_top = backup_size();
-	print_car_debug("Prepare ramstage memory region...");
-
-	if (s3resume) {
-		void *resume_backup_memory =
-		acpi_backup_container(CONFIG_RAMBASE, HIGH_MEMORY_SAVE);
-		if (resume_backup_memory)
-			memcpy_(resume_backup_memory, (void *) CONFIG_RAMBASE,
-				HIGH_MEMORY_SAVE - backup_top);
-	}
-
-	print_car_debug(" Done\n");
-}
-
 /* Disable Erratum 343 Workaround, see RevGuide for Fam10h, Pub#41322 Rev 3.33
  * and RevGuide for Fam12h, Pub#44739 Rev 3.10
  */
@@ -137,9 +90,10 @@ asmlinkage void *post_cache_as_ram(void)
 	if ((*lower_stack_boundary) != 0xdeadbeef)
 		printk(BIOS_WARNING, "BSP overran lower stack boundary.  Undefined behaviour may result!\n");
 
-	s3resume = acpi_is_wakeup_s3();
 
-	prepare_romstage_ramstack(s3resume);
+	/* ACPI S3 is not supported without RELOCATABLE_RAMSTAGE and
+	 * this will always return 0. */
+	s3resume = acpi_is_wakeup_s3();
 
 	romstage_handoff_init(s3resume);
 
@@ -177,8 +131,6 @@ asmlinkage void cache_as_ram_new_stack(void)
 	set_var_mtrr(0, 0x00000000, CACHE_TMP_RAMTOP, MTRR_TYPE_WRBACK);
 	enable_cache();
 
-	prepare_ramstage_region(acpi_is_wakeup_s3());
-
 	set_sysinfo_in_ram(1); // So other core0 could start to train mem
 
 	/*copy and execute ramstage */
diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index e9ee855209..ad4f5f4ba6 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -10,7 +10,6 @@ config CPU_AMD_MODEL_10XXX
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select CPU_MICROCODE_MULTIPLE_FILES
 	select CAR_GLOBAL_MIGRATION
-	select ACPI_HUGE_LOWMEM_BACKUP
 
 if CPU_AMD_MODEL_10XXX