]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
cpufreq: scpi: compare kHz instead of Hz
authorzuoqian <zuoqian113@gmail.com>
Sat, 25 Jan 2025 08:49:49 +0000 (08:49 +0000)
committerViresh Kumar <viresh.kumar@linaro.org>
Thu, 6 Feb 2025 03:34:30 +0000 (09:04 +0530)
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: 343a8d17fa8d ("cpufreq: scpi: remove arm_big_little dependency")
Signed-off-by: zuoqian <zuoqian113@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
drivers/cpufreq/scpi-cpufreq.c

index cd89c1b9832c023c8538e6af94fbec8250789599..9e09565e41c09b1efdafc20e590f480d9e13a0eb 100644 (file)
@@ -39,8 +39,9 @@ static unsigned int scpi_cpufreq_get_rate(unsigned int cpu)
 static int
 scpi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
 {
-       u64 rate = policy->freq_table[index].frequency * 1000;
+       unsigned long freq_khz = policy->freq_table[index].frequency;
        struct scpi_data *priv = policy->driver_data;
+       unsigned long rate = freq_khz * 1000;
        int ret;
 
        ret = clk_set_rate(priv->clk, rate);
@@ -48,7 +49,7 @@ scpi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index)
        if (ret)
                return ret;
 
-       if (clk_get_rate(priv->clk) != rate)
+       if (clk_get_rate(priv->clk) / 1000 != freq_khz)
                return -EIO;
 
        return 0;