On 01/28/2016 07:22 PM, Tony Lindgren wrote:

* Tero Kristo [off-list ref] [160128 03:44]:

quoted

On 01/28/2016 01:37 PM, Tero Kristo wrote:

quoted

As the code in this file is being executed within irq context in some
cases, we must avoid the clk_get_rate which uses mutex internally.
Switch the code to use clk_hw_get_rate instead which is non-locking.

Signed-off-by: Tero Kristo <redacted>

Ooops, sorry. Sent wrong version (read: old) of this patch, please ignore
this one. Will re-send the correct version in a bit.

I think this is still needed as a fix for -rc cycle with cc: stable
as otherwise we have omap4 and 5 hang if PM runtime is enabled before
a suspend/resume cycle?

Look at the other patch I sent, it should accomplish the same thing, and 
more.

https://www.spinics.net/lists/linux-clk/msg06094.html

-Tero

Regards,

Tony

quoted

quoted

  drivers/clk/ti/dpll3xxx.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/ti/dpll3xxx.c b/drivers/clk/ti/dpll3xxx.c
index f4dec00..7ed24bc 100644
--- a/drivers/clk/ti/dpll3xxx.c
+++ b/drivers/clk/ti/dpll3xxx.c

@@ -437,7 +437,8 @@ int omap3_noncore_dpll_enable(struct clk_hw *hw)

  	parent = clk_hw_get_parent(hw);

-	if (clk_hw_get_rate(hw) == clk_get_rate(dd->clk_bypass)) {
+	if (clk_hw_get_rate(hw) ==
+	    clk_hw_get_rate(__clk_get_hw(dd->clk_bypass))) {
  		WARN_ON(parent != __clk_get_hw(dd->clk_bypass));
  		r = _omap3_noncore_dpll_bypass(clk);
  	} else {