<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26123">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chromeec platforms: Update ACPI thermal zone handler call<br><br>Currently the throttle event handler method THRM is defined as an<br>extern on the intel bd82x6x and lynxpoint chipsets, then defined<br>again in the platform with thermal event handling. In newer versions<br>of IASL, this generates an error, as the method is defined in two<br>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: I7af4a346496c1352ec20bda8acb338b5d277d99b<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/mainboard/google/auron/acpi/thermal.asl<br>M src/mainboard/google/beltino/acpi/thermal.asl<br>M src/mainboard/google/butterfly/acpi/thermal.asl<br>M src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl<br>M src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl<br>M src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl<br>M src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl<br>M src/mainboard/google/link/acpi/thermal.asl<br>M src/mainboard/google/parrot/acpi/thermal.asl<br>M src/mainboard/google/slippy/acpi/thermal.asl<br>M src/mainboard/google/stout/acpi/thermal.asl<br>M src/mainboard/intel/emeraldlake2/acpi/thermal.asl<br>M src/mainboard/kontron/ktqm77/acpi/thermal.asl<br>M src/mainboard/roda/rv11/acpi/thermal.asl<br>M src/mainboard/samsung/lumpy/acpi/thermal.asl<br>M src/southbridge/intel/bd82x6x/acpi/globalnvs.asl<br>M src/southbridge/intel/lynxpoint/acpi/globalnvs.asl<br>17 files changed, 20 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/23/26123/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/auron/acpi/thermal.asl b/src/mainboard/google/auron/acpi/thermal.asl</span><br><span>index 8fc6217..16d1d45 100644</span><br><span>--- a/src/mainboard/google/auron/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/auron/acpi/thermal.asl</span><br><span>@@ -17,6 +17,7 @@</span><br><span> </span><br><span> // Thermal Zone</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/google/beltino/acpi/thermal.asl b/src/mainboard/google/beltino/acpi/thermal.asl</span><br><span>index af36a5c..1d4eca3 100644</span><br><span>--- a/src/mainboard/google/beltino/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/beltino/acpi/thermal.asl</span><br><span>@@ -17,6 +17,7 @@</span><br><span> </span><br><span> // Thermal Zone</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/google/butterfly/acpi/thermal.asl b/src/mainboard/google/butterfly/acpi/thermal.asl</span><br><span>index f6158ba..2faa7de 100644</span><br><span>--- a/src/mainboard/google/butterfly/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/butterfly/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_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl</span><br><span>index 1cd1b9b..d09b491 100644</span><br><span>--- a/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/jecht/variants/guado/include/variant/acpi/thermal.asl</span><br><span>@@ -17,6 +17,7 @@</span><br><span> </span><br><span> // Thermal Zone</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl</span><br><span>index 1cd1b9b..d09b491 100644</span><br><span>--- a/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/jecht/variants/jecht/include/variant/acpi/thermal.asl</span><br><span>@@ -17,6 +17,7 @@</span><br><span> </span><br><span> // Thermal Zone</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl</span><br><span>index 151ac51..7bf7155 100644</span><br><span>--- a/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/jecht/variants/rikku/include/variant/acpi/thermal.asl</span><br><span>@@ -17,6 +17,7 @@</span><br><span> </span><br><span> // Thermal Zone</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl</span><br><span>index 78e7bf7..177d75e 100644</span><br><span>--- a/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/jecht/variants/tidus/include/variant/acpi/thermal.asl</span><br><span>@@ -17,6 +17,7 @@</span><br><span> </span><br><span> // Thermal Zone</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/google/link/acpi/thermal.asl b/src/mainboard/google/link/acpi/thermal.asl</span><br><span>index 9163493..e0d25e7 100644</span><br><span>--- a/src/mainboard/google/link/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/link/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_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (CRIT)</span><br><span>diff --git a/src/mainboard/google/parrot/acpi/thermal.asl b/src/mainboard/google/parrot/acpi/thermal.asl</span><br><span>index 98aa52d..38fe15f 100644</span><br><span>--- a/src/mainboard/google/parrot/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/parrot/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_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</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 1b96944..d6f1c6d 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_THERMALZONE</span><br><span> #define HAVE_THROTTLING_HANDLER</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span>diff --git a/src/mainboard/google/stout/acpi/thermal.asl b/src/mainboard/google/stout/acpi/thermal.asl</span><br><span>index 01f6229..335f018 100644</span><br><span>--- a/src/mainboard/google/stout/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/google/stout/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_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl</span><br><span>index 448cb97..b3d3824 100644</span><br><span>--- a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/intel/emeraldlake2/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_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/kontron/ktqm77/acpi/thermal.asl b/src/mainboard/kontron/ktqm77/acpi/thermal.asl</span><br><span>index 0bdef14..9c1407e 100644</span><br><span>--- a/src/mainboard/kontron/ktqm77/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/kontron/ktqm77/acpi/thermal.asl</span><br><span>@@ -16,6 +16,7 @@</span><br><span> </span><br><span> // Thermal Zone</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define HAVE_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/mainboard/roda/rv11/acpi/thermal.asl b/src/mainboard/roda/rv11/acpi/thermal.asl</span><br><span>index b87fc4f..a1d28e4 100644</span><br><span>--- a/src/mainboard/roda/rv11/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/roda/rv11/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_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> // Convert from Degrees C to 1/10 Kelvin for ACPI</span><br><span>diff --git a/src/mainboard/samsung/lumpy/acpi/thermal.asl b/src/mainboard/samsung/lumpy/acpi/thermal.asl</span><br><span>index c61a3b6..10a74f3 100644</span><br><span>--- a/src/mainboard/samsung/lumpy/acpi/thermal.asl</span><br><span>+++ b/src/mainboard/samsung/lumpy/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_THERMALZONE</span><br><span> Scope (\_TZ)</span><br><span> {</span><br><span> ThermalZone (THRM)</span><br><span>diff --git a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl</span><br><span>index 2a3227d..0c58c68 100644</span><br><span>--- a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl</span><br><span>+++ b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl</span><br><span>@@ -233,16 +233,16 @@</span><br><span> {</span><br><span> Store (Zero, \XHCI)</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-External (\_TZ.THRM)</span><br><span style="color: hsl(0, 100%, 40%);">-External (\_TZ.SKIN)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+External (\_TZ.SKIN)</span><br><span> Method (TZUP)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_THERMALZONE</span><br><span> /* Update Primary Thermal Zone */</span><br><span> If (CondRefOf (\_TZ.THRM)) {</span><br><span> Notify (\_TZ.THRM, 0x81)</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> /* Update Secondary Thermal Zone */</span><br><span> If (CondRefOf (\_TZ.SKIN)) {</span><br><span> Notify (\_TZ.SKIN, 0x81)</span><br><span>diff --git a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl</span><br><span>index 468c755..ba9f850 100644</span><br><span>--- a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl</span><br><span>+++ b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl</span><br><span>@@ -216,15 +216,16 @@</span><br><span> Store (Zero, \S33G)</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-External (\_TZ.THRM)</span><br><span> External (\_TZ.SKIN)</span><br><span> </span><br><span> Method (TZUP)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_THERMALZONE</span><br><span> /* Update Primary Thermal Zone */</span><br><span> If (CondRefOf (\_TZ.THRM)) {</span><br><span> Notify (\_TZ.THRM, 0x81)</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> /* Update Secondary Thermal Zone */</span><br><span> If (CondRefOf (\_TZ.SKIN)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26123">change 26123</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/26123"/><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: I7af4a346496c1352ec20bda8acb338b5d277d99b </div>
<div style="display:none"> Gerrit-Change-Number: 26123 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>