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 a02194eb31bf87f6d5b82b4392e3732b200fafe9 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 | 4 ---- src/arch/x86/acpi_s3.c | 10 ---------- src/arch/x86/include/arch/acpi.h | 2 -- 3 files changed, 16 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig index b4c3cbe..7043851 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -516,10 +516,6 @@ config HAVE_ACPI_RESUME bool default n
-config ACPI_HUGE_LOWMEM_BACKUP - bool - default n - 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 b804c6c..af833cb 100644 --- a/src/arch/x86/acpi_s3.c +++ b/src/arch/x86/acpi_s3.c @@ -105,11 +105,6 @@ void backup_ramstage_section(u32 base, u32 size) size = backup_mem->size; }
- if (IS_ENABLED(CONFIG_ACPI_HUGE_LOWMEM_BACKUP)) { - base = CONFIG_RAMBASE; - size = HIGH_MEMORY_SAVE; - } - /* FIXME: Sanity check CBMEM. */
/* Back up the OS-controlled memory where ramstage will be loaded. */ @@ -152,11 +147,6 @@ void acpi_prepare_resume_backup(void) if (IS_ENABLED(CONFIG_LATE_CBMEM_INIT)) romstage_ram_stack_maybe_low(0);
- if (IS_ENABLED(CONFIG_ACPI_HUGE_LOWMEM_BACKUP)) { - base = CONFIG_RAMBASE; - size = HIGH_MEMORY_SAVE; - } - size = ALIGN_UP(size, 4);
size_t reserve = ALIGN_UP(sizeof(*backup_mem) + size, 1024); diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index babb50b..3bda1c6 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -24,8 +24,6 @@ #ifndef __ASM_ACPI_H #define __ASM_ACPI_H
-#define HIGH_MEMORY_SAVE (CONFIG_RAMTOP - CONFIG_RAMBASE) - #ifndef __ASSEMBLER__ #include <stdint.h> #include <rules.h>