When we move this code to use ww_mutex we'll need to call
__clk_get_rate() and __clk_get_accuracy(), instead of their
non-underscore counterparts, while holding the clock's prepare
mutex. Move the recalculation of these values into the underscore
functions so that we can call __clk_get_rate() and
__clk_get_accuracy() while holding locks.
Signed-off-by: Stephen Boyd <sb...@codeaurora.org>
---
drivers/clk/clk.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index b76fa69b44cb..1feaf708aa49 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -591,6 +591,8 @@ unsigned int __clk_get_prepare_count(struct clk *clk)
return !clk ? 0 : clk->prepare_count;
}
+static void __clk_recalc_rates(struct clk *clk, unsigned long msg);
+
unsigned long __clk_get_rate(struct clk *clk)
{
unsigned long ret;
@@ -600,6 +602,9 @@ unsigned long __clk_get_rate(struct clk *clk)
goto out;
}
+ if (clk->flags & CLK_GET_RATE_NOCACHE)
+ __clk_recalc_rates(clk, 0);
+
ret = clk->rate;
if (clk->flags & CLK_IS_ROOT)
@@ -613,11 +618,16 @@ out:
}
EXPORT_SYMBOL_GPL(__clk_get_rate);
+static void __clk_recalc_accuracies(struct clk *clk);
+
unsigned long __clk_get_accuracy(struct clk *clk)
{
if (!clk)
return 0;
+ if (clk->flags & CLK_GET_ACCURACY_NOCACHE)
+ __clk_recalc_accuracies(clk);
+
return clk->accuracy;
}
@@ -1083,9 +1093,6 @@ long clk_get_accuracy(struct clk *clk)
unsigned long accuracy;
clk_prepare_lock();
- if (clk && (clk->flags & CLK_GET_ACCURACY_NOCACHE))
- __clk_recalc_accuracies(clk);
-
accuracy = __clk_get_accuracy(clk);
clk_prepare_unlock();
@@ -1151,10 +1158,6 @@ unsigned long clk_get_rate(struct clk *clk)
unsigned long rate;
clk_prepare_lock();
-
- if (clk && (clk->flags & CLK_GET_RATE_NOCACHE))
- __clk_recalc_rates(clk, 0);
-
rate = __clk_get_rate(clk);
clk_prepare_unlock();
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
