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

[Martin Roth (Code Review)]

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


Change subject: chromeec platforms: Update ACPI throttle handler call
......................................................................

chromeec platforms: Update ACPI throttle handler call

Currently the throttle event handler method THRT is defined as an extern,
then defined again in the platform 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: I6337c52edaf9350843848b31c5d87bbfca403930
Signed-off-by: Martin Roth <martinroth at google.com>
---
M src/ec/google/chromeec/acpi/ec.asl
M src/mainboard/google/slippy/acpi/thermal.asl
2 files changed, 5 insertions(+), 7 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/21/26121/1

diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index ac4ceb1..681d431 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -20,7 +20,6 @@
  */
 
 // Mainboard specific throttle handler
-External (\_TZ.THRT, MethodObj)
 #ifdef DPTF_ENABLE_CHARGER
 External (\_SB.DPTF.TCHG, DeviceObj)
 #endif
@@ -321,23 +320,21 @@
 		Notify (BAT0, 0x80)
 	}
 
+#ifdef HAVE_THROTTLING_HANDLER
 	// Throttle Start
 	Method (_Q12, 0, NotSerialized)
 	{
 		Store ("EC: THROTTLE START", Debug)
-		If (CondRefOf (\_TZ.THRT)) {
-			\_TZ.THRT (1)
-		}
+		\_TZ.THRT (1)
 	}
 
 	// Throttle Stop
 	Method (_Q13, 0, NotSerialized)
 	{
 		Store ("EC: THROTTLE STOP", Debug)
-		If (CondRefOf (\_TZ.THRT)) {
-			\_TZ.THRT (0)
-		}
+		\_TZ.THRT (0)
 	}
+#endif
 
 #ifdef EC_ENABLE_PD_MCU_DEVICE
 	// PD event
diff --git a/src/mainboard/google/slippy/acpi/thermal.asl b/src/mainboard/google/slippy/acpi/thermal.asl
index 36b0e21..1b96944 100644
--- a/src/mainboard/google/slippy/acpi/thermal.asl
+++ b/src/mainboard/google/slippy/acpi/thermal.asl
@@ -15,6 +15,7 @@
 
 // Thermal Zone
 
+#define HAVE_THROTTLING_HANDLER
 Scope (\_TZ)
 {
 	// Handler for throttle requests on this platform

-- 
To view, visit https://review.coreboot.org/26121
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: I6337c52edaf9350843848b31c5d87bbfca403930
Gerrit-Change-Number: 26121
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/20180506/805836ec/attachment.html>