From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
commit 7f18bd49cb6b6a3ab6d860fefccdc94f2a247db0 upstream.
It is reported that commit 950210887670 ("thermal: core: Drop
trips_disabled bitmask") causes the maximum frequency of CPUs to drop
further down with every system sleep-wake cycle on Intel Core i7-4710HQ.
This turns out to be due to a trip point whose temperature is equal to 0
degrees Celsius which is acted on every time the system wakes from sleep.
Before commit 950210887670 this trip point would be disabled wia the
trips_disabled bitmask, but now it is treated as a valid one.
Since ACPI thermal control is generally about protection against
overheating, trip points with temperature of 0 centigrade or below are
not particularly useful there, so initialize them all as invalid which
fixes the problem at hand.
Fixes: 950210887670 ("thermal: core: Drop trips_disabled bitmask")
Closes: https://lore.kernel.org/linux-pm/3f71747b-f852-4ee0-b384-cf46b2aefa3f@xxxxxxx
Reported-by: Tibor Billes <tbilles@xxxxxxx>
Tested-by: Tibor Billes <tbilles@xxxxxxx>
Cc: 6.7+ <stable@xxxxxxxxxxxxxxx> # 6.7+
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/thermal.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -168,11 +168,17 @@ static int acpi_thermal_get_polling_freq
static int acpi_thermal_temp(struct acpi_thermal *tz, int temp_deci_k)
{
+ int temp;
+
if (temp_deci_k == THERMAL_TEMP_INVALID)
return THERMAL_TEMP_INVALID;
- return deci_kelvin_to_millicelsius_with_offset(temp_deci_k,
+ temp = deci_kelvin_to_millicelsius_with_offset(temp_deci_k,
tz->kelvin_offset);
+ if (temp <= 0)
+ return THERMAL_TEMP_INVALID;
+
+ return temp;
}
static bool acpi_thermal_trip_valid(struct acpi_thermal_trip *acpi_trip)
Patches currently in stable-queue which might be from rafael.j.wysocki@xxxxxxxxx are
queue-6.9/acpi-x86-force-storaged3enable-on-more-products.patch
queue-6.9/thermal-core-do-not-fail-cdev-registration-because-o.patch
queue-6.9/cpufreq-amd-pstate-add-quirk-for-the-pstate-cppc-cap.patch
queue-6.9/cpufreq-amd-pstate-remove-global-header-file.patch
queue-6.9/cpufreq-amd-pstate-unify-computation-of-max-min-nomi.patch
queue-6.9/thermal-acpi-invalidate-trip-points-with-temperature-of-0-or-below.patch
