From mboxrd@z Thu Jan 1 00:00:00 1970 From: Javi Merino Subject: [RFC PATCH v2 7/7] thermal: add trace events to the power allocator governor Date: Tue, 20 May 2014 15:10:57 +0100 Message-ID: <1400595057-8585-8-git-send-email-javi.merino@arm.com> References: <1400595057-8585-1-git-send-email-javi.merino@arm.com> Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Return-path: In-Reply-To: <1400595057-8585-1-git-send-email-javi.merino@arm.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Punit.Agrawal@arm.com, Javi Merino , Zhang Rui , Eduardo Valentin , Steven Rostedt , Frederic Weisbecker , Ingo Molnar List-Id: linux-pm@vger.kernel.org Add trace events for the power allocator governor and the power actor interface of the cpu cooling device. Cc: Zhang Rui Cc: Eduardo Valentin Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Ingo Molnar Signed-off-by: Javi Merino --- trace-cmd needs the patched attached in http://article.gmane.org/gmane.linux.kernel/1704423 for this to work. drivers/thermal/power_actor/cpu_actor.c | 5 ++++ drivers/thermal/power_allocator.c | 12 +++++++++- include/trace/events/thermal.h | 38 +++++++++++++++++++++++++++= ++++ include/trace/events/thermal_governor.h | 35 +++++++++++++++++++++++++++= + 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 include/trace/events/thermal.h create mode 100644 include/trace/events/thermal_governor.h diff --git a/drivers/thermal/power_actor/cpu_actor.c b/drivers/thermal/powe= r_actor/cpu_actor.c index 0d76d52609fa..61f1edc13ec2 100644 --- a/drivers/thermal/power_actor/cpu_actor.c +++ b/drivers/thermal/power_actor/cpu_actor.c @@ -27,6 +27,9 @@ #include #include =20 +#define CREATE_TRACE_POINTS +#include + #include "power_actor.h" =20 /** @@ -188,6 +191,8 @@ static int cpu_set_power(struct power_actor *actor, u32= power) =09=09return -EINVAL; =09} =20 +=09trace_thermal_power_limit(&cpu_actor->cpumask, freq, cdev_state, power)= ; + =09return cdev->ops->set_cur_state(cdev, cdev_state); } =20 diff --git a/drivers/thermal/power_allocator.c b/drivers/thermal/power_allo= cator.c index 836c834a898c..b1ebcecb1c15 100644 --- a/drivers/thermal/power_allocator.c +++ b/drivers/thermal/power_allocator.c @@ -19,6 +19,9 @@ #include #include =20 +#define CREATE_TRACE_POINTS +#include + #include "power_actor/power_actor.h" #include "thermal_core.h" =20 @@ -117,7 +120,14 @@ static u32 pi_controller(struct thermal_zone_device *t= z, =09power_range =3D tz->tzp->max_dissipatable_power + =09=09frac_to_int(power_range); =20 -=09return clamp(power_range, (s64)0, (s64)max_allocatable_power); +=09power_range =3D clamp(power_range, (s64)0, (s64)max_allocatable_power); + +=09trace_thermal_power_allocator_pi(frac_to_int(err), +=09=09=09=09=09frac_to_int(params->err_integral), +=09=09=09=09=09frac_to_int(p), frac_to_int(i), +=09=09=09=09=09power_range); + +=09return power_range; } =20 /** diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.= h new file mode 100644 index 000000000000..6496da62276d --- /dev/null +++ b/include/trace/events/thermal.h @@ -0,0 +1,38 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM thermal + +#if !defined(_TRACE_THERMAL_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_THERMAL_H + +#include + +TRACE_EVENT(thermal_power_limit, +=09TP_PROTO(const struct cpumask *cpus, unsigned int freq, +=09=09unsigned long cdev_state, unsigned long power), + +=09TP_ARGS(cpus, freq, cdev_state, power), + +=09TP_STRUCT__entry( +=09=09__bitmask(cpumask, num_possible_cpus()) +=09=09__field(unsigned int, freq ) +=09=09__field(unsigned long, cdev_state) +=09=09__field(unsigned long, power ) +=09), + +=09TP_fast_assign( +=09=09__assign_bitmask(cpumask, cpumask_bits(cpus), +=09=09=09=09num_possible_cpus()); +=09=09__entry->freq =3D freq; +=09=09__entry->cdev_state =3D cdev_state; +=09=09__entry->power =3D power; +=09), + +=09TP_printk("cpus=3D%s freq=3D%u cdev_state=3D%lu power=3D%lu", +=09=09__get_bitmask(cpumask), __entry->freq, __entry->cdev_state, +=09=09__entry->power) +); + +#endif /* _TRACE_THERMAL_H */ + +/* This part must be outside protection */ +#include diff --git a/include/trace/events/thermal_governor.h b/include/trace/events= /thermal_governor.h new file mode 100644 index 000000000000..1fbf5c91f659 --- /dev/null +++ b/include/trace/events/thermal_governor.h @@ -0,0 +1,35 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM thermal_governor + +#if !defined(_TRACE_THERMAL_GOVERNOR_H) || defined(TRACE_HEADER_MULTI_READ= ) +#define _TRACE_THERMAL_GOVERNOR_H + +#include + +TRACE_EVENT(thermal_power_allocator_pi, +=09TP_PROTO(s32 err, s32 err_integral, s64 p, s64 i, s32 output), +=09TP_ARGS(err, err_integral, p, i, output), +=09TP_STRUCT__entry( +=09=09__field(s32, err ) +=09=09__field(s32, err_integral) +=09=09__field(s64, p ) +=09=09__field(s64, i ) +=09=09__field(s32, output ) +=09), +=09TP_fast_assign( +=09=09__entry->err =3D err; +=09=09__entry->err_integral =3D err_integral; +=09=09__entry->p =3D p; +=09=09__entry->i =3D i; +=09=09__entry->output =3D output; +=09), + +=09TP_printk("err=3D%d err_integral=3D%d p=3D%lld i=3D%lld output=3D%d", +=09=09__entry->err, __entry->err_integral, +=09=09__entry->p, __entry->i, __entry->output) +); + +#endif /* _TRACE_THERMAL_GOVERNOR_H */ + +/* This part must be outside protection */ +#include --=20 1.7.9.5