From 546a2e84685eb642e59ef40846dcb6f167b5725c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 28 Jun 2016 07:50:48 +0300 Subject: ACPI S3: Drop ACPI_HUGE_LOWMEM_BACKUP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/15476 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Aaron Durbin Reviewed-by: Patrick Georgi Reviewed-by: Angel Pons --- src/Kconfig | 6 ------ src/arch/x86/acpi_s3.c | 5 ----- src/arch/x86/include/arch/acpi.h | 2 -- 3 files changed, 13 deletions(-) (limited to 'src') diff --git a/src/Kconfig b/src/Kconfig index 6288d0bc74..333643e471 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -485,12 +485,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 47f28d284c..decaf2b5ff 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -84,11 +84,6 @@ static int backup_create_or_update(struct resume_backup *backup_mem, { 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 660f0dc2e6..670948a1d1 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. -- cgit v1.2.3