trace: thermal: add another parameter 'power' to the tracing function

This patch adds another parameter to the trace function:
trace_thermal_power_devfreq_get_power().

In case when we call directly driver's code for the real power,
we do not have static/dynamic_power values. Instead we get total
power in the '*power' value. The 'static_power' and
'dynamic_power' are set to 0.

Therefore, we have to trace that '*power' value in this scenario.

CC: Steven Rostedt <rostedt@goodmis.org>
CC: Ingo Molnar <mingo@redhat.com>
CC: Zhang Rui <rui.zhang@intel.com>
CC: Eduardo Valentin <edubezval@gmail.com>
Acked-by: Javi Merino <javi.merino@kernel.org>
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>

diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c
index 26c31571a12c88ce67e7410bba38c1d1a863d722..ef59256887ff63d04db5efc08a4f082a68bb75b8 100644 (file)
--- a/drivers/thermal/devfreq_cooling.c
+++ b/drivers/thermal/devfreq_cooling.c
@@ -321,7 +321,7 @@ static int devfreq_cooling_get_requested_power(struct thermal_cooling_device *cd
        }
 
        trace_thermal_power_devfreq_get_power(cdev, status, freq, dyn_power,
-                                             static_power);
+                                             static_power, *power);
 
        return 0;
 fail:

diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h
index 2b4a8ff72d0dd54647255f6f8dc5ec8b61981872..6cde5b3514c2793cbaaffd3420c7217feafbad7a 100644 (file)
--- a/include/trace/events/thermal.h
+++ b/include/trace/events/thermal.h
@@ -151,9 +151,9 @@ TRACE_EVENT(thermal_power_cpu_limit,
 TRACE_EVENT(thermal_power_devfreq_get_power,
        TP_PROTO(struct thermal_cooling_device *cdev,
                 struct devfreq_dev_status *status, unsigned long freq,
-               u32 dynamic_power, u32 static_power),
+               u32 dynamic_power, u32 static_power, u32 power),
 
-       TP_ARGS(cdev, status,  freq, dynamic_power, static_power),
+       TP_ARGS(cdev, status,  freq, dynamic_power, static_power, power),
 
        TP_STRUCT__entry(
                __string(type,         cdev->type    )
@@ -161,6 +161,7 @@ TRACE_EVENT(thermal_power_devfreq_get_power,
                __field(u32,           load          )
                __field(u32,           dynamic_power )
                __field(u32,           static_power  )
+               __field(u32,           power)
        ),
 
        TP_fast_assign(
@@ -169,11 +170,13 @@ TRACE_EVENT(thermal_power_devfreq_get_power,
                __entry->load = (100 * status->busy_time) / status->total_time;
                __entry->dynamic_power = dynamic_power;
                __entry->static_power = static_power;
+               __entry->power = power;
        ),
 
-       TP_printk("type=%s freq=%lu load=%u dynamic_power=%u static_power=%u",
+       TP_printk("type=%s freq=%lu load=%u dynamic_power=%u static_power=%u power=%u",
                __get_str(type), __entry->freq,
-               __entry->load, __entry->dynamic_power, __entry->static_power)
+               __entry->load, __entry->dynamic_power, __entry->static_power,
+               __entry->power)
 );
 
 TRACE_EVENT(thermal_power_devfreq_limit,