[coreboot-gerrit] Change in coreboot[master]: chromeec platforms: Update ACPI thermal event handler call

[Martin Roth (Code Review)]

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/25916


Change subject: chromeec platforms: Update ACPI thermal event handler call
......................................................................

chromeec platforms: Update ACPI thermal event handler call

Currently the thermal event handler method TEVT is defined as an extern,
then defined again in platforms with thermal event handling.  In newer
versions of IASL, this generates an error, as the method is defined in
two places.  Simply removing the extern causes the call to it to fail on
platforms where it isn't actually defined, so add a preprocessor define
where it's implemented, and only call the method on those platforms.

Change-Id: I64dcd2918d14f75ad3c356b321250bfa9d92c8a5
Signed-off-by: Martin Roth <martinroth at google.com>
---
M src/ec/google/chromeec/acpi/ec.asl
M src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
M src/soc/intel/baytrail/acpi/dptf/thermal.asl
M src/soc/intel/braswell/acpi/dptf/thermal.asl
M src/soc/intel/common/acpi/dptf/thermal.asl
M src/soc/intel/skylake/acpi/dptf/thermal.asl
6 files changed, 9 insertions(+), 4 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/25916/1

diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 62f9acd..9ec5f7f 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -21,7 +21,6 @@
 
 // Mainboard specific throttle handler
 External (\_TZ.THRT, MethodObj)
-External (\_SB.DPTF.TEVT, MethodObj)
 #ifdef DPTF_ENABLE_CHARGER
 External (\_SB.DPTF.TCHG, DeviceObj)
 #endif
@@ -481,9 +480,9 @@
 		/* When sensor ID returns 0xFF then no more events */
 		While (LNotEqual (Local0, EC_TEMP_SENSOR_NOT_PRESENT))
 		{
-			If (CondRefOf (\_SB.DPTF.TEVT)) {
-				\_SB.DPTF.TEVT (Local0)
-			}
+#ifdef HAVE_THERM_EVENT_HANDLER
+			\_SB.DPTF.TEVT (Local0)
+#endif
 
 			/* Keep reaading sensor ID for event */
 			Store (^PATI, Local0)
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
index 6879076..1ff308d 100644
--- a/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
+++ b/src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl
@@ -15,6 +15,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 	Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/baytrail/acpi/dptf/thermal.asl b/src/soc/intel/baytrail/acpi/dptf/thermal.asl
index 00dc964..6fa8eea 100644
--- a/src/soc/intel/baytrail/acpi/dptf/thermal.asl
+++ b/src/soc/intel/baytrail/acpi/dptf/thermal.asl
@@ -12,7 +12,9 @@
  * GNU General Public License for more details.
  */
 
+
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 	Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/braswell/acpi/dptf/thermal.asl b/src/soc/intel/braswell/acpi/dptf/thermal.asl
index 5d685bb..e104756 100644
--- a/src/soc/intel/braswell/acpi/dptf/thermal.asl
+++ b/src/soc/intel/braswell/acpi/dptf/thermal.asl
@@ -13,6 +13,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 	Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/common/acpi/dptf/thermal.asl b/src/soc/intel/common/acpi/dptf/thermal.asl
index ce220c4..c8aa037 100644
--- a/src/soc/intel/common/acpi/dptf/thermal.asl
+++ b/src/soc/intel/common/acpi/dptf/thermal.asl
@@ -15,6 +15,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 	Store (ToInteger (Arg0), Local0)
diff --git a/src/soc/intel/skylake/acpi/dptf/thermal.asl b/src/soc/intel/skylake/acpi/dptf/thermal.asl
index d84807b..8290392 100644
--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl
+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl
@@ -15,6 +15,7 @@
  */
 
 /* Thermal Threshold Event Handler */
+#define HAVE_THERM_EVENT_HANDLER
 Method (TEVT, 1, NotSerialized)
 {
 

-- 
To view, visit https://review.coreboot.org/25916
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64dcd2918d14f75ad3c356b321250bfa9d92c8a5
Gerrit-Change-Number: 25916
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180430/472f8f66/attachment-0001.html>