GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI: Add acpi_is_wakeup_s3() 

Test explicitly for S3 resume.
Also switch to use IS_ENABLED().

Change-Id: I17ea729f51f99ea8d6135f2c7a807623f1286238
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6070
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Kyösti Mälkki 2014-06-19 19:45:40 +03:00
parent 6722f8da40
commit 4d9b77287e
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/arch/x86/boot/acpi.c
View File

@ -651,6 +651,11 @@ int acpi_is_wakeup(void)
return (acpi_slp_type == 3 || acpi_slp_type == 2); return (acpi_slp_type == 3 || acpi_slp_type == 2);
} }
int acpi_is_wakeup_s3(void)
{
return (acpi_slp_type == 3);
}
void acpi_fail_wakeup(void) void acpi_fail_wakeup(void)
{ {
if (acpi_slp_type == 3 || acpi_slp_type == 2) if (acpi_slp_type == 3 || acpi_slp_type == 2)

14
src/arch/x86/include/arch/acpi.h
View File

@ -554,11 +554,12 @@ unsigned long acpi_fill_hest(acpi_hest_t *hest);
void acpi_save_gnvs(u32 gnvs_address); void acpi_save_gnvs(u32 gnvs_address);
#if CONFIG_HAVE_ACPI_RESUME #if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
/* 0 = S0, 1 = S1 ...*/ /* 0 = S0, 1 = S1 ...*/
extern u8 acpi_slp_type; extern u8 acpi_slp_type;
int acpi_is_wakeup(void); int acpi_is_wakeup(void);
int acpi_is_wakeup_s3(void);
void acpi_fail_wakeup(void); void acpi_fail_wakeup(void);
void acpi_resume(void *wake_vec); void acpi_resume(void *wake_vec);
void __attribute__((weak)) mainboard_suspend_resume(void); void __attribute__((weak)) mainboard_suspend_resume(void);
@ -567,9 +568,7 @@ void *acpi_get_wakeup_rsdp(void);
void acpi_jump_to_wakeup(void *wakeup_addr); void acpi_jump_to_wakeup(void *wakeup_addr);
int acpi_get_sleep_type(void); int acpi_get_sleep_type(void);
#else /* CONFIG_HAVE_ACPI_RESUME */ #endif /* IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) */
#define acpi_slp_type 0
#endif /* CONFIG_HAVE_ACPI_RESUME */
/* northbridge/amd/amdfam10/amdfam10_acpi.c */ /* northbridge/amd/amdfam10/amdfam10_acpi.c */
unsigned long acpi_add_ssdt_pstates(acpi_rsdp_t *rsdp, unsigned long current); unsigned long acpi_add_ssdt_pstates(acpi_rsdp_t *rsdp, unsigned long current);
@ -580,7 +579,6 @@ void generate_cpu_entries(void);
#else // CONFIG_GENERATE_ACPI_TABLES #else // CONFIG_GENERATE_ACPI_TABLES
#define write_acpi_tables(start) (start) #define write_acpi_tables(start) (start)
#define acpi_slp_type 0
#endif /* CONFIG_GENERATE_ACPI_TABLES */ #endif /* CONFIG_GENERATE_ACPI_TABLES */
@ -589,4 +587,10 @@ static inline int acpi_s3_resume_allowed(void)
return IS_ENABLED(CONFIG_HAVE_ACPI_RESUME); return IS_ENABLED(CONFIG_HAVE_ACPI_RESUME);
} }
#if !IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
#define acpi_slp_type 0
static inline int acpi_is_wakeup(void) { return 0; }
static inline int acpi_is_wakeup_s3(void) { return 0; }
#endif
#endif /* __ASM_ACPI_H */ #endif /* __ASM_ACPI_H */