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 1/8] thermal/debugfs: Use helper to update trip point overstepping duration
Date: Tue, 28 May 2024 16:52:50 +0200 [thread overview]
Message-ID: <4933647.31r3eYUQgx@kreacher> (raw)
In-Reply-To: <5794974.DvuYhMxLoT@kreacher>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Add a helper for updating trip point overstepping duration to be called
from thermal_debug_tz_trip_down().
Subsequently, it will also be used during resume from system-wide
suspend.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
v1 -> v2: Rebase.
---
drivers/thermal/thermal_debugfs.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
Index: linux-pm/drivers/thermal/thermal_debugfs.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_debugfs.c
+++ linux-pm/drivers/thermal/thermal_debugfs.c
@@ -653,14 +653,24 @@ unlock:
mutex_unlock(&thermal_dbg->lock);
}
+static void tz_episode_close_trip(struct tz_episode *tze, int trip_id, ktime_t now)
+{
+ struct trip_stats *trip_stats = &tze->trip_stats[trip_id];
+ ktime_t delta = ktime_sub(now, trip_stats->timestamp);
+
+ trip_stats->duration = ktime_add(delta, trip_stats->duration);
+ /* Mark the end of mitigation for this trip point. */
+ trip_stats->timestamp = KTIME_MAX;
+}
+
void thermal_debug_tz_trip_down(struct thermal_zone_device *tz,
const struct thermal_trip *trip)
{
struct thermal_debugfs *thermal_dbg = tz->debugfs;
+ int trip_id = thermal_zone_trip_id(tz, trip);
+ ktime_t now = ktime_get();
struct tz_episode *tze;
struct tz_debugfs *tz_dbg;
- ktime_t delta, now = ktime_get();
- int trip_id = thermal_zone_trip_id(tz, trip);
int i;
if (!thermal_dbg)
@@ -695,13 +705,7 @@ void thermal_debug_tz_trip_down(struct t
tze = list_first_entry(&tz_dbg->tz_episodes, struct tz_episode, node);
- delta = ktime_sub(now, tze->trip_stats[trip_id].timestamp);
-
- tze->trip_stats[trip_id].duration =
- ktime_add(delta, tze->trip_stats[trip_id].duration);
-
- /* Mark the end of mitigation for this trip point. */
- tze->trip_stats[trip_id].timestamp = KTIME_MAX;
+ tz_episode_close_trip(tze, trip_id, now);
/*
* This event closes the mitigation as we are crossing the
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 ` Rafael J. Wysocki [this message]
2024-06-10 7:52 ` [PATCH v2 1/8] thermal/debugfs: Use helper to update trip point overstepping duration 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 ` [PATCH v2 7/8] thermal/debugfs: Move some statements from under thermal_dbg->lock Rafael J. Wysocki
2024-06-10 13:27 ` 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=4933647.31r3eYUQgx@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