Skip to content

Commit 4742da9

Browse files
zuoqianvireshk
authored andcommitted
cpufreq: scpi: compare kHz instead of Hz
The CPU rate from clk_get_rate() may not be divisible by 1000 (e.g., 133333333). But the rate calculated from frequency(kHz) is always divisible by 1000 (e.g., 133333000). Comparing the rate causes a warning during CPU scaling: "cpufreq: __target_index: Failed to change cpu frequency: -5". When we choose to compare kHz here, the issue does not occur. Fixes: 343a8d1 ("cpufreq: scpi: remove arm_big_little dependency") Signed-off-by: zuoqian <[email protected]> Reviewed-by: Dan Carpenter <[email protected]> Signed-off-by: Viresh Kumar <[email protected]>
1 parent 0813fd2 commit 4742da9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/cpufreq/scpi-cpufreq.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,17 @@ static unsigned int scpi_cpufreq_get_rate(unsigned int cpu)
3939
static int
4040
scpi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
4141
{
42-
u64 rate = policy->freq_table[index].frequency * 1000;
42+
unsigned long freq_khz = policy->freq_table[index].frequency;
4343
struct scpi_data *priv = policy->driver_data;
44+
unsigned long rate = freq_khz * 1000;
4445
int ret;
4546

4647
ret = clk_set_rate(priv->clk, rate);
4748

4849
if (ret)
4950
return ret;
5051

51-
if (clk_get_rate(priv->clk) != rate)
52+
if (clk_get_rate(priv->clk) / 1000 != freq_khz)
5253
return -EIO;
5354

5455
return 0;

0 commit comments

Comments
 (0)