summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/thermal_acpi.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-01-26 13:53:49 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2023-01-27 15:09:47 +0100
commit97efecfdbf6fe4915e7f71603b634d5ad3f210b1 (patch)
tree96bc82bc5fedfd3ad9f46d7dd1ab140994facc2e /drivers/thermal/thermal_acpi.c
parentMerge back Intel thermal control changes for 6.3. (diff)
downloadlinux-97efecfdbf6fe4915e7f71603b634d5ad3f210b1.tar.xz
linux-97efecfdbf6fe4915e7f71603b634d5ad3f210b1.zip
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: 7a0e39748861 ("thermal: ACPI: Add ACPI trip point routines") Reported-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/thermal/thermal_acpi.c')
-rw-r--r--drivers/thermal/thermal_acpi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/thermal/thermal_acpi.c b/drivers/thermal/thermal_acpi.c
index f65281ca3ed0..671f774a7621 100644
--- a/drivers/thermal/thermal_acpi.c
+++ b/drivers/thermal/thermal_acpi.c
@@ -64,13 +64,14 @@ static int thermal_acpi_trip_init(struct acpi_device *adev,
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",
obj_name, temp);
- return -ENODATA;
+ trip->temperature = THERMAL_TEMP_INVALID;
}
- trip->temperature = deci_kelvin_to_millicelsius(temp);
trip->hysteresis = 0;
trip->type = type;