Commit 81a41901 authored by Tony Lindgren's avatar Tony Lindgren Committed by Stephen Boyd

clk: ti: clkctrl: Fix failed to enable error with double udelay timeout

Commit 3d8598fb ("clk: ti: clkctrl: use fallback udelay approach if
timekeeping is suspended") added handling for cases when timekeeping is
suspended. But looks like we can still get occasional "failed to enable"
errors on the PM runtime resume path with udelay() returning faster than
expected.

With ti-sysc interconnect target module driver this leads into device
failure with PM runtime failing with "failed to enable" clkctrl error.

Let's fix the issue with a delay of two times the desired delay as in
often done for udelay() to account for the inaccuracy.

Fixes: 3d8598fb ("clk: ti: clkctrl: use fallback udelay approach if timekeeping is suspended")
Cc: Keerthy <j-keerthy@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Link: https://lkml.kernel.org/r/20190930154001.46581-1-tony@atomide.comTested-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 9982b0f6
...@@ -100,11 +100,12 @@ static bool _omap4_is_timeout(union omap4_timeout *time, u32 timeout) ...@@ -100,11 +100,12 @@ static bool _omap4_is_timeout(union omap4_timeout *time, u32 timeout)
* can be from a timer that requires pm_runtime access, which * can be from a timer that requires pm_runtime access, which
* will eventually bring us here with timekeeping_suspended, * will eventually bring us here with timekeeping_suspended,
* during both suspend entry and resume paths. This happens * during both suspend entry and resume paths. This happens
* at least on am43xx platform. * at least on am43xx platform. Account for flakeyness
* with udelay() by multiplying the timeout value by 2.
*/ */
if (unlikely(_early_timeout || timekeeping_suspended)) { if (unlikely(_early_timeout || timekeeping_suspended)) {
if (time->cycles++ < timeout) { if (time->cycles++ < timeout) {
udelay(1); udelay(1 * 2);
return false; return false;
} }
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment