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/6072
-gerrit
commit a94df67ff62337f885c2e6f160a25b97725511b3 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Fri Jun 20 05:21:30 2014 +0300
Misc: Use acpi_is_wakeup_s3()
Change-Id: I46906e6d68775edc5cfe199cfeb465db4da2691f Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/arch/x86/lib/ebda.c | 6 +----- src/cpu/x86/smm/backup_default_smm.c | 2 +- src/drivers/elog/elog.c | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/arch/x86/lib/ebda.c b/src/arch/x86/lib/ebda.c index fb407b6..7efc662 100644 --- a/src/arch/x86/lib/ebda.c +++ b/src/arch/x86/lib/ebda.c @@ -23,17 +23,13 @@ #include <string.h> #include <arch/io.h> #include <arch/ebda.h> -#if CONFIG_HAVE_ACPI_RESUME #include <arch/acpi.h> -#endif
void setup_ebda(u32 low_memory_size, u16 ebda_segment, u16 ebda_size) { -#if CONFIG_HAVE_ACPI_RESUME /* Skip in S3 resume path */ - if (acpi_slp_type == 3) + if (acpi_is_wakeup_s3()) return; -#endif
if (!low_memory_size || !ebda_segment || !ebda_size) return; diff --git a/src/cpu/x86/smm/backup_default_smm.c b/src/cpu/x86/smm/backup_default_smm.c index ef1d3a9..f63c5d2 100644 --- a/src/cpu/x86/smm/backup_default_smm.c +++ b/src/cpu/x86/smm/backup_default_smm.c @@ -45,7 +45,7 @@ void *backup_default_smm_area(void) }
/* Only back up the area on S3 resume. */ - if (acpi_slp_type == 3) { + if (acpi_is_wakeup_s3()) { memcpy(save_area, default_smm, SMM_DEFAULT_SIZE); return save_area; } diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c index de34928..5740076 100644 --- a/src/drivers/elog/elog.c +++ b/src/drivers/elog/elog.c @@ -607,7 +607,7 @@ int elog_init(void)
#if !defined(__SMM__) /* Log boot count event except in S3 resume */ - if (CONFIG_ELOG_BOOT_COUNT && acpi_slp_type != 3) + if (CONFIG_ELOG_BOOT_COUNT && !acpi_is_wakeup_s3()) elog_add_event_dword(ELOG_TYPE_BOOT, boot_count_read());
/* Check and log POST codes from previous boot */