diff mbox series

[v2,07/12] thermal: core: Mark thermal zones as exiting before unregistration

Message ID 4394176.ejJDZkT8p0@rjwysocki.net
State New
Headers show
Series thermal: core: Fixes and cleanups, mostly related to thermal zone init and exit | expand

Commit Message

Rafael J. Wysocki Oct. 4, 2024, 7:26 p.m. UTC 
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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 while deleting the thermal
zone from thermal_tz_list.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

This is a new iteration of

https://lore.kernel.org/linux-pm/1997536.PYKUYFuaPT@rjwysocki.net/

v1 -> v2: Rebase.

---
 drivers/thermal/thermal_core.c |    3 +++
 drivers/thermal/thermal_core.h |    1 +
 2 files changed, 4 insertions(+)

Comments

Lukasz Luba Oct. 21, 2024, 10:31 p.m. UTC | #1 
On 10/4/24 20:26, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> 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 while deleting the thermal
> zone from thermal_tz_list.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
> 
> This is a new iteration of
> 
> https://lore.kernel.org/linux-pm/1997536.PYKUYFuaPT@rjwysocki.net/
> 
> v1 -> v2: Rebase.
> 
> ---
>   drivers/thermal/thermal_core.c |    3 +++
>   drivers/thermal/thermal_core.h |    1 +
>   2 files changed, 4 insertions(+)
> 
> Index: linux-pm/drivers/thermal/thermal_core.c
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_core.c
> +++ linux-pm/drivers/thermal/thermal_core.c
> @@ -1613,7 +1613,10 @@ void thermal_zone_device_unregister(stru
>   	}
>   
>   	mutex_lock(&tz->lock);
> +
> +	tz->state |= TZ_STATE_FLAG_EXIT;
>   	list_del(&tz->node);
> +
>   	mutex_unlock(&tz->lock);
>   
>   	/* Unbind all cdevs associated with 'this' thermal zone */
> Index: linux-pm/drivers/thermal/thermal_core.h
> ===================================================================
> --- linux-pm.orig/drivers/thermal/thermal_core.h
> +++ linux-pm/drivers/thermal/thermal_core.h
> @@ -64,6 +64,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
>   
> 
> 
> 

Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
diff mbox series

Patch

Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -1613,7 +1613,10 @@  void thermal_zone_device_unregister(stru
 	}
 
 	mutex_lock(&tz->lock);
+
+	tz->state |= TZ_STATE_FLAG_EXIT;
 	list_del(&tz->node);
+
 	mutex_unlock(&tz->lock);
 
 	/* Unbind all cdevs associated with 'this' thermal zone */
Index: linux-pm/drivers/thermal/thermal_core.h
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.h
+++ linux-pm/drivers/thermal/thermal_core.h
@@ -64,6 +64,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