Commit 8e8acb32 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Ralf Baechle

MIPS/loongson2_cpufreq: Fix CPU clock rate setting

Loongson2 has been using (incorrectly) kHz for cpu_clk rate. This has
been unnoticed, as loongson2_cpufreq was the only place where the rate
was set/get. After commit 652ed95d
(cpufreq: introduce cpufreq_generic_get() routine) things however broke,
and now loops_per_jiffy adjustments are incorrect (1000 times too long).
The patch fixes this by changing cpu_clk rate to Hz.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Cc: stable@vger.kernel.org
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: cpufreq@vger.kernel.org
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Patchwork: https://patchwork.linux-mips.org/patch/6678/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 3deff253
...@@ -91,6 +91,7 @@ EXPORT_SYMBOL(clk_put); ...@@ -91,6 +91,7 @@ EXPORT_SYMBOL(clk_put);
int clk_set_rate(struct clk *clk, unsigned long rate) int clk_set_rate(struct clk *clk, unsigned long rate)
{ {
unsigned int rate_khz = rate / 1000;
int ret = 0; int ret = 0;
int regval; int regval;
int i; int i;
...@@ -111,10 +112,10 @@ int clk_set_rate(struct clk *clk, unsigned long rate) ...@@ -111,10 +112,10 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
if (loongson2_clockmod_table[i].frequency == if (loongson2_clockmod_table[i].frequency ==
CPUFREQ_ENTRY_INVALID) CPUFREQ_ENTRY_INVALID)
continue; continue;
if (rate == loongson2_clockmod_table[i].frequency) if (rate_khz == loongson2_clockmod_table[i].frequency)
break; break;
} }
if (rate != loongson2_clockmod_table[i].frequency) if (rate_khz != loongson2_clockmod_table[i].frequency)
return -ENOTSUPP; return -ENOTSUPP;
clk->rate = rate; clk->rate = rate;
......
...@@ -62,7 +62,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy, ...@@ -62,7 +62,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
set_cpus_allowed_ptr(current, &cpus_allowed); set_cpus_allowed_ptr(current, &cpus_allowed);
/* setting the cpu frequency */ /* setting the cpu frequency */
clk_set_rate(policy->clk, freq); clk_set_rate(policy->clk, freq * 1000);
return 0; return 0;
} }
...@@ -92,7 +92,7 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) ...@@ -92,7 +92,7 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
i++) i++)
loongson2_clockmod_table[i].frequency = (rate * i) / 8; loongson2_clockmod_table[i].frequency = (rate * i) / 8;
ret = clk_set_rate(cpuclk, rate); ret = clk_set_rate(cpuclk, rate * 1000);
if (ret) { if (ret) {
clk_put(cpuclk); clk_put(cpuclk);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment