Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15476
-gerrit
commit c0d8e673fecbe9184abec19a05509e596d9659c8 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Tue Jun 28 07:50:48 2016 +0300
ACPI S3: Drop ACPI_HUGE_LOWMEM_BACKUP
Change-Id: Ifae41b51b359010ec02269c674936a87bd15623b Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/Kconfig | 6 ------ src/arch/x86/acpi_s3.c | 5 ----- src/arch/x86/include/arch/acpi.h | 2 -- src/cpu/amd/family_10h-family_15h/Kconfig | 1 - src/cpu/amd/model_fxx/Kconfig | 1 - 5 files changed, 15 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index 436964c..e3c329c 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -556,12 +556,6 @@ config HAVE_ACPI_RESUME bool default n
-config ACPI_HUGE_LOWMEM_BACKUP - bool - default n - help - On S3 resume path, backup low memory from RAMBASE..RAMTOP in CBMEM. - config RESUME_PATH_SAME_AS_BOOT bool default y if ARCH_X86 diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c index 1b7976d..469f857 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -88,11 +88,6 @@ static int backup_create_or_update(struct resume_backup *backup_mem, { uintptr_t top;
- if (IS_ENABLED(CONFIG_ACPI_HUGE_LOWMEM_BACKUP)) { - base = CONFIG_RAMBASE; - size = HIGH_MEMORY_SAVE; - } - /* Align backup region to complete pages. */ top = ALIGN_UP(base + size, BACKUP_PAGE_SZ); base = ALIGN_DOWN(base, BACKUP_PAGE_SZ); diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index 89041cf..d1e62f7 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -25,8 +25,6 @@ #ifndef __ASM_ACPI_H #define __ASM_ACPI_H
-#define HIGH_MEMORY_SAVE (CONFIG_RAMTOP - CONFIG_RAMBASE) - #if IS_ENABLED(CONFIG_ACPI_INTEL_HARDWARE_SLEEP_VALUES) /* * The type and enable fields are common in ACPI, but the diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig index 8e90247..95338df 100644 --- a/src/cpu/amd/family_10h-family_15h/Kconfig +++ b/src/cpu/amd/family_10h-family_15h/Kconfig @@ -11,7 +11,6 @@ config CPU_AMD_MODEL_10XXX select HAVE_MONOTONIC_TIMER select SUPPORT_CPU_UCODE_IN_CBFS select CPU_MICROCODE_MULTIPLE_FILES if !CPU_MICROCODE_CBFS_NONE - select ACPI_HUGE_LOWMEM_BACKUP
if CPU_AMD_MODEL_10XXX
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig index 804e698..c8bae33 100644 --- a/src/cpu/amd/model_fxx/Kconfig +++ b/src/cpu/amd/model_fxx/Kconfig @@ -10,7 +10,6 @@ config CPU_AMD_MODEL_FXX select TSC_SYNC_LFENCE select UDELAY_LAPIC select SUPPORT_CPU_UCODE_IN_CBFS - select ACPI_HUGE_LOWMEM_BACKUP
if CPU_AMD_MODEL_FXX config CPU_ADDR_BITS