[RFC PATCH for 6.13 v1 07/20] thermal: core: Mark thermal zones as exiting before unregistration

From: Rafael J. Wysocki
Date: Sat Sep 14 2024 - 07:07:26 EST


From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

In analogy with a previous change in the thermal zone registration code
path, to ensure that __thermal_zone_device_update() will return early
for thermal zones that are going away, introduce a thermal zone state
flag representing the "exit" state and set it along with deleting the
thermal zone from thermal_tz_list.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
drivers/thermal/thermal_core.c | 5 +++--
drivers/thermal/thermal_core.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)

Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -1563,10 +1563,11 @@ struct device *thermal_zone_device(struc
}
EXPORT_SYMBOL_GPL(thermal_zone_device);

-static void thermal_zone_del_from_list(struct thermal_zone_device *tz)
+static void thermal_zone_exit(struct thermal_zone_device *tz)
{
guard(thermal_zone)(tz);

+ tz->state |= TZ_STATE_FLAG_EXIT;
list_del(&tz->node);
}

@@ -1594,7 +1595,7 @@ void thermal_zone_device_unregister(stru
return;
}

- thermal_zone_del_from_list(tz);
+ thermal_zone_exit(tz);

/* Unbind all cdevs associated with 'this' thermal zone */
list_for_each_entry(cdev, &thermal_cdev_list, node)
Index: linux-pm/drivers/thermal/thermal_core.h
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.h
+++ linux-pm/drivers/thermal/thermal_core.h
@@ -65,6 +65,7 @@ struct thermal_governor {
#define TZ_STATE_FLAG_SUSPENDED BIT(0)
#define TZ_STATE_FLAG_RESUMING BIT(1)
#define TZ_STATE_FLAG_INIT BIT(2)
+#define TZ_STATE_FLAG_EXIT BIT(3)

#define TZ_STATE_READY 0