From: Lukasz Luba <lukasz.luba@arm.com> To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: rui.zhang@intel.com, amit.kucheria@verdurent.com, daniel.lezcano@linaro.org, lukasz.luba@arm.com, orjan.eide@arm.com, robh@kernel.org, alyssa.rosenzweig@collabora.com, steven.price@arm.com, airlied@linux.ie, daniel@ffwll.ch, ionela.voinescu@arm.com Subject: [PATCH v2 1/5] thermal: devfreq_cooling: change tracing function and arguments Date: Wed, 18 Nov 2020 12:03:54 +0000 [thread overview] Message-ID: <20201118120358.17150-2-lukasz.luba@arm.com> (raw) In-Reply-To: <20201118120358.17150-1-lukasz.luba@arm.com> 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: Steven Rostedt (VMware) <rostedt@goodmis.org> # for tracing code Signed-off-by: Lukasz Luba <lukasz.luba@arm.com> --- drivers/thermal/devfreq_cooling.c | 3 +-- include/trace/events/thermal.h | 19 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c index dfab49a67252..659c0143c9f0 100644 --- 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 135e5421f003..8a5f04888abd 100644 --- 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) ); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Lukasz Luba <lukasz.luba@arm.com> To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: amit.kucheria@verdurent.com, airlied@linux.ie, daniel.lezcano@linaro.org, steven.price@arm.com, alyssa.rosenzweig@collabora.com, rui.zhang@intel.com, ionela.voinescu@arm.com, orjan.eide@arm.com, lukasz.luba@arm.com Subject: [PATCH v2 1/5] thermal: devfreq_cooling: change tracing function and arguments Date: Wed, 18 Nov 2020 12:03:54 +0000 [thread overview] Message-ID: <20201118120358.17150-2-lukasz.luba@arm.com> (raw) In-Reply-To: <20201118120358.17150-1-lukasz.luba@arm.com> 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: Steven Rostedt (VMware) <rostedt@goodmis.org> # for tracing code Signed-off-by: Lukasz Luba <lukasz.luba@arm.com> --- drivers/thermal/devfreq_cooling.c | 3 +-- include/trace/events/thermal.h | 19 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c index dfab49a67252..659c0143c9f0 100644 --- 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 135e5421f003..8a5f04888abd 100644 --- 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) ); -- 2.17.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-11-18 12:04 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-18 12:03 [PATCH v2 0/5] Thermal devfreq cooling improvements with Energy Model Lukasz Luba 2020-11-18 12:03 ` Lukasz Luba 2020-11-18 12:03 ` Lukasz Luba [this message] 2020-11-18 12:03 ` [PATCH v2 1/5] thermal: devfreq_cooling: change tracing function and arguments Lukasz Luba 2020-12-02 10:23 ` Ionela Voinescu 2020-12-02 10:23 ` Ionela Voinescu 2020-11-18 12:03 ` [PATCH v2 2/5] thermal: devfreq_cooling: get a copy of device status Lukasz Luba 2020-11-18 12:03 ` Lukasz Luba 2020-12-02 10:23 ` Ionela Voinescu 2020-12-02 10:23 ` Ionela Voinescu 2020-12-03 13:09 ` Daniel Lezcano 2020-12-03 13:09 ` Daniel Lezcano 2020-12-03 15:38 ` Lukasz Luba 2020-12-03 15:38 ` Lukasz Luba 2020-12-03 16:09 ` Daniel Lezcano 2020-12-03 16:09 ` Daniel Lezcano 2020-12-07 12:41 ` Lukasz Luba 2020-12-07 12:41 ` Lukasz Luba 2020-12-08 14:20 ` Lukasz Luba 2020-12-08 14:20 ` Lukasz Luba 2020-11-18 12:03 ` [PATCH v2 3/5] thermal: devfreq_cooling: add new registration functions with Energy Model Lukasz Luba 2020-11-18 12:03 ` Lukasz Luba 2020-12-02 10:24 ` Ionela Voinescu 2020-12-02 10:24 ` Ionela Voinescu 2020-12-02 11:14 ` Lukasz Luba 2020-12-02 11:14 ` Lukasz Luba 2020-12-02 11:49 ` Ionela Voinescu 2020-12-02 11:49 ` Ionela Voinescu 2020-12-02 11:54 ` Lukasz Luba 2020-12-02 11:54 ` Lukasz Luba 2020-12-03 15:40 ` Daniel Lezcano 2020-12-03 15:40 ` Daniel Lezcano 2020-12-07 9:46 ` Lukasz Luba 2020-12-07 9:46 ` Lukasz Luba 2020-11-18 12:03 ` [PATCH v2 4/5] thermal: devfreq_cooling: remove old power model and use EM Lukasz Luba 2020-11-18 12:03 ` Lukasz Luba 2020-12-02 10:26 ` Ionela Voinescu 2020-12-02 10:26 ` Ionela Voinescu 2020-11-18 12:03 ` [PATCH v2 5/5] drm/panfrost: Register devfreq cooling and attempt to add Energy Model Lukasz Luba 2020-11-18 12:03 ` Lukasz Luba 2020-12-02 15:01 ` [PATCH v2 0/5] Thermal devfreq cooling improvements with " Daniel Lezcano 2020-12-02 15:01 ` Daniel Lezcano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201118120358.17150-2-lukasz.luba@arm.com \ --to=lukasz.luba@arm.com \ --cc=airlied@linux.ie \ --cc=alyssa.rosenzweig@collabora.com \ --cc=amit.kucheria@verdurent.com \ --cc=daniel.lezcano@linaro.org \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=ionela.voinescu@arm.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=orjan.eide@arm.com \ --cc=robh@kernel.org \ --cc=rui.zhang@intel.com \ --cc=steven.price@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.