On Fri, Jun 19, 2020 at 7:21 AM Finley Xiao <finley.x...@rock-chips.com> wrote: > > 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: 349d39dc5739 ("thermal: cpu_cooling: merge frequency and power tables") > Signed-off-by: Finley Xiao <finley.x...@rock-chips.com>
Reviewed-by: Amit Kucheria <amit.kuche...@linaro.org> > --- > drivers/thermal/cpufreq_cooling.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/thermal/cpufreq_cooling.c > b/drivers/thermal/cpufreq_cooling.c > index 9e124020519f..6c0e1b053126 100644 > --- a/drivers/thermal/cpufreq_cooling.c > +++ b/drivers/thermal/cpufreq_cooling.c > @@ -123,12 +123,12 @@ static u32 cpu_power_to_freq(struct > cpufreq_cooling_device *cpufreq_cdev, > { > int i; > > - for (i = cpufreq_cdev->max_level - 1; i >= 0; i--) { > - if (power > cpufreq_cdev->em->table[i].power) > + for (i = cpufreq_cdev->max_level; i >= 0; i--) { > + if (power >= cpufreq_cdev->em->table[i].power) > break; > } > > - return cpufreq_cdev->em->table[i + 1].frequency; > + return cpufreq_cdev->em->table[i].frequency; > } > > /** > -- > 2.11.0 > > >