Skip to content

Commit

Permalink
thermal: trace: Trace when temperature is above a trip point
Browse files Browse the repository at this point in the history
Create a new event to trace when the temperature is above a trip
point. Use the trace-point when handling non-critical and critical
trip pionts.

Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
  • Loading branch information
Punit Agrawal authored and Eduardo Valentin committed Jul 29, 2014
1 parent 3981156 commit 208cd82
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 1 deletion.
12 changes: 12 additions & 0 deletions drivers/thermal/fair_share.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/

#include <linux/thermal.h>
#include <trace/events/thermal.h>

#include "thermal_core.h"

Expand All @@ -34,6 +35,7 @@ static int get_trip_level(struct thermal_zone_device *tz)
{
int count = 0;
unsigned long trip_temp;
enum thermal_trip_type trip_type;

if (tz->trips == 0 || !tz->ops->get_trip_temp)
return 0;
Expand All @@ -43,6 +45,16 @@ static int get_trip_level(struct thermal_zone_device *tz)
if (tz->temperature < trip_temp)
break;
}

/*
* count > 0 only if temperature is greater than first trip
* point, in which case, trip_point = count - 1
*/
if (count > 0) {
tz->ops->get_trip_type(tz, count - 1, &trip_type);
trace_thermal_zone_trip(tz, count - 1, trip_type);
}

return count;
}

Expand Down
5 changes: 4 additions & 1 deletion drivers/thermal/step_wise.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/

#include <linux/thermal.h>
#include <trace/events/thermal.h>

#include "thermal_core.h"

Expand Down Expand Up @@ -129,8 +130,10 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)

trend = get_tz_trend(tz, trip);

if (tz->temperature >= trip_temp)
if (tz->temperature >= trip_temp) {
throttle = true;
trace_thermal_zone_trip(tz, trip, trip_type);
}

dev_dbg(&tz->device, "Trip%d[type=%d,temp=%ld]:trend=%d,throttle=%d\n",
trip, trip_type, trip_temp, trend, throttle);
Expand Down
2 changes: 2 additions & 0 deletions drivers/thermal/thermal_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,8 @@ static void handle_critical_trips(struct thermal_zone_device *tz,
if (tz->temperature < trip_temp)
return;

trace_thermal_zone_trip(tz, trip, trip_type);

if (tz->ops->notify)
tz->ops->notify(tz, trip, trip_type);

Expand Down
26 changes: 26 additions & 0 deletions include/trace/events/thermal.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,32 @@ TRACE_EVENT(cdev_update,
TP_printk("type=%s target=%lu", __get_str(type), __entry->target)
);

TRACE_EVENT(thermal_zone_trip,

TP_PROTO(struct thermal_zone_device *tz, int trip,
enum thermal_trip_type trip_type),

TP_ARGS(tz, trip, trip_type),

TP_STRUCT__entry(
__string(thermal_zone, tz->type)
__field(int, id)
__field(int, trip)
__field(enum thermal_trip_type, trip_type)
),

TP_fast_assign(
__assign_str(thermal_zone, tz->type);
__entry->id = tz->id;
__entry->trip = trip;
__entry->trip_type = trip_type;
),

TP_printk("thermal_zone=%s id=%d trip=%d trip_type=%d",
__get_str(thermal_zone), __entry->id, __entry->trip,
__entry->trip_type)
);

#endif /* _TRACE_THERMAL_H */

/* This part must be outside protection */
Expand Down

0 comments on commit 208cd82

Please sign in to comment.