diff options
| author | Kapileshwar Singh <kapileshwar.singh@arm.com> | 2015-03-16 12:00:51 +0000 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-05 15:46:03 -0700 |
| commit | 097e9cb2655261af34228ef6511a31b8d4e074cf (patch) | |
| tree | a49da1214960ef27477d52c4246d10b4389179f0 | |
| parent | aa4ad8bb85ada357e7de399ee3cb24ebfcb49383 (diff) | |
thermal: cpu_cooling: Fix power calculation when CPUs are offline
Ensure that the CPU for which the frequency is being requested
is online. If none of the CPUs are online the requested power is
returned as 0.
Acked-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Kapileshwar Singh <kapileshwar.singh@arm.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
(cherry picked from commit dd658e02357ec879edd0c62ee1f3a19c92b0b027)
Signed-off-by: Kevin Hilman <khilman@linaro.org>
| -rw-r--r-- | drivers/thermal/cpu_cooling.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 2e15133b4793..07a9629edf4b 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -555,7 +555,18 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, struct cpufreq_cooling_device *cpufreq_device = cdev->devdata; u32 *load_cpu = NULL; - freq = cpufreq_quick_get(cpumask_any(&cpufreq_device->allowed_cpus)); + cpu = cpumask_any_and(&cpufreq_device->allowed_cpus, cpu_online_mask); + + /* + * All the CPUs are offline, thus the requested power by + * the cdev is 0 + */ + if (cpu >= nr_cpu_ids) { + *power = 0; + return 0; + } + + freq = cpufreq_quick_get(cpu); if (trace_thermal_power_cpu_get_power_enabled()) { u32 ncpus = cpumask_weight(&cpufreq_device->allowed_cpus); |