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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">amd/stoneyridge: Fix PmControl register size in SMI handler<br><br>The AMD implementation of this register is only 16 bits.  Change the<br>source accordingly.<br><br>TEST=Suspend/Resume a Grunt several times<br><br>Change-Id: Ib900468cc1c790fa7d57bb6faa91aee012173f7a<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>Reviewed-on: https://review.coreboot.org/29016<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M src/soc/amd/stoneyridge/smihandler.c<br>1 file changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/amd/stoneyridge/smihandler.c b/src/soc/amd/stoneyridge/smihandler.c</span><br><span>index eeedba7..8985257 100644</span><br><span>--- a/src/soc/amd/stoneyridge/smihandler.c</span><br><span>+++ b/src/soc/amd/stoneyridge/smihandler.c</span><br><span>@@ -122,13 +122,13 @@</span><br><span> </span><br><span> static void sb_slp_typ_handler(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    uint32_t pm1cnt, pci_ctrl, reg32;</span><br><span style="color: hsl(0, 100%, 40%);">-       uint16_t reg16;</span><br><span style="color: hsl(120, 100%, 40%);">+       uint32_t pci_ctrl, reg32;</span><br><span style="color: hsl(120, 100%, 40%);">+     uint16_t pm1cnt, reg16;</span><br><span>      uint8_t slp_typ, rst_ctrl;</span><br><span> </span><br><span>       /* Figure out SLP_TYP */</span><br><span style="color: hsl(0, 100%, 40%);">-        pm1cnt = inl(pm_acpi_pm_cnt_blk());</span><br><span style="color: hsl(0, 100%, 40%);">-     printk(BIOS_SPEW, "SMI#: SLP = 0x%08x\n", pm1cnt);</span><br><span style="color: hsl(120, 100%, 40%);">+  pm1cnt = inw(pm_acpi_pm_cnt_blk());</span><br><span style="color: hsl(120, 100%, 40%);">+   printk(BIOS_SPEW, "SMI#: SLP = 0x%04x\n", pm1cnt);</span><br><span>         slp_typ = acpi_sleep_from_pm1(pm1cnt);</span><br><span> </span><br><span>   /* Do any mainboard sleep handling */</span><br><span>@@ -196,7 +196,7 @@</span><br><span>          } /* if (IS_ENABLED(CONFIG_ELOG_GSMI)) */</span><br><span> </span><br><span>                /* Reissue Pm1 write */</span><br><span style="color: hsl(0, 100%, 40%);">-         outl(pm1cnt | SLP_EN, pm_acpi_pm_cnt_blk());</span><br><span style="color: hsl(120, 100%, 40%);">+          outw(pm1cnt | SLP_EN, pm_acpi_pm_cnt_blk());</span><br><span>                 hlt();</span><br><span>       }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29016">change 29016</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/29016"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib900468cc1c790fa7d57bb6faa91aee012173f7a </div>
<div style="display:none"> Gerrit-Change-Number: 29016 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Marshall Dawson <marshalldawson3rd@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>