<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25916">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chromeec platforms: Update ACPI thermal event handler call<br><br>Currently the thermal event handler method TEVT is defined as an extern,<br>then defined again in platforms 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: I64dcd2918d14f75ad3c356b321250bfa9d92c8a5<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/ec/google/chromeec/acpi/ec.asl<br>M src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl<br>M src/soc/intel/baytrail/acpi/dptf/thermal.asl<br>M src/soc/intel/braswell/acpi/dptf/thermal.asl<br>M src/soc/intel/common/acpi/dptf/thermal.asl<br>M src/soc/intel/skylake/acpi/dptf/thermal.asl<br>6 files changed, 9 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/25916/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 62f9acd..9ec5f7f 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>@@ -21,7 +21,6 @@</span><br><span> </span><br><span> // Mainboard specific throttle handler</span><br><span> External (\_TZ.THRT, MethodObj)</span><br><span style="color: hsl(0, 100%, 40%);">-External (\_SB.DPTF.TEVT, MethodObj)</span><br><span> #ifdef DPTF_ENABLE_CHARGER</span><br><span> External (\_SB.DPTF.TCHG, DeviceObj)</span><br><span> #endif</span><br><span>@@ -481,9 +480,9 @@</span><br><span> /* When sensor ID returns 0xFF then no more events */</span><br><span> While (LNotEqual (Local0, EC_TEMP_SENSOR_NOT_PRESENT))</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- If (CondRefOf (\_SB.DPTF.TEVT)) {</span><br><span style="color: hsl(0, 100%, 40%);">- \_SB.DPTF.TEVT (Local0)</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_THERM_EVENT_HANDLER</span><br><span style="color: hsl(120, 100%, 40%);">+ \_SB.DPTF.TEVT (Local0)</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> /* Keep reaading sensor ID for event */</span><br><span> Store (^PATI, Local0)</span><br><span>diff --git a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl</span><br><span>index 6879076..1ff308d 100644</span><br><span>--- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl</span><br><span>@@ -15,6 +15,7 @@</span><br><span> */</span><br><span> </span><br><span> /* Thermal Threshold Event Handler */</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERM_EVENT_HANDLER</span><br><span> Method (TEVT, 1, NotSerialized)</span><br><span> {</span><br><span> Store (ToInteger (Arg0), Local0)</span><br><span>diff --git a/src/soc/intel/baytrail/acpi/dptf/thermal.asl b/src/soc/intel/baytrail/acpi/dptf/thermal.asl</span><br><span>index 00dc964..6fa8eea 100644</span><br><span>--- a/src/soc/intel/baytrail/acpi/dptf/thermal.asl</span><br><span>+++ b/src/soc/intel/baytrail/acpi/dptf/thermal.asl</span><br><span>@@ -12,7 +12,9 @@</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%);">+</span><br><span> /* Thermal Threshold Event Handler */</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERM_EVENT_HANDLER</span><br><span> Method (TEVT, 1, NotSerialized)</span><br><span> {</span><br><span> Store (ToInteger (Arg0), Local0)</span><br><span>diff --git a/src/soc/intel/braswell/acpi/dptf/thermal.asl b/src/soc/intel/braswell/acpi/dptf/thermal.asl</span><br><span>index 5d685bb..e104756 100644</span><br><span>--- a/src/soc/intel/braswell/acpi/dptf/thermal.asl</span><br><span>+++ b/src/soc/intel/braswell/acpi/dptf/thermal.asl</span><br><span>@@ -13,6 +13,7 @@</span><br><span> */</span><br><span> </span><br><span> /* Thermal Threshold Event Handler */</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERM_EVENT_HANDLER</span><br><span> Method (TEVT, 1, NotSerialized)</span><br><span> {</span><br><span> Store (ToInteger (Arg0), Local0)</span><br><span>diff --git a/src/soc/intel/common/acpi/dptf/thermal.asl b/src/soc/intel/common/acpi/dptf/thermal.asl</span><br><span>index ce220c4..c8aa037 100644</span><br><span>--- a/src/soc/intel/common/acpi/dptf/thermal.asl</span><br><span>+++ b/src/soc/intel/common/acpi/dptf/thermal.asl</span><br><span>@@ -15,6 +15,7 @@</span><br><span> */</span><br><span> </span><br><span> /* Thermal Threshold Event Handler */</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERM_EVENT_HANDLER</span><br><span> Method (TEVT, 1, NotSerialized)</span><br><span> {</span><br><span> Store (ToInteger (Arg0), Local0)</span><br><span>diff --git a/src/soc/intel/skylake/acpi/dptf/thermal.asl b/src/soc/intel/skylake/acpi/dptf/thermal.asl</span><br><span>index d84807b..8290392 100644</span><br><span>--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl</span><br><span>+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl</span><br><span>@@ -15,6 +15,7 @@</span><br><span> */</span><br><span> </span><br><span> /* Thermal Threshold Event Handler */</span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERM_EVENT_HANDLER</span><br><span> Method (TEVT, 1, NotSerialized)</span><br><span> {</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25916">change 25916</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/25916"/><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: I64dcd2918d14f75ad3c356b321250bfa9d92c8a5 </div>
<div style="display:none"> Gerrit-Change-Number: 25916 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>