From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757279AbcHWI2O (ORCPT ); Tue, 23 Aug 2016 04:28:14 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:61900 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754679AbcHWI2J (ORCPT ); Tue, 23 Aug 2016 04:28:09 -0400 From: Jiada Wang To: , , CC: , , , Subject: [PATCH] clk: move check of CLK_SET_RATE_GATE flag to clk_propagate_rate_change() Date: Tue, 23 Aug 2016 17:10:58 +0900 Message-ID: <1471939858-20925-2-git-send-email-jiada_wang@mentor.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1471939858-20925-1-git-send-email-jiada_wang@mentor.com> References: <1471939858-20925-1-git-send-email-jiada_wang@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Previously CLK_SET_RATE_GATE flag is only checked in clk_set_rate() which only ensures the clock being called by clk_set_rate() won't change rate when it has been prepared if CLK_SET_RATE_GATE flag is set. But a clk_set_rate() request may propagate rate change to these clocks from the requested clock's topmost parent clock to all its children, when any one of these clocks has CLK_SET_RATE_GATE flag set and it has been prepared, the clk_set_rate() request should fail. This patch moves check of CLK_SET_RATE_GATE flag to clk_propagate_rate_change() to ensure all affected clocks will be checked if their rate will be changed after clk_set_rate(). Signed-off-by: Jiada Wang --- drivers/clk/clk.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 820a939..021c740 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1437,6 +1437,13 @@ static struct clk_core *clk_propagate_rate_change(struct clk_core *core, if (core->rate == core->new_rate) return NULL; + if ((event == PRE_RATE_CHANGE) && + (core->flags & CLK_SET_RATE_GATE) && core->prepare_count) { + pr_err("%s: %s not gated but wants to change rate\n", + __func__, core->name); + fail_clk = core; + } + if (core->notifier_count) { ret = __clk_notify(core, event, core->rate, core->new_rate); if (ret & NOTIFY_STOP_MASK) @@ -1571,9 +1578,6 @@ static int clk_core_set_rate_nolock(struct clk_core *core, if (rate == clk_core_get_rate_nolock(core)) return 0; - 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, rate); if (!top) -- 2.4.5