<p>Hannah Williams has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20757">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/intel/apollolake: Add workaround for WAK_STS not set correctly in GLK<br><br>in PM1_STS_EN register<br><br>Change-Id: I60d3b81e0820922ac1b6d5e48cbaac4856398176<br>Signed-off-by: Hannah Williams <hannah.williams@intel.com><br>---<br>M src/soc/intel/apollolake/pmutil.c<br>1 file changed, 3 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/20757/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c<br>index bf89a09..c52cdad 100644<br>--- a/src/soc/intel/apollolake/pmutil.c<br>+++ b/src/soc/intel/apollolake/pmutil.c<br>@@ -356,7 +356,7 @@<br>       /* Default to S0. */<br>  int prev_sleep_state = ACPI_S0;<br> <br>-   if (ps->pm1_sts & WAK_STS) {<br>+  if (IS_ENABLED(CONFIG_SOC_INTEL_GLK) || ps->pm1_sts & WAK_STS) {<br>               switch (acpi_sleep_from_pm1(ps->pm1_cnt)) {<br>                case ACPI_S3:<br>                         if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME))<br>@@ -435,7 +435,8 @@<br> <br> int vboot_platform_is_resuming(void)<br> {<br>-  if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS))<br>+       if (!IS_ENABLED(CONFIG_SOC_INTEL_GLK))<br>+               if (!(inw(ACPI_BASE_ADDRESS + PM1_STS) & WAK_STS))<br>                return 0;<br> <br>  return acpi_sleep_from_pm1(inl(ACPI_BASE_ADDRESS + PM1_CNT)) == ACPI_S3;<br></pre><p>To view, visit <a href="https://review.coreboot.org/20757">change 20757</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/20757"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I60d3b81e0820922ac1b6d5e48cbaac4856398176 </div>
<div style="display:none"> Gerrit-Change-Number: 20757 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hannah Williams <hannah.williams@intel.com> </div>
<div style="display:none"> Gerrit-Reviewer: Ravishankar Sarawadi <ravishankar.sarawadi@intel.com> </div>