[PATCH] clocksource: sirf: fix incorrect clock enable counter for timer

[PATCH] clocksource: sirf: fix incorrect clock enable counter for timer

[Barry Song]

From: Zhiwu Song <Zhiwu.Song@csr.com>

in the clocksource driver, we didn't explicitly enable the clock.
it makes the clk reference counter wrong.
we didn't encounter any hang issue because the tick's clock input
has been open and is shared by some other hardware components, but
if we don't enable those components in kernel, in the stage of
disabling unused clk in kernel boot, Linux tick hangs.

this patch fixes it. it does an explicit prepare and enable to the
clock input, and increases the usage counter of the clk.

Signed-off-by: Zhiwu Song <Zhiwu.Song@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
---
 drivers/clocksource/timer-marco.c  | 3 +++
 drivers/clocksource/timer-prima2.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/drivers/clocksource/timer-marco.c b/drivers/clocksource/timer-marco.c
index dbd3039..330e930 100644
--- a/drivers/clocksource/timer-marco.c
+++ b/drivers/clocksource/timer-marco.c
@@ -260,6 +260,9 @@ static void __init sirfsoc_marco_timer_init(struct device_node *np)
 
 	clk = of_clk_get(np, 0);
 	BUG_ON(IS_ERR(clk));
+
+	BUG_ON(clk_prepare_enable(clk));
+
 	rate = clk_get_rate(clk);
 
 	BUG_ON(rate < MARCO_CLOCK_FREQ);
diff --git a/drivers/clocksource/timer-prima2.c b/drivers/clocksource/timer-prima2.c
index a722aac..ce18d57 100644
--- a/drivers/clocksource/timer-prima2.c
+++ b/drivers/clocksource/timer-prima2.c
@@ -200,6 +200,9 @@ static void __init sirfsoc_prima2_timer_init(struct device_node *np)
 
 	clk = of_clk_get(np, 0);
 	BUG_ON(IS_ERR(clk));
+
+	BUG_ON(clk_prepare_enable(clk));
+
 	rate = clk_get_rate(clk);
 
 	BUG_ON(rate < PRIMA2_CLOCK_FREQ);
-- 
1.9.3

[PATCH] clocksource: sirf: fix incorrect clock enable counter for timer

[Daniel Lezcano]

On 07/03/2014 02:52 PM, Barry Song wrote:
> From: Zhiwu Song <Zhiwu.Song@csr.com>
>
> in the clocksource driver, we didn't explicitly enable the clock.
> it makes the clk reference counter wrong.
> we didn't encounter any hang issue because the tick's clock input
> has been open and is shared by some other hardware components, but
> if we don't enable those components in kernel, in the stage of
> disabling unused clk in kernel boot, Linux tick hangs.
>
> this patch fixes it. it does an explicit prepare and enable to the
> clock input, and increases the usage counter of the clk.
>
> Signed-off-by: Zhiwu Song <Zhiwu.Song@csr.com>
> Signed-off-by: Barry Song <Baohua.Song@csr.com>


Applied to my tree for 3.17

Thanks!

   -- Daniel

-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog