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

Commit 38941522 authored by Zhiwu Song's avatar Zhiwu Song Committed by Daniel Lezcano
Browse files

clocksource: sirf: Fix incorrect clock enable counter for timer 



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: default avatarZhiwu Song <Zhiwu.Song@csr.com>
Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 40c96312

drivers/clocksource/timer-marco.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -260,6 +260,9 @@ static void __init sirfsoc_marco_timer_init(struct device_node *np) 




	clk = of_clk_get(np, 0);

	clk = of_clk_get(np, 0);

	BUG_ON(IS_ERR(clk));

	BUG_ON(IS_ERR(clk));



	BUG_ON(clk_prepare_enable(clk));



	rate = clk_get_rate(clk);

	rate = clk_get_rate(clk);





	BUG_ON(rate < MARCO_CLOCK_FREQ);

	BUG_ON(rate < MARCO_CLOCK_FREQ);

drivers/clocksource/timer-prima2.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -200,6 +200,9 @@ static void __init sirfsoc_prima2_timer_init(struct device_node *np) 




	clk = of_clk_get(np, 0);

	clk = of_clk_get(np, 0);

	BUG_ON(IS_ERR(clk));

	BUG_ON(IS_ERR(clk));



	BUG_ON(clk_prepare_enable(clk));



	rate = clk_get_rate(clk);

	rate = clk_get_rate(clk);





	BUG_ON(rate < PRIMA2_CLOCK_FREQ);

	BUG_ON(rate < PRIMA2_CLOCK_FREQ);