Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6060
-gerrit
commit 9bc702cbe2c68b78b8da3616d9ac259497d7082c Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Tue Jun 17 15:41:37 2014 +0300
ACPI S3 support: Add acpi_s3_resume_allowed()
Add this to reduce the amount of preprocessor conditionals used in the source, compiler currently resolves this to a constant. Once we have gone through all enable/disable S3 support runtime.
While at it, clean up uses of HIGH_MEMORY_SAVE and HIGH_MEMORY_SCRATCH.
Change-Id: I0e2d9f81e2ab87c2376a04fab38a7c951cac7a07 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/arch/x86/boot/acpi.c | 16 ++++++++-------- src/arch/x86/boot/tables.c | 14 +++++--------- src/arch/x86/include/arch/acpi.h | 5 +++++ src/include/cbmem.h | 23 ++++++++++++----------- 4 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c index 0e09ec5..6c1788d 100644 --- a/src/arch/x86/boot/acpi.c +++ b/src/arch/x86/boot/acpi.c @@ -756,17 +756,17 @@ extern unsigned int __wakeup_size;
void acpi_jump_to_wakeup(void *vector) { -#if CONFIG_RELOCATABLE_RAMSTAGE u32 acpi_backup_memory = 0; -#else - u32 acpi_backup_memory = (u32)cbmem_find(CBMEM_ID_RESUME);
- if (!acpi_backup_memory) { - printk(BIOS_WARNING, "ACPI: Backup memory missing. " - "No S3 resume.\n"); - return; + if (HIGH_MEMORY_SAVE && acpi_s3_resume_allowed()) { + acpi_backup_memory = (u32)cbmem_find(CBMEM_ID_RESUME); + + if (!acpi_backup_memory) { + printk(BIOS_WARNING, "ACPI: Backup memory missing. " + "No S3 resume.\n"); + return; + } } -#endif
#if CONFIG_SMP // FIXME: This should go into the ACPI backup memory, too. No pork sausages. diff --git a/src/arch/x86/boot/tables.c b/src/arch/x86/boot/tables.c index 42e431e..16c752a 100644 --- a/src/arch/x86/boot/tables.c +++ b/src/arch/x86/boot/tables.c @@ -192,19 +192,15 @@ void write_tables(void)
post_code(0x9e);
-#if CONFIG_HAVE_ACPI_RESUME -/* Only add CBMEM_ID_RESUME when the ramstage isn't relocatable. */ -#if !CONFIG_RELOCATABLE_RAMSTAGE /* Let's prepare the ACPI S3 Resume area now already, so we can rely on * it begin there during reboot time. We don't need the pointer, nor * the result right now. If it fails, ACPI resume will be disabled. */ - cbmem_add(CBMEM_ID_RESUME, HIGH_MEMORY_SAVE); -#endif -#if CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY14 || CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY15_TN || CONFIG_NORTHBRIDGE_AMD_AGESA_FAMILY16_KB - cbmem_add(CBMEM_ID_RESUME_SCRATCH, CONFIG_HIGH_SCRATCH_MEMORY_SIZE); -#endif -#endif + if (HIGH_MEMORY_SAVE && acpi_s3_resume_allowed()) + cbmem_add(CBMEM_ID_RESUME, HIGH_MEMORY_SAVE); + + if (HIGH_MEMORY_SCRATCH && acpi_s3_resume_allowed()) + cbmem_add(CBMEM_ID_RESUME_SCRATCH, HIGH_MEMORY_SCRATCH);
#define MAX_COREBOOT_TABLE_SIZE (32 * 1024) post_code(0x9d); diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h index f447c14..a4cde20 100644 --- a/src/arch/x86/include/arch/acpi.h +++ b/src/arch/x86/include/arch/acpi.h @@ -584,4 +584,9 @@ void generate_cpu_entries(void);
#endif /* CONFIG_GENERATE_ACPI_TABLES */
+static inline int acpi_s3_resume_allowed(void) +{ + return IS_ENABLED(CONFIG_HAVE_ACPI_RESUME); +} + #endif /* __ASM_ACPI_H */ diff --git a/src/include/cbmem.h b/src/include/cbmem.h index beb626b..e88c2f7 100644 --- a/src/include/cbmem.h +++ b/src/include/cbmem.h @@ -21,11 +21,18 @@ #ifndef _CBMEM_H_ #define _CBMEM_H_
-#if CONFIG_HAVE_ACPI_RESUME -#if CONFIG_RELOCATABLE_RAMSTAGE +#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 + +#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) && \ + IS_ENABLED(CONFIG_HIGH_SCRATCH_MEMORY_SIZE) +#define HIGH_MEMORY_SCRATCH CONFIG_HIGH_SCRATCH_MEMORY_SIZE #else -#define HIGH_MEMORY_SAVE (CONFIG_RAMTOP - CONFIG_RAMBASE) +#define HIGH_MEMORY_SCRATCH 0 #endif
/* Delegation of resume backup memory so we don't have to @@ -33,7 +40,6 @@ */ #define CBMEM_BOOT_MODE 0x610 #define CBMEM_RESUME_BACKUP 0x614 -#endif /* CONFIG_HAVE_ACPI_RESUME */
#define CBMEM_ID_FREESPACE 0x46524545 #define CBMEM_ID_GDT 0x4c474454 @@ -133,14 +139,9 @@ u64 cbmem_entry_size(const struct cbmem_entry *entry); */ #define _CBMEM_SZ_MINIMAL ( 128 * 1024 )
-#if CONFIG_HAVE_ACPI_RESUME -#define _CBMEM_SZ_RESUME (HIGH_MEMORY_SAVE + CONFIG_HIGH_SCRATCH_MEMORY_SIZE) -#else -#define _CBMEM_SZ_RESUME 0 -#endif - #define _CBMEM_SZ_TOTAL \ - (_CBMEM_SZ_MINIMAL + _CBMEM_SZ_RESUME + CONFIG_CONSOLE_CBMEM_BUFFER_SIZE) + (_CBMEM_SZ_MINIMAL + CONFIG_CONSOLE_CBMEM_BUFFER_SIZE + \ + HIGH_MEMORY_SAVE + HIGH_MEMORY_SCRATCH)
#define HIGH_MEMORY_SIZE ALIGN_UP(_CBMEM_SZ_TOTAL, 0x10000)
-
Kyösti Mälkki