Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/15476 )
Change subject: ACPI S3: Drop ACPI_HUGE_LOWMEM_BACKUP ......................................................................
ACPI S3: Drop ACPI_HUGE_LOWMEM_BACKUP
ACPI S3 resume path can only modify low memory where the non-relocatable ramstage resides, there is no need to maintain a bigger backup copy.
Change-Id: Ifae41b51b359010ec02269c674936a87bd15623b Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/15476 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Arthur Heymans arthur@aheymans.xyz Reviewed-by: Aaron Durbin adurbin@chromium.org Reviewed-by: Patrick Georgi pgeorgi@google.com Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/Kconfig M src/arch/x86/acpi_s3.c M src/arch/x86/include/arch/acpi.h 3 files changed, 0 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Aaron Durbin: Looks good to me, but someone else must approve Arthur Heymans: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
diff --git a/src/Kconfig b/src/Kconfig index 6288d0b..333643e 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -485,12 +485,6 @@ 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 47f28d2..decaf2b 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -84,11 +84,6 @@ { uintptr_t top;
- if (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 660f0dc..670948a 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -26,8 +26,6 @@ #ifndef __ASM_ACPI_H #define __ASM_ACPI_H
-#define HIGH_MEMORY_SAVE (CONFIG_RAMTOP - CONFIG_RAMBASE) - /* * The type and enable fields are common in ACPI, but the * values themselves are hardware implementation defined.