<p>John E. Kabat Jr. has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/22634">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoneyridge: Fix guarded code in ACPI ASL<br><br>Remove #if statements in sb_pci0_fch as Stoneyridge does not support IMC.<br>Change sleepstates.asl to remove #if and change to:<br>If (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME))<br><br><br>Change-Id: I71c6acb235df9aa8642dca4c85d2bf604e244bf4<br>Signed-off-by: John E. Kabat Jr <john.kabat@scarletltd.com><br>---<br>M src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl<br>M src/soc/amd/stoneyridge/acpi/sleepstates.asl<br>2 files changed, 5 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/22634/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl<br>index 216b57c..4aba2f9 100644<br>--- a/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl<br>+++ b/src/soc/amd/stoneyridge/acpi/sb_pci0_fch.asl<br>@@ -155,13 +155,6 @@<br>      /* Determine the OS we're running on */<br>   OSFL()<br> <br>-#if IS_ENABLED(CONFIG_STONEYRIDGE_IMC_FWM)<br>-       /* TODO: It is unstable. */<br>-  #include "acpi/AmdImc.asl"<br>-#if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE)<br>-       ITZE() /* enable IMC Fan Control*/<br>-#endif<br>-#endif<br> } /* End Method(_SB._INI) */<br> <br> Method(OSFL, 0){<br>diff --git a/src/soc/amd/stoneyridge/acpi/sleepstates.asl b/src/soc/amd/stoneyridge/acpi/sleepstates.asl<br>index 2f36738..9bcf15f 100644<br>--- a/src/soc/amd/stoneyridge/acpi/sleepstates.asl<br>+++ b/src/soc/amd/stoneyridge/acpi/sleepstates.asl<br>@@ -15,11 +15,11 @@<br>  */<br> <br> /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */<br>-#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)<br>-Name (SSFG, 0x0D)<br>-#else<br>-Name (SSFG, 0x09)<br>-#endif<br>+Name(SSFG, 0x09)<br>+if (IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)) {<br>+   Store(0x0D, SSFG)<br>+}<br>+<br> <br> /* Supported sleep states: */<br> Name(\_S0, Package () {0x00, 0x00, 0x00, 0x00} )  /* (S0) - working state */<br></pre><p>To view, visit <a href="https://review.coreboot.org/22634">change 22634</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/22634"/><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: I71c6acb235df9aa8642dca4c85d2bf604e244bf4 </div>
<div style="display:none"> Gerrit-Change-Number: 22634 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: John E. Kabat Jr. <john.kabat@scarletltd.com> </div>