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

ACPI S3: Remove conflicting local acpi_get_sleep_type() 

We now require EARLY_CBMEM_INIT and romstage_handoff to
support HAVE_ACPI_RESUME. Thus acpi_handoff_wakeup() would
never call an externally defined acpi_get_sleep_type().

Name _sleep_type() was also inapproriate here, as it referred
to hardware-dependent SLP_TYP field of PM1CNT but still
returned ACPI_Sx value instead.

Change-Id: I8dc130f1e86dd7e96922d546f0ae9713188336cd
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/21397
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
This commit is contained in:
Kyösti Mälkki 2017-09-04 19:22:26 +03:00
parent b92ad0b077
commit 746241f114
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/arch/x86/acpi_s3.c
View File

@ -30,22 +30,17 @@
/* This is filled with acpi_is_wakeup() call early in ramstage. */ /* This is filled with acpi_is_wakeup() call early in ramstage. */
static int acpi_slp_type = -1; static int acpi_slp_type = -1;
#if IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)
int acpi_get_sleep_type(void)
{
if (romstage_handoff_is_resume()) {
printk(BIOS_DEBUG, "S3 Resume.\n");
return ACPI_S3;
}
printk(BIOS_DEBUG, "Normal boot.\n");
return ACPI_S0;
}
#endif
static void acpi_handoff_wakeup(void) static void acpi_handoff_wakeup(void)
{ {
if (acpi_slp_type < 0) if (acpi_slp_type < 0) {
acpi_slp_type = acpi_get_sleep_type(); if (romstage_handoff_is_resume()) {
printk(BIOS_DEBUG, "S3 Resume.\n");
acpi_slp_type = ACPI_S3;
} else {
printk(BIOS_DEBUG, "Normal boot.\n");
acpi_slp_type = ACPI_S0;
}
}
} }
int acpi_is_wakeup(void) int acpi_is_wakeup(void)

4
src/southbridge/amd/agesa/hudson/ramtop.c
View File

@ -19,8 +19,6 @@
#include <cbmem.h> #include <cbmem.h>
#include "hudson.h" #include "hudson.h"
#if !ENV_RAMSTAGE || IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
int acpi_get_sleep_type(void) int acpi_get_sleep_type(void)
{ {
u16 tmp = inw(ACPI_PM1_CNT_BLK); u16 tmp = inw(ACPI_PM1_CNT_BLK);
@ -28,8 +26,6 @@ int acpi_get_sleep_type(void)
return (int)tmp; return (int)tmp;
} }
#endif
void backup_top_of_low_cacheable(uintptr_t ramtop) void backup_top_of_low_cacheable(uintptr_t ramtop)
{ {
u32 dword = ramtop; u32 dword = ramtop;

4
src/southbridge/amd/cimx/sb800/ramtop.c
View File

@ -19,8 +19,6 @@
#include <cbmem.h> #include <cbmem.h>
#include "SBPLATFORM.h" #include "SBPLATFORM.h"
#if !ENV_RAMSTAGE || IS_ENABLED(CONFIG_LATE_CBMEM_INIT)
int acpi_get_sleep_type(void) int acpi_get_sleep_type(void)
{ {
u16 tmp = inw(PM1_CNT_BLK_ADDRESS); u16 tmp = inw(PM1_CNT_BLK_ADDRESS);
@ -28,8 +26,6 @@ int acpi_get_sleep_type(void)
return (int)tmp; return (int)tmp;
} }
#endif
void backup_top_of_low_cacheable(uintptr_t ramtop) void backup_top_of_low_cacheable(uintptr_t ramtop)
{ {
u32 dword = ramtop; u32 dword = ramtop;