From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux PM <linux-pm@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Lukasz Luba <lukasz.luba@arm.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Subject: [PATCH v2 7/8] thermal/debugfs: Move some statements from under thermal_dbg->lock
Date: Tue, 28 May 2024 16:59:55 +0200 [thread overview]
Message-ID: <22311651.EfDdHjke4D@kreacher> (raw)
In-Reply-To: <5794974.DvuYhMxLoT@kreacher>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
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 <rafael.j.wysocki@intel.com>
---
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;
next prev parent reply other threads:[~2024-05-28 15:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-28 14:51 [PATCH v2 0/8] thermal/debugfs: Assorted improvements for the 6.11 cycle Rafael J. Wysocki
2024-05-28 14:52 ` [PATCH v2 1/8] thermal/debugfs: Use helper to update trip point overstepping duration Rafael J. Wysocki
2024-06-10 7:52 ` Daniel Lezcano
2024-05-28 14:53 ` [PATCH v2 2/8] thermal/debugfs: Do not extend mitigation episodes beyond system resume Rafael J. Wysocki
2024-06-10 8:28 ` Daniel Lezcano
2024-06-10 11:29 ` Rafael J. Wysocki
2024-06-10 13:39 ` Daniel Lezcano
2024-06-11 18:35 ` Rafael J. Wysocki
2024-05-28 14:55 ` [PATCH v2 3/8] thermal/debugfs: Print mitigation timestamp value in milliseconds Rafael J. Wysocki
2024-06-10 8:29 ` Daniel Lezcano
2024-05-28 14:55 ` [PATCH v2 4/8] thermal/debugfs: Fix up units in "mitigations" files Rafael J. Wysocki
2024-06-10 8:30 ` Daniel Lezcano
2024-05-28 14:57 ` [PATCH v2 5/8] thermal/debugfs: Adjust check for trips without statistics in tze_seq_show() Rafael J. Wysocki
2024-06-10 8:59 ` Daniel Lezcano
2024-05-28 14:58 ` [PATCH v2 6/8] thermal/debugfs: Compute maximum temperature for mitigation episode as a whole Rafael J. Wysocki
2024-06-10 10:33 ` Daniel Lezcano
2024-05-28 14:59 ` Rafael J. Wysocki [this message]
2024-06-10 13:27 ` [PATCH v2 7/8] thermal/debugfs: Move some statements from under thermal_dbg->lock Daniel Lezcano
2024-05-28 15:00 ` [PATCH v2 8/8] thermal: trip: Use common set of trip type names Rafael J. Wysocki
2024-06-10 13:28 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=22311651.EfDdHjke4D@kreacher \
--to=rjw@rjwysocki.net \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=rafael@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox