[coreboot-gerrit] Patch set updated for coreboot: ACPI S3: Remove HIGH_MEMORY_SAVE where possible
Kyösti Mälkki (kyosti.malkki@gmail.com)
gerrit at coreboot.org
Wed Jun 29 10:38:38 CEST 2016
Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15255
-gerrit
commit 7ae58f3f0614df067d5fb4ca652bbb5146eba488
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date: Tue Jun 28 07:38:46 2016 +0300
ACPI S3: Remove HIGH_MEMORY_SAVE where possible
Use actual requirements of ramstage size for S3 resume backup
in CBMEM. The backup covers complete pages of 4 KiB.
AMD k8 and fam10 platforms have not been adapted yet.
Change-Id: Ide7ce013f3727c2928cdb00fbcc7e7e84e859ff1
Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
src/Kconfig | 4 ++
src/arch/x86/acpi_s3.c | 115 +++++++++++++++++++++++++-----
src/arch/x86/include/arch/acpi.h | 10 +--
src/cpu/amd/car/post_cache_as_ram.c | 9 ++-
src/cpu/amd/family_10h-family_15h/Kconfig | 1 +
src/cpu/amd/model_fxx/Kconfig | 1 +
src/include/cbfs.h | 3 +
src/include/program_loading.h | 4 ++
src/lib/cbfs.c | 12 ++++
src/lib/prog_loaders.c | 14 +++-
10 files changed, 144 insertions(+), 29 deletions(-)
diff --git a/src/Kconfig b/src/Kconfig
index 7043851..b4c3cbe 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -516,6 +516,10 @@ 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 7855a2f..c744eb5 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -19,8 +19,10 @@
#include <cbmem.h>
#include <cpu/cpu.h>
#include <timestamp.h>
+#include <program_loading.h>
#include <romstage_handoff.h>
#include <rules.h>
+#include <symbols.h>
#if ENV_RAMSTAGE
@@ -79,30 +81,101 @@ void acpi_fail_wakeup(void)
}
#endif /* ENV_RAMSTAGE */
-void acpi_prepare_for_resume(void)
+struct resume_backup {
+ uintptr_t cbmem;
+ uintptr_t lowmem;
+ size_t size;
+ int valid;
+};
+
+#define BACKUP_PAGE_SZ 4096
+
+void *acpi_backup_container(uintptr_t base, size_t size)
{
- if (!HIGH_MEMORY_SAVE)
+ struct resume_backup *backup_mem;
+ uintptr_t top, target;
+
+ 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);
+
+ /* FIXME: Check previous CBMEM allocation. */
+
+ /* Allocate storage with struct resume_backup. */
+ size = 2*BACKUP_PAGE_SZ + (top - base);
+ backup_mem = cbmem_add(CBMEM_ID_RESUME, size);
+ if (backup_mem == NULL)
+ return NULL;
+
+ /* Force alignment on the container itself.*/
+ target = (uintptr_t)backup_mem + sizeof(*backup_mem);
+ target = ALIGN_UP(target, BACKUP_PAGE_SZ);
+
+ backup_mem->valid = 0;
+ backup_mem->cbmem = target;
+ backup_mem->lowmem = base;
+ backup_mem->size = top - base;
+
+ return (void*)target;
+}
+
+void acpi_backup_validate(void)
+{
+ struct resume_backup *backup_mem = cbmem_find(CBMEM_ID_RESUME);
+ if (backup_mem)
+ backup_mem->valid = 1;
+}
+
+void backup_ramstage_section(uintptr_t base, size_t size)
+{
+ struct resume_backup *backup_mem = cbmem_find(CBMEM_ID_RESUME);
+ if (backup_mem == NULL)
+ return;
+
+ /* Check that the backup is not done twice. */
+ if (backup_mem->valid)
return;
+ /* We are called from ramstage loader, do not rely on previously
+ * loaded ramstage for location. */
+ if (size)
+ acpi_backup_container(base, size);
+
/* Back up the OS-controlled memory where ramstage will be loaded. */
- void *src = (void *)CONFIG_RAMBASE;
- void *dest = cbmem_find(CBMEM_ID_RESUME);
- if (dest != NULL)
- memcpy(dest, src, HIGH_MEMORY_SAVE);
+ memcpy((void*)backup_mem->cbmem, (void*)backup_mem->lowmem, backup_mem->size);
+ backup_mem->valid = 1;
+}
+
+/* Make backup of low-memory region, relying on the base and size
+ * of the ramstage that was loaded before entry to ACPI S3.
+ *
+ * DEPRECATED
+ */
+void acpi_prepare_for_resume(void)
+{
+ backup_ramstage_section(0, 0);
}
+/* Let's prepare the ACPI S3 Resume area now already, so we can rely on
+ * it being there during reboot time. If this fails, ACPI resume will
+ * be disabled. We assume that ramstage does not change while in suspend,
+ * so base and size of the currently running ramstage are used
+ * for allocation.
+ */
void acpi_prepare_resume_backup(void)
{
if (!acpi_s3_resume_allowed())
return;
- /* Let's prepare the ACPI S3 Resume area now already, so we can rely on
- * it being there during reboot time. We don't need the pointer, nor
- * the result right now. If it fails, ACPI resume will be disabled.
- */
+ if (IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE))
+ return;
- if (HIGH_MEMORY_SAVE)
- cbmem_add(CBMEM_ID_RESUME, HIGH_MEMORY_SAVE);
+ acpi_backup_container((uintptr_t)_program, _program_size);
}
#define WAKEUP_BASE 0x600
@@ -115,17 +188,22 @@ extern unsigned int __wakeup_size;
static void acpi_jump_to_wakeup(void *vector)
{
- uintptr_t acpi_backup_memory = 0;
+ uintptr_t source = 0, target = 0;
+ size_t size = 0;
if (!acpi_s3_resume_allowed()) {
printk(BIOS_WARNING, "ACPI: S3 resume not allowed.\n");
return;
}
- if (HIGH_MEMORY_SAVE) {
- acpi_backup_memory = (uintptr_t)cbmem_find(CBMEM_ID_RESUME);
-
- if (!acpi_backup_memory) {
+ if (!IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)) {
+ struct resume_backup *backup_mem = cbmem_find(CBMEM_ID_RESUME);
+ if (backup_mem && backup_mem->valid) {
+ backup_mem->valid = 0;
+ target = backup_mem->lowmem;
+ source = backup_mem->cbmem;
+ size = backup_mem->size;
+ } else {
printk(BIOS_WARNING, "ACPI: Backup memory missing. "
"No S3 resume.\n");
return;
@@ -137,8 +215,7 @@ static void acpi_jump_to_wakeup(void *vector)
timestamp_add_now(TS_ACPI_WAKE_JUMP);
- acpi_do_wakeup((uintptr_t)vector, acpi_backup_memory, CONFIG_RAMBASE,
- HIGH_MEMORY_SAVE);
+ acpi_do_wakeup((uintptr_t)vector, source, target, size);
}
void __attribute__((weak)) mainboard_suspend_resume(void)
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 7434000..2071f93 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -24,13 +24,6 @@
#ifndef __ASM_ACPI_H
#define __ASM_ACPI_H
-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) && \
- ! IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)
-#define HIGH_MEMORY_SAVE (CONFIG_RAMTOP - CONFIG_RAMBASE)
-#else
-#define HIGH_MEMORY_SAVE 0
-#endif
-
#ifndef __ASSEMBLER__
#include <stdint.h>
#include <rules.h>
@@ -623,6 +616,9 @@ static inline int acpi_s3_resume_allowed(void)
return IS_ENABLED(CONFIG_HAVE_ACPI_RESUME);
}
+void *acpi_backup_container(uintptr_t base, size_t size);
+void acpi_backup_validate(void);
+
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
extern int acpi_slp_type;
diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c
index 15b2642..9e9b10d 100644
--- a/src/cpu/amd/car/post_cache_as_ram.c
+++ b/src/cpu/amd/car/post_cache_as_ram.c
@@ -31,6 +31,8 @@
#error "You need to set CONFIG_RAMTOP greater than 1M"
#endif
+#define HIGH_MEMORY_SAVE (CONFIG_RAMTOP - CONFIG_RAMBASE)
+
#if IS_ENABLED(CONFIG_DEBUG_CAR)
#define print_car_debug(format, arg...) printk(BIOS_DEBUG, "%s: " format, __func__, ##arg)
#else
@@ -69,7 +71,7 @@ static void prepare_romstage_ramstack(int s3resume)
print_car_debug("Prepare CAR migration and stack regions...");
if (s3resume) {
- void *resume_backup_memory = cbmem_find(CBMEM_ID_RESUME);
+ 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);
@@ -85,7 +87,7 @@ static void prepare_ramstage_region(int s3resume)
print_car_debug("Prepare ramstage memory region...");
if (s3resume) {
- void *resume_backup_memory = cbmem_find(CBMEM_ID_RESUME);
+ 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);
@@ -102,6 +104,9 @@ static void prepare_ramstage_region(int s3resume)
#endif
print_car_debug(" Done\n");
+
+ if (s3resume)
+ acpi_backup_validate();
}
/* Disable Erratum 343 Workaround, see RevGuide for Fam10h, Pub#41322 Rev 3.33
diff --git a/src/cpu/amd/family_10h-family_15h/Kconfig b/src/cpu/amd/family_10h-family_15h/Kconfig
index fda7fc8..30c7dee 100644
--- a/src/cpu/amd/family_10h-family_15h/Kconfig
+++ b/src/cpu/amd/family_10h-family_15h/Kconfig
@@ -10,6 +10,7 @@ config CPU_AMD_MODEL_10XXX
select TSC_SYNC_LFENCE
select UDELAY_LAPIC
select HAVE_MONOTONIC_TIMER
+ select ACPI_HUGE_LOWMEM_BACKUP
select SUPPORT_CPU_UCODE_IN_CBFS
select CPU_MICROCODE_MULTIPLE_FILES if !CPU_MICROCODE_CBFS_NONE
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index c8bae33..3eb5b94 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -9,6 +9,7 @@ config CPU_AMD_MODEL_FXX
select SSE2
select TSC_SYNC_LFENCE
select UDELAY_LAPIC
+ select ACPI_HUGE_LOWMEM_BACKUP
select SUPPORT_CPU_UCODE_IN_CBFS
if CPU_AMD_MODEL_FXX
diff --git a/src/include/cbfs.h b/src/include/cbfs.h
index 2d19218..6a9e054 100644
--- a/src/include/cbfs.h
+++ b/src/include/cbfs.h
@@ -43,6 +43,9 @@ void *cbfs_boot_map_with_leak(const char *name, uint32_t type, size_t *size);
size_t cbfs_load_and_decompress(const struct region_device *rdev, size_t offset,
size_t in_size, void *buffer, size_t buffer_size, uint32_t compression);
+/* Fill base and size of the memory pstage will occupy when loaded. */
+void cbfs_prog_stage_section(struct prog *pstage, uint32_t *base, uint32_t *size);
+
/* Load stage into memory filling in prog. Return 0 on success. < 0 on error. */
int cbfs_prog_stage_load(struct prog *prog);
diff --git a/src/include/program_loading.h b/src/include/program_loading.h
index 4cadab6..8da6ada 100644
--- a/src/include/program_loading.h
+++ b/src/include/program_loading.h
@@ -176,6 +176,10 @@ uintptr_t romstage_ram_stack_source(size_t size, int src);
uintptr_t romstage_ram_stack_top(void);
uintptr_t romstage_ram_stack_bottom(void);
+/* Backup OS memory to CBMEM_ID_RESUME on ACPI S3 resume path,
+ * if ramstage overwrites low memory. */
+void backup_ramstage_section(uintptr_t base, size_t size);
+
/***********************
* PAYLOAD LOADING *
***********************/
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index aa652c2..c00e6aa 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -166,6 +166,18 @@ void *cbfs_boot_load_stage_by_name(const char *name)
return prog_entry(&stage);
}
+void cbfs_prog_stage_section(struct prog *pstage, uint32_t *base, uint32_t *size)
+{
+ struct cbfs_stage stage;
+ const struct region_device *fh = prog_rdev(pstage);
+
+ if (rdev_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage))
+ return;
+
+ *base = stage.load;
+ *size = stage.memlen;
+}
+
int cbfs_prog_stage_load(struct prog *pstage)
{
struct cbfs_stage stage;
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index ecbc679..d659abe 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -101,6 +101,18 @@ static int load_relocatable_ramstage(struct prog *ramstage)
return rmodule_stage_load(&rmod_ram);
}
+static int load_nonrelocatable_ramstage(struct prog *ramstage)
+{
+ if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)) {
+ uint32_t base = 0, size = 0;
+ cbfs_prog_stage_section(ramstage, &base, &size);
+ if (size)
+ backup_ramstage_section(base, size);
+ }
+
+ return cbfs_prog_stage_load(ramstage);
+}
+
void run_ramstage(void)
{
struct prog ramstage =
@@ -126,7 +138,7 @@ void run_ramstage(void)
if (IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)) {
if (load_relocatable_ramstage(&ramstage))
goto fail;
- } else if (cbfs_prog_stage_load(&ramstage))
+ } else if (load_nonrelocatable_ramstage(&ramstage))
goto fail;
stage_cache_add(STAGE_RAMSTAGE, &ramstage);
More information about the coreboot-gerrit
mailing list