thermal/drivers/cpufreq_cooling: Fix wrong frequency converted from power
commit371a3bc79c
upstream. The function cpu_power_to_freq is used to find a frequency and set the cooling device to consume at most the power to be converted. For example, if the power to be converted is 80mW, and the em table is as follow. struct em_cap_state table[] = { /* KHz mW */ { 1008000, 36, 0 }, { 1200000, 49, 0 }, { 1296000, 59, 0 }, { 1416000, 72, 0 }, { 1512000, 86, 0 }, }; The target frequency should be 1416000KHz, not 1512000KHz. Fixes:349d39dc57
("thermal: cpu_cooling: merge frequency and power tables") Cc: <stable@vger.kernel.org> # v4.13+ Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com> Acked-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Amit Kucheria <amit.kucheria@linaro.org> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Link: https://lore.kernel.org/r/20200619090825.32747-1-finley.xiao@rock-chips.com Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
025cec59aa
commit
d3b7bacd11
|
@ -210,11 +210,11 @@ static u32 cpu_power_to_freq(struct cpufreq_cooling_device *cpufreq_cdev,
|
|||
int i;
|
||||
struct freq_table *freq_table = cpufreq_cdev->freq_table;
|
||||
|
||||
for (i = 1; i <= cpufreq_cdev->max_level; i++)
|
||||
if (power > freq_table[i].power)
|
||||
for (i = 0; i < cpufreq_cdev->max_level; i++)
|
||||
if (power >= freq_table[i].power)
|
||||
break;
|
||||
|
||||
return freq_table[i - 1].frequency;
|
||||
return freq_table[i].frequency;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue