<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/c/coreboot/+/29760">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Furquan Shaikh: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ec/google/wilco/acpi: Fix issues and clean up<br><br>- Disable debug output from read/write methods by default<br>- Use argument to _REG to disable SCI when EC is unregistered<br>- Change read/write macros to sync level 2 so they can be called<br>when a mutex is already held<br>- Define some missing events<br><br>Change-Id: Ic65ebbb6a6151444c47b4aeff7429e186856c49a<br>Signed-off-by: Duncan Laurie <dlaurie@google.com><br>Reviewed-on: https://review.coreboot.org/c/29760<br>Reviewed-by: Furquan Shaikh <furquan@google.com><br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>---<br>M src/ec/google/wilco/acpi/ec.asl<br>M src/ec/google/wilco/acpi/ec_ram.asl<br>2 files changed, 14 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ec/google/wilco/acpi/ec.asl b/src/ec/google/wilco/acpi/ec.asl</span><br><span>index cddfe3f..67a698f 100644</span><br><span>--- a/src/ec/google/wilco/acpi/ec.asl</span><br><span>+++ b/src/ec/google/wilco/acpi/ec.asl</span><br><span>@@ -20,6 +20,7 @@</span><br><span> Name (_UID, 1)</span><br><span> Name (_GPE, EC_SCI_GPI)</span><br><span> Name (_STA, 0xf)</span><br><span style="color: hsl(120, 100%, 40%);">+ Name (DBUG, Zero)</span><br><span> </span><br><span> Name (_CRS, ResourceTemplate() {</span><br><span> IO (Decode16,</span><br><span>@@ -44,7 +45,7 @@</span><br><span> ECPR = R (APWR)</span><br><span> </span><br><span> /* Indicate to EC that OS is ready for queries */</span><br><span style="color: hsl(0, 100%, 40%);">- W (ERDY, One)</span><br><span style="color: hsl(120, 100%, 40%);">+ W (ERDY, Arg1)</span><br><span> </span><br><span> /* Tell EC to stop emulating PS/2 mouse */</span><br><span> W (PS2M, Zero)</span><br><span>@@ -71,7 +72,7 @@</span><br><span> * Arg0 = EC field structure</span><br><span> * Arg1 = Value to write</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- Method (ECRW, 2, Serialized)</span><br><span style="color: hsl(120, 100%, 40%);">+ Method (ECRW, 2, Serialized, 2)</span><br><span> {</span><br><span> If (!EREG) {</span><br><span> Return (Zero)</span><br><span>@@ -101,11 +102,15 @@</span><br><span> }</span><br><span> </span><br><span> Local5 = EBIT (Arg0, Local3)</span><br><span style="color: hsl(0, 100%, 40%);">- Printf ("ECRD %o = %o", Local0, Local5)</span><br><span style="color: hsl(120, 100%, 40%);">+ If (DBUG) {</span><br><span style="color: hsl(120, 100%, 40%);">+ Printf ("ECRD %o = %o", Local0, Local5)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> Return (Local5)</span><br><span> } ElseIf (Local2 == WR) {</span><br><span> /* Write byte */</span><br><span style="color: hsl(0, 100%, 40%);">- Printf ("ECWR %o = %o", Local0, Arg1)</span><br><span style="color: hsl(120, 100%, 40%);">+ If (DBUG) {</span><br><span style="color: hsl(120, 100%, 40%);">+ Printf ("ECWR %o = %o", Local0, Arg1)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> BYT1 = Arg1</span><br><span> }</span><br><span> Return (Zero)</span><br><span>@@ -115,7 +120,7 @@</span><br><span> * Read a field from EC</span><br><span> * Arg0 = EC field structure</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- Method (R, 1, Serialized)</span><br><span style="color: hsl(120, 100%, 40%);">+ Method (R, 1, Serialized, 2)</span><br><span> {</span><br><span> Return (ECRW (Arg0, Zero))</span><br><span> }</span><br><span>@@ -125,7 +130,7 @@</span><br><span> * Arg0 = EC field structure</span><br><span> * Arg1 = Value to write</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- Method (W, 2, Serialized)</span><br><span style="color: hsl(120, 100%, 40%);">+ Method (W, 2, Serialized, 2)</span><br><span> {</span><br><span> Return (ECRW (Arg0, Arg1))</span><br><span> }</span><br><span>diff --git a/src/ec/google/wilco/acpi/ec_ram.asl b/src/ec/google/wilco/acpi/ec_ram.asl</span><br><span>index e2b6a93..6ea2366 100644</span><br><span>--- a/src/ec/google/wilco/acpi/ec_ram.asl</span><br><span>+++ b/src/ec/google/wilco/acpi/ec_ram.asl</span><br><span>@@ -81,6 +81,9 @@</span><br><span> Name (WBAT, Package () { 0x09, 0x80, RD }) /* Wake: Low Battery */</span><br><span> </span><br><span> Name (EVT3, Package () { 0x0b, 0xff, RD }) /* Event 3 */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (E3CP, Package () { 0x0b, 0x08, RD }) /* CS Power Button */</span><br><span style="color: hsl(120, 100%, 40%);">+Name (E3TH, Package () { 0x0b, 0x10, RD }) /* Thermal Event */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> Name (EVT4, Package () { 0x0c, 0xff, RD }) /* Event 4 */</span><br><span> </span><br><span> Name (BCST, Package () { 0x10, 0xff, RD }) /* BCACHE: BST */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/29760">change 29760</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/+/29760"/><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: Ic65ebbb6a6151444c47b4aeff7429e186856c49a </div>
<div style="display:none"> Gerrit-Change-Number: 29760 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Duncan Laurie <dlaurie@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Duncan Laurie <dlaurie@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Furquan Shaikh <furquan@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>