2024-04-17 15:52:10

by Rafael J. Wysocki

Subject: [PATCH v1] thermal/debugfs: Make tze_seq_show() skip invalid trips and trips with no stats

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

Currently, tze_seq_show() output includes all of the trips in the zone
except for critical ones, including invalid trips and trips with no stats
which is confusing.

Make it skip the trips for which there is not mitigation information.

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

This is independent of the other thermal patches sent by me recently.

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

Index: linux-pm/drivers/thermal/thermal_debugfs.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_debugfs.c
+++ linux-pm/drivers/thermal/thermal_debugfs.c
@@ -754,6 +754,11 @@ static int tze_seq_show(struct seq_file

for_each_trip_desc(tz, td) {
const struct thermal_trip *trip = &td->trip;
+ struct trip_stats *trip_stats;
+
+ /* Skip invalid trips. */
+ if (trip->temperature == THERMAL_TEMP_INVALID)
+ continue;

/*
* There is no possible mitigation happening at the
@@ -763,6 +768,13 @@ static int tze_seq_show(struct seq_file
if (trip->type == THERMAL_TRIP_CRITICAL)
continue;

+ trip_id = thermal_zone_trip_id(tz, trip);
+ trip_stats = &tze->trip_stats[trip_id];
+
+ /* Skip trips without any stats. */
+ if (trip_stats->min > trip_stats->max)
+ continue;
+
if (trip->type == THERMAL_TRIP_PASSIVE)
type = "passive";
else if (trip->type == THERMAL_TRIP_ACTIVE)
@@ -770,17 +782,15 @@ static int tze_seq_show(struct seq_file
else
type = "hot";

- trip_id = thermal_zone_trip_id(tz, trip);
-
seq_printf(s, "| %*d | %*s | %*d | %*d | %*lld | %*d | %*d | %*d |\n",
4 , trip_id,
8, type,
9, trip->temperature,
9, trip->hysteresis,
- 10, ktime_to_ms(tze->trip_stats[trip_id].duration),
- 9, tze->trip_stats[trip_id].avg,
- 9, tze->trip_stats[trip_id].min,
- 9, tze->trip_stats[trip_id].max);
+ 10, ktime_to_ms(trip_stats->duration),
+ 9, trip_stats->avg,
+ 9, trip_stats->min,
+ 9, trip_stats->max);
}

return 0;

2024-04-22 11:14:46

by Daniel Lezcano

Subject: Re: [PATCH v1] thermal/debugfs: Make tze_seq_show() skip invalid trips and trips with no stats

On 17/04/2024 17:51, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <[email protected]>
>
> Currently, tze_seq_show() output includes all of the trips in the zone
> except for critical ones, including invalid trips and trips with no stats
> which is confusing.
>
> Make it skip the trips for which there is not mitigation information.
>
> 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