diff options
| author | Kapileshwar Singh <kapileshwar.singh@arm.com> | 2015-03-16 13:00:51 +0100 |
|---|---|---|
| committer | Eduardo Valentin <edubezval@gmail.com> | 2015-05-05 06:27:54 +0200 |
| commit | dd658e02357ec879edd0c62ee1f3a19c92b0b027 (patch) | |
| tree | 7902429108c8910d4cff06a0887be36ccc190b29 /drivers/thermal/cpu_cooling.c | |
| parent | thermal: cpu_cooling: Remove cpu_dev update on policy CPU update (diff) | |
| download | linux-dd658e02357ec879edd0c62ee1f3a19c92b0b027.tar.xz linux-dd658e02357ec879edd0c62ee1f3a19c92b0b027.zip | |
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>
Diffstat (limited to 'drivers/thermal/cpu_cooling.c')
| -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 beffa556488a..6509c61b9648 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -559,7 +559,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); |