<p>Patrick Rudolph has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27710">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ec/lenovo/h8/acpi: Fix ACPI error in _INI<br><br>Store the power on defaults in the _REG method after the ERAM region<br>is ready for use. It might not be ready when accessed from _INI.<br><br>Tested on Lenovo T430.<br><br>Change-Id: I70f22f8ac61dd850180fa159313bb0f8e4ab31d9<br>Signed-off-by: Patrick Rudolph <siro@das-labor.org><br>---<br>M src/ec/lenovo/h8/acpi/ec.asl<br>M src/ec/lenovo/h8/acpi/thinkpad.asl<br>2 files changed, 17 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/27710/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl</span><br><span>index 8a1b9c4..327a2cf 100644</span><br><span>--- a/src/ec/lenovo/h8/acpi/ec.asl</span><br><span>+++ b/src/ec/lenovo/h8/acpi/ec.asl</span><br><span>@@ -75,6 +75,20 @@</span><br><span>                             DKR3, 1         /* Dock register 3 */</span><br><span>        }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Called on OperationRegion driver changes */</span><br><span style="color: hsl(120, 100%, 40%);">+        Method (_REG, 2, NotSerialized)</span><br><span style="color: hsl(120, 100%, 40%);">+       {</span><br><span style="color: hsl(120, 100%, 40%);">+             /* Wait for ERAM driver loaded */</span><br><span style="color: hsl(120, 100%, 40%);">+             if (LEqual(Arg1, One)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      /* Fill HKEY defaults on first boot */</span><br><span style="color: hsl(120, 100%, 40%);">+                        if (LEqual(^HKEY.INIT, Zero)) {</span><br><span style="color: hsl(120, 100%, 40%);">+                               Store (BTEB, ^HKEY.WBDC)</span><br><span style="color: hsl(120, 100%, 40%);">+                              Store (WWEB, ^HKEY.WWAN)</span><br><span style="color: hsl(120, 100%, 40%);">+                              Store (One, ^HKEY.INIT)</span><br><span style="color: hsl(120, 100%, 40%);">+                       }</span><br><span style="color: hsl(120, 100%, 40%);">+             }</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  Method (_CRS, 0, Serialized)</span><br><span>         {</span><br><span>            Name (ECMD, ResourceTemplate()</span><br><span>diff --git a/src/ec/lenovo/h8/acpi/thinkpad.asl b/src/ec/lenovo/h8/acpi/thinkpad.asl</span><br><span>index 8fb5716..1997d08 100644</span><br><span>--- a/src/ec/lenovo/h8/acpi/thinkpad.asl</span><br><span>+++ b/src/ec/lenovo/h8/acpi/thinkpad.asl</span><br><span>@@ -157,6 +157,9 @@</span><br><span>            Return (\_SB.PCI0.LPCB.EC.GSTS)</span><br><span>      }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set to one on first boot */</span><br><span style="color: hsl(120, 100%, 40%);">+        Name (INIT, 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     /* Has thinkpad_acpi module loaded */</span><br><span>        Name (HAST, 0)</span><br><span> </span><br><span>@@ -305,15 +308,6 @@</span><br><span>    }</span><br><span> </span><br><span>        /*</span><br><span style="color: hsl(0, 100%, 40%);">-       * Store initial state</span><br><span style="color: hsl(0, 100%, 40%);">-   */</span><br><span style="color: hsl(0, 100%, 40%);">-     Method (_INI, 0, NotSerialized)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">-               Store (\_SB.PCI0.LPCB.EC.BTEB, WBDC)</span><br><span style="color: hsl(0, 100%, 40%);">-            Store (\_SB.PCI0.LPCB.EC.WWEB, WWAN)</span><br><span style="color: hsl(0, 100%, 40%);">-    }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       /*</span><br><span>    * Called from _WAK</span><br><span>   */</span><br><span>  Method (WAKE, 1)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27710">change 27710</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/27710"/><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: I70f22f8ac61dd850180fa159313bb0f8e4ab31d9 </div>
<div style="display:none"> Gerrit-Change-Number: 27710 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Rudolph <siro@das-labor.org> </div>