Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1738265

[PATCH v4 08/10] clk: fix CLK_SET_RATE_GATE with clock rate protection

Show all headers | View raw

Using clock rate protection, we can now enforce CLK_SET_RATE_GATE along the
clock tree

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Quentin Schulz <quentin.schulz@free-electrons.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 drivers/clk/clk.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 4693d5e20327..f990ef127a83 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -552,6 +552,9 @@ static void clk_core_unprepare(struct clk_core *core)
 	if (WARN_ON(core->prepare_count == 1 && core->flags & CLK_IS_CRITICAL))
 		return;
 
+	if (core->flags & CLK_SET_RATE_GATE)
+		clk_core_rate_unprotect(core);
+
 	if (--core->prepare_count > 0)
 		return;
 
@@ -622,6 +625,16 @@ static int clk_core_prepare(struct clk_core *core)
 
 	core->prepare_count++;
 
+	/*
+	 * CLK_SET_RATE_GATE is a special case of clock protection
+	 * Instead of a consumer claiming exclusive rate control, it is
+	 * actually the provider which prevents any consumer from making any
+	 * operation which could result in a rate change or rate glitch while
+	 * the clock is prepared.
+	 */
+	if (core->flags & CLK_SET_RATE_GATE)
+		clk_core_rate_protect(core);
+
 	return 0;
 }
 
@@ -1703,9 +1716,6 @@ static int clk_core_set_rate_nolock(struct clk_core *core,
 	if (clk_core_rate_is_protected(core))
 		return -EBUSY;
 
-	if ((core->flags & CLK_SET_RATE_GATE) && core->prepare_count)
-		return -EBUSY;
-
 	/* calculate new rates and get the topmost changed clock */
 	top = clk_calc_new_rates(core, req_rate);
 	if (!top)
-- 
2.13.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 00/10] clk: implement clock rate protection mechanism Jerome Brunet <jbrunet@baylibre.com> - 2017-09-24 22:10 +0200
  [PATCH v4 04/10] clk: rework calls to round and determine rate callbacks Jerome Brunet <jbrunet@baylibre.com> - 2017-09-24 22:10 +0200
  [PATCH v4 08/10] clk: fix CLK_SET_RATE_GATE with clock rate protection Jerome Brunet <jbrunet@baylibre.com> - 2017-09-24 22:10 +0200
  [PATCH v4 02/10] clk: take the prepare lock out of clk_core_set_parent Jerome Brunet <jbrunet@baylibre.com> - 2017-09-24 22:10 +0200
  [PATCH v4 10/10] clk: fix set_rate_range when current rate is out of range Jerome Brunet <jbrunet@baylibre.com> - 2017-09-24 22:10 +0200
  [PATCH v4 06/10] clk: add clock protection mechanism to clk core Jerome Brunet <jbrunet@baylibre.com> - 2017-09-24 22:10 +0200
  [PATCH v4 05/10] clk: use round rate to bail out early in set_rate Jerome Brunet <jbrunet@baylibre.com> - 2017-09-24 22:10 +0200
  [PATCH v4 09/10] clk: add clk_rate_exclusive api Jerome Brunet <jbrunet@baylibre.com> - 2017-09-24 22:10 +0200

csiph-web