Commit 9bcb8118 authored Feb 01, 2012 by Matthew Garrett Committed by Len Brown Mar 30, 2012

ACPI: Evaluate thermal trip points before reading temperature



An HP laptop (Pavilion G4-1016tx) has the following code in _TMP:

       Store (\_SB.PCI0.LPCB.EC0.RTMP, Local0)
       If (LGreaterEqual (Local0, S4TP))
       {
           Store (One, HTS4)
       }

S4TP is initialised at 0 and not programmed further until either _HOT or
_CRT is called. If we evaluate _TMP before the trip points then HTS4 will
always be set, causing the firmware to generate a message on boot
complaining that the system shut down because of overheating. The simplest
solution is just to reverse the checking of trip points and _TMP in thermal
init.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Len Brown <len.brown@intel.com>

parent f1f0e2ac

drivers/acpi/thermal.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -941,13 +941,13 @@ static int acpi_thermal_get_info(struct acpi_thermal *tz)
		if (!tz)
		return -EINVAL;

		/* Get temperature [_TMP] (required) */
		result = acpi_thermal_get_temperature(tz);
		/* Get trip points [_CRT, _PSV, etc.] (required) */
		result = acpi_thermal_get_trip_points(tz);
		if (result)
		return result;

		/* Get trip points [_CRT, _PSV, etc.] (required) */
		result = acpi_thermal_get_trip_points(tz);
		/* Get temperature [_TMP] (required) */
		result = acpi_thermal_get_temperature(tz);
		if (result)
		return result;