diff options
| author | Martin Roth <martinroth@google.com> | 2018-04-29 22:41:58 -0500 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2018-05-01 15:54:55 +0000 |
| commit | 15f232df089a6620f7fe2541caa7713422885c72 (patch) | |
| tree | f0eab894d7aeaa53cb74539ceda199c394b9d27c | |
| parent | 3dc02ff637391f41255546e855ae5c01c44cf50d (diff) | |
| download | coreboot-15f232df089a6620f7fe2541caa7713422885c72.tar.xz | |
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@google.com>
Reviewed-on: https://review.coreboot.org/25916
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/ec/google/chromeec/acpi/ec.asl | 7 | ||||
| -rw-r--r-- | src/mainboard/google/cyan/variants/terra/include/variant/acpi/thermal.asl | 1 | ||||
| -rw-r--r-- | src/soc/intel/baytrail/acpi/dptf/thermal.asl | 1 | ||||
| -rw-r--r-- | src/soc/intel/braswell/acpi/dptf/thermal.asl | 1 | ||||
| -rw-r--r-- | src/soc/intel/common/acpi/dptf/thermal.asl | 1 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi/dptf/thermal.asl | 1 |
6 files changed, 8 insertions, 4 deletions
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl index 62f9acda4c..9ec5f7f3c5 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 @@ Device (EC0) /* 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 6879076415..1ff308dd75 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 00dc964895..d84ae4b040 100644 --- a/src/soc/intel/baytrail/acpi/dptf/thermal.asl +++ b/src/soc/intel/baytrail/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/braswell/acpi/dptf/thermal.asl b/src/soc/intel/braswell/acpi/dptf/thermal.asl index 5d685bb96b..e104756b3e 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 ce220c4604..c8aa03749b 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 d84807b410..829039242c 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) { |