Commit 97efecfd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

thermal: ACPI: Initialize trips if temperature is out of range

In some cases it is still useful to register a trip point if the
temperature returned by the corresponding ACPI thermal object (for
example, _HOT) is invalid to start with, because the same ACPI
thermal object may start to return a valid temperature after a
system configuration change (for example, from an AC power source
to battery an vice versa).

For this reason, if the ACPI thermal object evaluated by
thermal_acpi_trip_init() successfully returns a temperature value that
is out of the range of values taken into account, initialize the trip
point using THERMAL_TEMP_INVALID as the temperature value instead of
returning an error to allow the user of the trip point to decide what
to do with it.

Also update pch_wpt_add_acpi_psv_trip() to reject trip points with
invalid temperature values.

Fixes: 7a0e3974 ("thermal: ACPI: Add ACPI trip point routines")
Reported-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent a5c926ac
...@@ -107,7 +107,7 @@ static void pch_wpt_add_acpi_psv_trip(struct pch_thermal_device *ptd, ...@@ -107,7 +107,7 @@ static void pch_wpt_add_acpi_psv_trip(struct pch_thermal_device *ptd,
return; return;
ret = thermal_acpi_trip_passive(adev, &ptd->trips[*nr_trips]); ret = thermal_acpi_trip_passive(adev, &ptd->trips[*nr_trips]);
if (ret) if (ret || ptd->trips[*nr_trips].temperature <= 0)
return; return;
++(*nr_trips); ++(*nr_trips);
......
...@@ -64,13 +64,14 @@ static int thermal_acpi_trip_init(struct acpi_device *adev, ...@@ -64,13 +64,14 @@ static int thermal_acpi_trip_init(struct acpi_device *adev,
return -ENODATA; return -ENODATA;
} }
if (temp < TEMP_MIN_DECIK || temp >= TEMP_MAX_DECIK) { if (temp >= TEMP_MIN_DECIK && temp <= TEMP_MAX_DECIK) {
trip->temperature = deci_kelvin_to_millicelsius(temp);
} else {
acpi_handle_debug(adev->handle, "%s result %llu out of range\n", acpi_handle_debug(adev->handle, "%s result %llu out of range\n",
obj_name, temp); obj_name, temp);
return -ENODATA; trip->temperature = THERMAL_TEMP_INVALID;
} }
trip->temperature = deci_kelvin_to_millicelsius(temp);
trip->hysteresis = 0; trip->hysteresis = 0;
trip->type = type; trip->type = type;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment