<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30037">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoneyridge: Name IO061 in ASL appropriately<br><br>AMD traditionally claims the resource at I/O port 61 for the onboard<br>PC-AT speaker.  In later designs, the speaker may be omitted in favor<br>of routing the SPKR signal to the codec.<br><br>Some systems implement neither, and for those it is not correct to<br>identify the resource as a speaker.  Modify the EISAID reported to<br>the OS depending on the system design.  The default is that port 61<br>is reported as reserved.  In order to report a speaker, add #define<br>in mainboard//dsdt.asl.<br><br>TEST=check /proc/ioports and iasl -d for both ways using a Grunt<br>BUG=b:117818432<br><br>Change-Id: I33aafb187f9fea7b38aae43c399292c7521fcfc4<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>Reviewed-on: https://review.coreboot.org/c/30037<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/amd/gardenia/dsdt.asl<br>M src/soc/amd/stoneyridge/acpi/lpc.asl<br>2 files changed, 9 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/amd/gardenia/dsdt.asl b/src/mainboard/amd/gardenia/dsdt.asl</span><br><span>index f190b4e..52bd90b 100644</span><br><span>--- a/src/mainboard/amd/gardenia/dsdt.asl</span><br><span>+++ b/src/mainboard/amd/gardenia/dsdt.asl</span><br><span>@@ -13,6 +13,8 @@</span><br><span>  * GNU General Public License for more details.</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define MAINBOARD_HAS_SPEAKER 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* DefinitionBlock Statement */</span><br><span> #include <arch/acpi.h></span><br><span> DefinitionBlock (</span><br><span>diff --git a/src/soc/amd/stoneyridge/acpi/lpc.asl b/src/soc/amd/stoneyridge/acpi/lpc.asl</span><br><span>index a41357a..e24514c 100644</span><br><span>--- a/src/soc/amd/stoneyridge/acpi/lpc.asl</span><br><span>+++ b/src/soc/amd/stoneyridge/acpi/lpc.asl</span><br><span>@@ -13,6 +13,12 @@</span><br><span>  * GNU General Public License for more details.</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(MAINBOARD_HAS_SPEAKER)</span><br><span style="color: hsl(120, 100%, 40%);">+#define IO61_HID "PNP0800" /* AT style speaker */</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+#define IO61_HID "PNP0C02" /* reserved resource */</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* 0:14.3 - LPC */</span><br><span> Device(LPCB) {</span><br><span>   Name(_ADR, 0x00140003)</span><br><span>@@ -66,7 +72,7 @@</span><br><span>   } /* End Device(_SB.PCI0.LpcIsaBr.TMR) */</span><br><span> </span><br><span>        Device(SPKR) {  /* Speaker */</span><br><span style="color: hsl(0, 100%, 40%);">-           Name(_HID,EISAID("PNP0800"))  /* AT style speaker */</span><br><span style="color: hsl(120, 100%, 40%);">+                Name(_HID,EISAID(IO61_HID))</span><br><span>          Name(_CRS, ResourceTemplate() {</span><br><span>                      IO(Decode16, 0x0061, 0x0061, 0, 1)</span><br><span>           })</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30037">change 30037</a>. To unsubscribe, or for help writing mail filters, 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/c/coreboot/+/30037"/><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-Change-Id: I33aafb187f9fea7b38aae43c399292c7521fcfc4 </div>
<div style="display:none"> Gerrit-Change-Number: 30037 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>