sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc: Use acpi_is_wakeup_s3()

Browse Source 
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>
This commit is contained in:
Kyösti Mälkki
2014-06-20 05:21:30 +03:00
committed by Patrick Georgi
parent c3ed88636a
commit c3c4a38c95
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/arch/x86/lib/ebda.c
View File

@ -23,17 +23,13 @@
#include <string.h> #include <string.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/ebda.h> #include <arch/ebda.h>
#if CONFIG_HAVE_ACPI_RESUME
#include <arch/acpi.h> #include <arch/acpi.h>
#endif
void setup_ebda(u32 low_memory_size, u16 ebda_segment, u16 ebda_size) void setup_ebda(u32 low_memory_size, u16 ebda_segment, u16 ebda_size)
{ {
#if CONFIG_HAVE_ACPI_RESUME
/* Skip in S3 resume path */ /* Skip in S3 resume path */
if (acpi_slp_type == 3) if (acpi_is_wakeup_s3())
return; return;
#endif
if (!low_memory_size || !ebda_segment || !ebda_size) if (!low_memory_size || !ebda_segment || !ebda_size)
return; return;

2
src/cpu/x86/smm/backup_default_smm.c
View File

@ -45,7 +45,7 @@ void *backup_default_smm_area(void)
} }
/* Only back up the area on S3 resume. */ /* 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); memcpy(save_area, default_smm, SMM_DEFAULT_SIZE);
return save_area; return save_area;
} }

2
src/drivers/elog/elog.c
View File

@ -607,7 +607,7 @@ int elog_init(void)
#if !defined(__SMM__) #if !defined(__SMM__)
/* Log boot count event except in S3 resume */ /* 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()); elog_add_event_dword(ELOG_TYPE_BOOT, boot_count_read());
/* Check and log POST codes from previous boot */ /* Check and log POST codes from previous boot */