diff mbox

cpufreq: loongson2_cpufreq: don't declare local variable as static

Message ID 254471b8cee296f860d24368cc467c00b5a07336.1396413826.git.viresh.kumar@linaro.org
State New
Headers show

Commit Message

Viresh Kumar April 2, 2014, 4:44 a.m. UTC
Earlier commit:
	commit 652ed95d5fa6074b3c4ea245deb0691f1acb6656
	Author: Viresh Kumar <viresh.kumar@linaro.org>
	Date:   Thu Jan 9 20:38:43 2014 +0530

	    cpufreq: introduce cpufreq_generic_get() routine

did some changes to driver and by mistake made cpuclk as a 'static' local
variable, which wasn't actually required. Fix it.

Reported-by: Alexandre Oliva <lxoliva@fsfla.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
 drivers/cpufreq/loongson2_cpufreq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alexandre Oliva April 3, 2014, 12:40 p.m. UTC | #1
On Apr  2, 2014, Viresh Kumar <viresh.kumar@linaro.org> wrote:

> did some changes to driver and by mistake made cpuclk as a 'static' local
> variable, which wasn't actually required. Fix it.

FWIW, the same mistake is present in at32.

I've just finished bisecting the cpufreq regression on loongson2.
Indeed, this s/static// patch does not fix it, but it was 652ed95d5fa,
the patch that moved cpuclk into loongson2_cpufreq_cpu_init, that caused
the regression.

Reverting all the changes to loongson2_cpufreq.c in 652ed95d5fa makes
cpufreq work again, as opposed to printing nan% in all cpufreq stats in
cpufreq-info's output, and freezing shortly thereafter.

> -	static struct clk *cpuclk;
> +	struct clk *cpuclk;
Viresh Kumar April 3, 2014, 2:44 p.m. UTC | #2
On 3 April 2014 18:10, Alexandre Oliva <oliva@gnu.org> wrote:
> FWIW, the same mistake is present in at32.

I will check others as well now :)

> I've just finished bisecting the cpufreq regression on loongson2.
> Indeed, this s/static// patch does not fix it, but it was 652ed95d5fa,
> the patch that moved cpuclk into loongson2_cpufreq_cpu_init, that caused
> the regression.
>
> Reverting all the changes to loongson2_cpufreq.c in 652ed95d5fa makes
> cpufreq work again, as opposed to printing nan% in all cpufreq stats in
> cpufreq-info's output, and freezing shortly thereafter.

You must have a look at this:

https://lkml.org/lkml/2014/4/2/426 : [PATCH] MIPS/loongson2_cpufreq:
fix CPU clock rate setting
--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexandre Oliva April 4, 2014, 2:34 p.m. UTC | #3
On Apr  3, 2014, Viresh Kumar <viresh.kumar@linaro.org> wrote:

> On 3 April 2014 18:10, Alexandre Oliva <oliva@gnu.org> wrote:
>> FWIW, the same mistake is present in at32.

> I will check others as well now :)

Thanks!

>> Reverting all the changes to loongson2_cpufreq.c in 652ed95d5fa makes
>> cpufreq work again, as opposed to printing nan% in all cpufreq stats in
>> cpufreq-info's output, and freezing shortly thereafter.

> You must have a look at this:

> https://lkml.org/lkml/2014/4/2/426 : [PATCH] MIPS/loongson2_cpufreq:
> fix CPU clock rate setting

Thanks, I confirm that patch is enough to avoid the symptoms I'd
described.
Rafael J. Wysocki April 8, 2014, 12:11 p.m. UTC | #4
On Wednesday, April 02, 2014 10:14:24 AM Viresh Kumar wrote:
> Earlier commit:
> 	commit 652ed95d5fa6074b3c4ea245deb0691f1acb6656
> 	Author: Viresh Kumar <viresh.kumar@linaro.org>
> 	Date:   Thu Jan 9 20:38:43 2014 +0530
> 
> 	    cpufreq: introduce cpufreq_generic_get() routine
> 
> did some changes to driver and by mistake made cpuclk as a 'static' local
> variable, which wasn't actually required. Fix it.
> 
> Reported-by: Alexandre Oliva <lxoliva@fsfla.org>
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

Queued up for the next pull request, thanks!

> ---
>  drivers/cpufreq/loongson2_cpufreq.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
> index a3588d61..f0bc31f 100644
> --- a/drivers/cpufreq/loongson2_cpufreq.c
> +++ b/drivers/cpufreq/loongson2_cpufreq.c
> @@ -69,7 +69,7 @@ static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
>  
>  static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
>  {
> -	static struct clk *cpuclk;
> +	struct clk *cpuclk;
>  	int i;
>  	unsigned long rate;
>  	int ret;
>
diff mbox

Patch

diff --git a/drivers/cpufreq/loongson2_cpufreq.c b/drivers/cpufreq/loongson2_cpufreq.c
index a3588d61..f0bc31f 100644
--- a/drivers/cpufreq/loongson2_cpufreq.c
+++ b/drivers/cpufreq/loongson2_cpufreq.c
@@ -69,7 +69,7 @@  static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
 
 static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
 {
-	static struct clk *cpuclk;
+	struct clk *cpuclk;
 	int i;
 	unsigned long rate;
 	int ret;