Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/mips/loongson/lemote-2f/clock.c

+3 −2
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ EXPORT_SYMBOL(clk_put); 


int clk_set_rate(struct clk *clk, unsigned long rate)

{

	unsigned int rate_khz = rate / 1000;

	int ret = 0;

	int regval;

	int i;
@@ -111,10 +112,10 @@ int clk_set_rate(struct clk *clk, unsigned long rate) 
		if (loongson2_clockmod_table[i].frequency ==

		    CPUFREQ_ENTRY_INVALID)

			continue;

		if (rate == loongson2_clockmod_table[i].frequency)

		if (rate_khz == loongson2_clockmod_table[i].frequency)

			break;

	}

	if (rate != loongson2_clockmod_table[i].frequency)

	if (rate_khz != loongson2_clockmod_table[i].frequency)

		return -ENOTSUPP;



	clk->rate = rate;

drivers/cpufreq/loongson2_cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy, 
	set_cpus_allowed_ptr(current, &cpus_allowed);



	/* setting the cpu frequency */

	clk_set_rate(policy->clk, freq);

	clk_set_rate(policy->clk, freq * 1000);



	return 0;

}
@@ -92,7 +92,7 @@ static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy) 
	     i++)

		loongson2_clockmod_table[i].frequency = (rate * i) / 8;



	ret = clk_set_rate(cpuclk, rate);

	ret = clk_set_rate(cpuclk, rate * 1000);

	if (ret) {

		clk_put(cpuclk);

		return ret;