All slow clk users are not properly requesting it (get + prepare + enable) before using it. If all users properly requesting this clock decide that they don't need it anymore (or are removed), this lead to this clock being disabled while faulty users are still requiring it, which in turn hangs the system. Prevent slow oscillator clock from being disabled until all users are properly requesting it. Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx> Reported-by: Bo Shen <voice.shen@xxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx --- Hi Mike, Can you have a look at this fix and let me know if this is how you want this problem addressed ? I can also request (get + prepare + enable) the clk in the pmc probe function, so that it can never be disabled. If you're fine with the approach, can you queue it for the next -rc ? Best Regards, Boris drivers/clk/at91/clk-slow.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c index 32f7c1b..effe3b0 100644 --- a/drivers/clk/at91/clk-slow.c +++ b/drivers/clk/at91/clk-slow.c @@ -96,7 +96,19 @@ static void clk_slow_osc_unprepare(struct clk_hw *hw) if (tmp & AT91_SCKC_OSC32BYP) return; - writel(tmp & ~AT91_SCKC_OSC32EN, sckcr); + /* + * FIXME: All slow clk users are not properly requesting it (get + + * prepare + enable) before using it. + * If all users properly requesting this clock decide that they don't + * need it anymore (or are removed), this lead to this clock being + * disabled while faulty users are still requiring it, which in turn + * hangs the system. + * Prevent this clock from being disabled until all users are properly + * requesting it. + * Once this is done we should re-introduce this line: + * + * writel(tmp & ~AT91_SCKC_OSC32EN, sckcr); + */ } static int clk_slow_osc_is_prepared(struct clk_hw *hw) @@ -211,7 +223,19 @@ static void clk_slow_rc_osc_unprepare(struct clk_hw *hw) struct clk_slow_rc_osc *osc = to_clk_slow_rc_osc(hw); void __iomem *sckcr = osc->sckcr; - writel(readl(sckcr) & ~AT91_SCKC_RCEN, sckcr); + /* + * FIXME: All slow clk users are not properly requesting it (get + + * prepare + enable) before using it. + * If all users properly requesting this clock decide that they don't + * need it anymore (or are removed), this lead to this clock being + * disabled while faulty users are still requiring it, which in turn + * hangs the system. + * Prevent this clock from being disabled until all users are properly + * requesting it. + * Once this is done we should re-introduce this line: + * + * writel(readl(sckcr) & ~AT91_SCKC_RCEN, sckcr); + */ } static int clk_slow_rc_osc_is_prepared(struct clk_hw *hw) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html