ARM: OMAP2+: Fix bogus struct clk comparison for timer clock
diff mbox

Message ID 20150506145539.GI21061@atomide.com
State New
Headers show

Commit Message

Tony Lindgren May 6, 2015, 2:55 p.m. UTC
* Stephen Boyd <sboyd@codeaurora.org> [150505 22:36]:
> On 05/05, Tony Lindgren wrote:
> > With recent changes to use determine_rate, the comparison of two
> > clocks won't work without doing __clk_get_hw on the clocks
> > first.
> > 
> > Cc: Michael Turquette <mturquette@linaro.org>
> > Cc: Paul Walmsley <paul@pwsan.com>
> > Cc: Stephen Boyd <sboyd@codeaurora.org>
> > Cc: Tero Kristo <t-kristo@ti.com>
> > Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > ---
> > 
> > Found one more of these, the coccinelle scripts do not seem
> > to match this?
> 
> I don't think the coccinelle script was ever merged...

Oh OK, but the wrong comparisons in the kernel code got
fixed, right? 

> > @@ -298,7 +299,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
> >  	if (IS_ERR(src))
> >  		return PTR_ERR(src);
> >  
> > -	if (clk_get_parent(timer->fclk) != src) {
> > +	if (__clk_get_hw(clk_get_parent(timer->fclk)) != __clk_get_hw(src)) {
> 
> Please use clk_is_match() instead so we can find these instances
> with an easy grep.

Thanks here's an updated version with that.

Regards,

Tony

8< -----------------------------
From: Tony Lindgren <tony@atomide.com>
Date: Tue, 5 May 2015 09:03:34 -0700
Subject: [PATCH] ARM: OMAP2+: Fix bogus struct clk comparison for timer clock

With recent changes to use determine_rate, the comparison of two
clocks won't work without clk_is_match that does __clk_get_hw
on the clocks first.

Cc: Michael Turquette <mturquette@linaro.org>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Stephen Boyd May 7, 2015, 12:29 a.m. UTC | #1
On 05/06/15 07:55, Tony Lindgren wrote:
> * Stephen Boyd <sboyd@codeaurora.org> [150505 22:36]:
>> On 05/05, Tony Lindgren wrote:
>>> With recent changes to use determine_rate, the comparison of two
>>> clocks won't work without doing __clk_get_hw on the clocks
>>> first.
>>>
>>> Cc: Michael Turquette <mturquette@linaro.org>
>>> Cc: Paul Walmsley <paul@pwsan.com>
>>> Cc: Stephen Boyd <sboyd@codeaurora.org>
>>> Cc: Tero Kristo <t-kristo@ti.com>
>>> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>>> Signed-off-by: Tony Lindgren <tony@atomide.com>
>>> ---
>>>
>>> Found one more of these, the coccinelle scripts do not seem
>>> to match this?
>> I don't think the coccinelle script was ever merged...
> Oh OK, but the wrong comparisons in the kernel code got
> fixed, right? 

Yes the ones that mattered were fixed.

>>> @@ -298,7 +299,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
>>>  	if (IS_ERR(src))
>>>  		return PTR_ERR(src);
>>>  
>>> -	if (clk_get_parent(timer->fclk) != src) {
>>> +	if (__clk_get_hw(clk_get_parent(timer->fclk)) != __clk_get_hw(src)) {
>> Please use clk_is_match() instead so we can find these instances
>> with an easy grep.
> Thanks here's an updated version with that.

Are you taking this through arm-soc?

> Regards,
>
> Tony
>
> 8< -----------------------------
> From: Tony Lindgren <tony@atomide.com>
> Date: Tue, 5 May 2015 09:03:34 -0700
> Subject: [PATCH] ARM: OMAP2+: Fix bogus struct clk comparison for timer clock
>
> With recent changes to use determine_rate, the comparison of two
> clocks won't work without clk_is_match that does __clk_get_hw
> on the clocks first.
>
> Cc: Michael Turquette <mturquette@linaro.org>
> Cc: Paul Walmsley <paul@pwsan.com>
> Cc: Stephen Boyd <sboyd@codeaurora.org>
> Cc: Tero Kristo <t-kristo@ti.com>
> Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
>
> --- a/arch/arm/mach-omap2/timer.c
> +++ b/arch/arm/mach-omap2/timer.c
> @@ -298,7 +298,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
>  	if (IS_ERR(src))
>  		return PTR_ERR(src);
>  
> -	if (clk_get_parent(timer->fclk) != src) {
> +	if (!clk_is_match(clk_get_parent(timer->fclk), src)) {
>  		r = clk_set_parent(timer->fclk, src);

I also wonder why we can't just call clk_set_parent() and skip the "is
the parent already src" check?

If there's a good reason for not just calling clk_set_parent() then it
makes sense to do the clk_is_match() thing, and you can have my ack

Acked-by: Stephen Boyd <sboyd@codeaurora.org>

Patch
diff mbox

--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -298,7 +298,7 @@  static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
 	if (IS_ERR(src))
 		return PTR_ERR(src);
 
-	if (clk_get_parent(timer->fclk) != src) {
+	if (!clk_is_match(clk_get_parent(timer->fclk), src)) {
 		r = clk_set_parent(timer->fclk, src);
 		if (r < 0) {
 			pr_warn("%s: %s cannot set source\n", __func__,