mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
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>
This commit is contained in:
parent
54b92aae83
commit
dd658e0235
1 changed files with 12 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue