diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-06-20 05:21:30 +0300 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2014-06-21 08:04:53 +0200 |
| commit | c3c4a38c95b90fbf713e98f7b4d1e5be18bee633 (patch) | |
| tree | 260b74f1f4c1cc79bb44b4661e97fcd08629231b | |
| parent | c3ed88636a3533b97cef5bcb445cbe61edbfae7f (diff) | |
Misc: Use acpi_is_wakeup_s3()
Change-Id: I46906e6d68775edc5cfe199cfeb465db4da2691f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6072
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
| -rw-r--r-- | src/arch/x86/lib/ebda.c | 6 | ||||
| -rw-r--r-- | src/cpu/x86/smm/backup_default_smm.c | 2 | ||||
| -rw-r--r-- | 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 fb407b6ac8..7efc66239a 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 ef1d3a9e41..f63c5d27a2 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 de349281d6..5740076a34 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 */ |