[coreboot-gerrit] Change in coreboot[master]: soc/intel/apollolake: Add workaround for WAK_STS not set correctly in...

[Hannah Williams (Code Review)]

Hannah Williams has uploaded this change for review. ( https://review.coreboot.org/20757

Change subject: soc/intel/apollolake: Add workaround for WAK_STS not set correctly in GLK
......................................................................

soc/intel/apollolake: Add workaround for WAK_STS not set correctly in GLK

in PM1_STS_EN register

Change-Id: I60d3b81e0820922ac1b6d5e48cbaac4856398176
Signed-off-by: Hannah Williams 
---
M src/soc/intel/apollolake/pmutil.c
1 file changed, 3 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/20757/1

diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c
index bf89a09..c52cdad 100644
--- a/src/soc/intel/apollolake/pmutil.c
+++ b/src/soc/intel/apollolake/pmutil.c
@@ -356,7 +356,7 @@
    /* Default to S0. */
    int prev_sleep_state = ACPI_S0;

-	if (ps->pm1_sts & WAK_STS) {
+	if (IS_ENABLED(CONFIG_SOC_INTEL_GLK) || ps->pm1_sts & WAK_STS) {
    	switch (acpi_sleep_from_pm1(ps->pm1_cnt)) {
    	case ACPI_S3:
    		if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME))
@@ -435,7 +435,8 @@

int vboot_platform_is_resuming(void)
 {
-	if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS))
+	if (!IS_ENABLED(CONFIG_SOC_INTEL_GLK))
+		if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS))
    	return 0;

return acpi_sleep_from_pm1(inl(ACPI_BASE_ADDRESS + PM1_CNT)) == ACPI_S3;