From: Viresh Kumar <viresh.kumar@linaro.org>
To: Javi Merino <javi.merino@kernel.org>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Lukasz Luba <lukasz.luba@arm.com>,
Amit Daniel Kachhap <amit.kachhap@gmail.com>,
Viresh Kumar <viresh.kumar@linaro.org>
Cc: linaro-kernel@lists.linaro.org,
Rafael Wysocki <rjw@rjwysocki.net>,
linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
Punit Agrawal <punit.agrawal@arm.com>
Subject: [PATCH V4 16/17] thermal: cpu_cooling: 'freq' can't be zero in cpufreq_state2power()
Date: Tue, 25 Apr 2017 15:57:23 +0530 [thread overview]
Message-ID: <98df049ab5f1d13ebb497e922229f0e8b8160606.1493115651.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1493115651.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1493115651.git.viresh.kumar@linaro.org>
The frequency table shouldn't have any zero frequency entries and so
such a check isn't required. Though it would be better to make sure
'state' is within limits.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Lukasz Luba <lukasz.luba@arm.com>
---
drivers/thermal/cpu_cooling.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index bfa9731e7cdb..9cbf7bdbeb7a 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -564,12 +564,13 @@ static int cpufreq_state2power(struct thermal_cooling_device *cdev,
int ret;
struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata;
+ /* Request state should be less than max_level */
+ if (WARN_ON(state > cpufreq_cdev->max_level))
+ return -EINVAL;
+
num_cpus = cpumask_weight(cpufreq_cdev->policy->cpus);
freq = cpufreq_cdev->freq_table[state].frequency;
- if (!freq)
- return -EINVAL;
-
dynamic_power = cpu_freq_to_power(cpufreq_cdev, freq) * num_cpus;
ret = get_static_power(cpufreq_cdev, tz, freq, &static_power);
if (ret)
--
2.12.0.432.g71c3a4f4ba37
next prev parent reply other threads:[~2017-04-25 10:29 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-25 10:27 [PATCH V4 00/17] thermal: cpu_cooling: improve interaction with cpufreq core Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 01/17] thermal: cpu_cooling: Avoid accessing potentially freed structures Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 02/17] thermal: cpu_cooling: rearrange globals Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 03/17] thermal: cpu_cooling: Name cpufreq cooling devices as cpufreq_cdev Viresh Kumar
2017-05-23 6:37 ` Zhang Rui
2017-05-23 7:03 ` [PATCH] thermal: cpu_cooling: Replace kmalloc with kmalloc_array Viresh Kumar
2017-05-24 2:27 ` Eduardo Valentin
2017-05-24 3:51 ` Viresh Kumar
2017-05-23 7:04 ` [PATCH V4 03/17] thermal: cpu_cooling: Name cpufreq cooling devices as cpufreq_cdev Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 04/17] thermal: cpu_cooling: replace cool_dev with cdev Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 05/17] thermal: cpu_cooling: remove cpufreq_cooling_get_level() Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 06/17] thermal: cpu_cooling: get rid of a variable in cpufreq_set_cur_state() Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 07/17] thermal: cpu_cooling: use cpufreq_policy to register cooling device Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 08/17] cpufreq: create cpufreq_table_count_valid_entries() Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 09/17] thermal: cpu_cooling: store cpufreq policy Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 10/17] thermal: cpu_cooling: OPPs are registered for all CPUs Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 11/17] thermal: cpu_cooling: get rid of 'allowed_cpus' Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 12/17] thermal: cpu_cooling: merge frequency and power tables Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 13/17] thermal: cpu_cooling: create structure for idle time stats Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 14/17] thermal: cpu_cooling: get_level() can't fail Viresh Kumar
2017-04-25 10:27 ` [PATCH V4 15/17] thermal: cpu_cooling: don't store cpu_dev in cpufreq_cdev Viresh Kumar
2017-04-25 10:27 ` Viresh Kumar [this message]
2017-04-25 10:27 ` [PATCH V4 17/17] thermal: cpu_cooling: Rearrange struct cpufreq_cooling_device Viresh Kumar
2017-04-26 10:41 ` [PATCH V4 00/17] thermal: cpu_cooling: improve interaction with cpufreq core Lukasz Luba
2017-04-26 10:47 ` Viresh Kumar
2017-04-27 16:26 ` Eduardo Valentin
2017-04-28 4:24 ` Viresh Kumar
2017-05-26 4:57 ` Viresh Kumar
2017-05-28 0:29 ` Eduardo Valentin
2017-05-24 2:41 ` Eduardo Valentin
2017-05-24 3:53 ` Viresh Kumar
2017-05-24 4:03 ` Eduardo Valentin
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=98df049ab5f1d13ebb497e922229f0e8b8160606.1493115651.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=amit.kachhap@gmail.com \
--cc=edubezval@gmail.com \
--cc=javi.merino@kernel.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=punit.agrawal@arm.com \
--cc=rjw@rjwysocki.net \
--cc=rui.zhang@intel.com \
--cc=vincent.guittot@linaro.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).