<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26121">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chromeec platforms: Update ACPI throttle handler call<br><br>Currently the throttle event handler method THRT is defined as an extern,<br>then defined again in the platform with thermal event handling.  In newer<br>versions of IASL, this generates an error, as the method is defined in<br>two places.  Simply removing the extern causes the call to it to fail on<br>platforms where it isn't actually defined, so add a preprocessor define<br>where it's implemented, and only call the method on those platforms.<br><br>Change-Id: I6337c52edaf9350843848b31c5d87bbfca403930<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/ec/google/chromeec/acpi/ec.asl<br>M src/mainboard/google/slippy/acpi/thermal.asl<br>2 files changed, 5 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/26121/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl</span><br><span>index ac4ceb1..681d431 100644</span><br><span>--- a/src/ec/google/chromeec/acpi/ec.asl</span><br><span>+++ b/src/ec/google/chromeec/acpi/ec.asl</span><br><span>@@ -20,7 +20,6 @@</span><br><span>  */</span><br><span> </span><br><span> // Mainboard specific throttle handler</span><br><span style="color: hsl(0, 100%, 40%);">-External (\_TZ.THRT, MethodObj)</span><br><span> #ifdef DPTF_ENABLE_CHARGER</span><br><span> External (\_SB.DPTF.TCHG, DeviceObj)</span><br><span> #endif</span><br><span>@@ -321,23 +320,21 @@</span><br><span>               Notify (BAT0, 0x80)</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_THROTTLING_HANDLER</span><br><span>        // Throttle Start</span><br><span>    Method (_Q12, 0, NotSerialized)</span><br><span>      {</span><br><span>            Store ("EC: THROTTLE START", Debug)</span><br><span style="color: hsl(0, 100%, 40%);">-           If (CondRefOf (\_TZ.THRT)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                    \_TZ.THRT (1)</span><br><span style="color: hsl(0, 100%, 40%);">-           }</span><br><span style="color: hsl(120, 100%, 40%);">+             \_TZ.THRT (1)</span><br><span>        }</span><br><span> </span><br><span>        // Throttle Stop</span><br><span>     Method (_Q13, 0, NotSerialized)</span><br><span>      {</span><br><span>            Store ("EC: THROTTLE STOP", Debug)</span><br><span style="color: hsl(0, 100%, 40%);">-            If (CondRefOf (\_TZ.THRT)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                    \_TZ.THRT (0)</span><br><span style="color: hsl(0, 100%, 40%);">-           }</span><br><span style="color: hsl(120, 100%, 40%);">+             \_TZ.THRT (0)</span><br><span>        }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #ifdef EC_ENABLE_PD_MCU_DEVICE</span><br><span>      // PD event</span><br><span>diff --git a/src/mainboard/google/slippy/acpi/thermal.asl b/src/mainboard/google/slippy/acpi/thermal.asl</span><br><span>index 36b0e21..1b96944 100644</span><br><span>--- a/src/mainboard/google/slippy/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/slippy/acpi/thermal.asl</span><br><span>@@ -15,6 +15,7 @@</span><br><span> </span><br><span> // Thermal Zone</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THROTTLING_HANDLER</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span>        // Handler for throttle requests on this platform</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26121">change 26121</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/26121"/><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: I6337c52edaf9350843848b31c5d87bbfca403930 </div>
<div style="display:none"> Gerrit-Change-Number: 26121 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>