thermal: devfreq_cooling: change tracing function and arguments

Prepare for deleting the static and dynamic power calculation and clean
the trace function. These two fields are going to be removed in the next
changes.

Reviewed-by: Ionela Voinescu <ionela.voinescu@arm.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> # for tracing code
Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20201210143014.24685-2-lukasz.luba@arm.com

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

diff --git a/include/trace/events/thermal.h b/include/trace/events/thermal.h
index 135e5421f00353a35d8d9b0ab76675d5c8695de1..8a5f04888abd7e0a06ead24531668a52165b1556 100644 (file)
--- a/include/trace/events/thermal.h
+++ b/include/trace/events/thermal.h
@@ -153,31 +153,30 @@ 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 power),
+               u32 power),
 
-       TP_ARGS(cdev, status,  freq, dynamic_power, static_power, power),
+       TP_ARGS(cdev, status,  freq, power),
 
        TP_STRUCT__entry(
                __string(type,         cdev->type    )
                __field(unsigned long, freq          )
-               __field(u32,           load          )
-               __field(u32,           dynamic_power )
-               __field(u32,           static_power  )
+               __field(u32,           busy_time)
+               __field(u32,           total_time)
                __field(u32,           power)
        ),
 
        TP_fast_assign(
                __assign_str(type, cdev->type);
                __entry->freq = freq;
-               __entry->load = (100 * status->busy_time) / status->total_time;
-               __entry->dynamic_power = dynamic_power;
-               __entry->static_power = static_power;
+               __entry->busy_time = status->busy_time;
+               __entry->total_time = status->total_time;
                __entry->power = power;
        ),
 
-       TP_printk("type=%s freq=%lu load=%u dynamic_power=%u static_power=%u power=%u",
+       TP_printk("type=%s freq=%lu load=%u power=%u",
                __get_str(type), __entry->freq,
-               __entry->load, __entry->dynamic_power, __entry->static_power,
+               __entry->total_time == 0 ? 0 :
+                       (100 * __entry->busy_time) / __entry->total_time,
                __entry->power)
 );