This is a note to let you know that I've just added the patch titled
thermal: trip: Drop lockdep assertion from thermal_zone_trip_id()
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
thermal-trip-drop-lockdep-assertion-from-thermal_zone_trip_id.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 108ffd12be24ba1d74b3314df8db32a0a6d55ba5 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@xxxxxxxxx>
Date: Wed, 11 Oct 2023 17:45:42 +0200
Subject: thermal: trip: Drop lockdep assertion from thermal_zone_trip_id()
From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
commit 108ffd12be24ba1d74b3314df8db32a0a6d55ba5 upstream.
The lockdep assertion in thermal_zone_trip_id() triggers when the
trip point sysfs attribute of a thermal instance is read, because
there is no thermal zone locking in that code path.
This is not verly useful, though, because there is no mechanism by which
the location of the trips[] table in a thermal zone or its size can
change after binding cooling devices to the trips in that thermal
zone and before those cooling devices are unbound from them. Thus
it is not in fact necessary to hold the thermal zone lock when
thermal_zone_trip_id() is called from trip_point_show() and so the
lockdep asserion in the former is invalid.
Accordingly, drop that lockdep assertion.
Fixes: 2c7b4bfadef0 ("thermal: core: Store trip pointer in struct thermal_instance")
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/thermal/thermal_trip.c | 2 --
1 file changed, 2 deletions(-)
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -178,8 +178,6 @@ int thermal_zone_trip_id(struct thermal_
{
int i;
- lockdep_assert_held(&tz->lock);
-
for (i = 0; i < tz->num_trips; i++) {
if (&tz->trips[i] == trip)
return i;
Patches currently in stable-queue which might be from rafael.j.wysocki@xxxxxxxxx are
queue-6.6/thermal-trip-drop-lockdep-assertion-from-thermal_zone_trip_id.patch
queue-6.6/async-split-async_schedule_node_domain.patch
queue-6.6/cpufreq-intel_pstate-refine-computation-of-p-state-for-given-frequency.patch
queue-6.6/pm-sleep-fix-possible-deadlocks-in-core-system-wide-pm-code.patch
queue-6.6/thermal-gov_power_allocator-avoid-inability-to-reset.patch
queue-6.6/thermal-intel-hfi-disable-an-hfi-instance-when-all-i.patch
queue-6.6/thermal-core-store-trip-pointer-in-struct-thermal_in.patch
queue-6.6/thermal-intel-hfi-add-syscore-callbacks-for-system-w.patch
queue-6.6/async-introduce-async_schedule_dev_nocall.patch
queue-6.6/cpufreq-amd-pstate-fix-setting-scaling-max-min-freq-.patch
queue-6.6/pm-hibernate-enforce-ordering-during-image-compression-decompression.patch
queue-6.6/thermal-trip-drop-redundant-trips-check-from-for_eac.patch
queue-6.6/thermal-intel-hfi-refactor-enabling-code-into-helper.patch
