2024-05-28 15:01:52

by Rafael J. Wysocki

Subject: [PATCH v2 7/8] thermal/debugfs: Move some statements from under thermal_dbg->lock

From: Rafael J. Wysocki <[email protected]>

The tz_dbg local variable assignments in thermal_debug_tz_trip_up(),
thermal_debug_tz_trip_down(), and thermal_debug_update_trip_stats()
need not be carried out under thermal_dbg->lock, so move them from
under that lock (to avoid possible future confusion).

While at it, reorder local variable definitions in
thermal_debug_tz_trip_up() for more clarity.

No functional impact.

Signed-off-by: Rafael J. Wysocki <[email protected]>
---

v1 -> v2: Rebase.

---
drivers/thermal/thermal_debugfs.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

Index: linux-pm/drivers/thermal/thermal_debugfs.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_debugfs.c
+++ linux-pm/drivers/thermal/thermal_debugfs.c
@@ -574,20 +574,20 @@ static struct tz_episode *thermal_debugf
void thermal_debug_tz_trip_up(struct thermal_zone_device *tz,
const struct thermal_trip *trip)
{
- struct tz_episode *tze;
- struct tz_debugfs *tz_dbg;
struct thermal_debugfs *thermal_dbg = tz->debugfs;
int trip_id = thermal_zone_trip_id(tz, trip);
ktime_t now = ktime_get();
struct trip_stats *trip_stats;
+ struct tz_debugfs *tz_dbg;
+ struct tz_episode *tze;

if (!thermal_dbg)
return;

- mutex_lock(&thermal_dbg->lock);
-
tz_dbg = &thermal_dbg->tz_dbg;

+ mutex_lock(&thermal_dbg->lock);
+
/*
* The mitigation is starting. A mitigation can contain
* several episodes where each of them is related to a
@@ -677,10 +677,10 @@ void thermal_debug_tz_trip_down(struct t
if (!thermal_dbg)
return;

- mutex_lock(&thermal_dbg->lock);
-
tz_dbg = &thermal_dbg->tz_dbg;

+ mutex_lock(&thermal_dbg->lock);
+
/*
* The temperature crosses the way down but there was not
* mitigation detected before. That may happen when the
@@ -729,10 +729,10 @@ void thermal_debug_update_trip_stats(str
if (!thermal_dbg)
return;

- mutex_lock(&thermal_dbg->lock);
-
tz_dbg = &thermal_dbg->tz_dbg;

+ mutex_lock(&thermal_dbg->lock);
+
if (!tz_dbg->nr_trips)
goto out;

2024-06-10 13:33:59

by Daniel Lezcano

Subject: Re: [PATCH v2 7/8] thermal/debugfs: Move some statements from under thermal_dbg->lock

On 28/05/2024 16:59, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <[email protected]>
>
> The tz_dbg local variable assignments in thermal_debug_tz_trip_up(),
> thermal_debug_tz_trip_down(), and thermal_debug_update_trip_stats()
> need not be carried out under thermal_dbg->lock,

May be explain why ?

> so move them from
> under that lock (to avoid possible future confusion).
>
> While at it, reorder local variable definitions in
> thermal_debug_tz_trip_up() for more clarity.
>
> No functional impact.
>
> Signed-off-by: Rafael J. Wysocki <[email protected]>

Acked-by: Daniel Lezcano <[email protected]>


--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog