From patchwork Thu Sep 3 04:00:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 11752333 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3F181739 for ; Thu, 3 Sep 2020 04:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1ABC82071B for ; Thu, 3 Sep 2020 04:00:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=sholland.org header.i=@sholland.org header.b="C61ZUFQH"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="Jlu5Wk0C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726092AbgICEAX (ORCPT ); Thu, 3 Sep 2020 00:00:23 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:43691 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725851AbgICEAT (ORCPT ); Thu, 3 Sep 2020 00:00:19 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 628C85C01DC; Thu, 3 Sep 2020 00:00:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 03 Sep 2020 00:00:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=9NZLRUSEvG2Aj KPj6CzUWxuEFxOlnTTlN8OQUf8eq3s=; b=C61ZUFQHr4+amzEIU5Gb53hhVvl4n 4vs/7ooQ69Ci8WA3EFgNnl+JSv7wdUnWvtQAhJ/JdNI9PVZNQdaQMwQkZt80IWM+ v51EpxVFb62BicepANyFFek5AkBWrYaYVDV/EVLUJj5+xe826ahBBC2k+MfVEdr2 pY3BtfYlX3PYPRYDFpbNR8vg9zkPX/eaRMfRYaxOcFbppx++mUyi8KpO5gI/jnT9 yp0RhXVc0XP+9WaQu7BKs7gFtrt3jXZwam5Zf31tUFWSwSWc1BX1WvNdU5wu/6UP JlzqFTHO1ViJxxMYZzFTpKPMgKXHQ2xCgpj32+MADMpOX5rnp3ZFXENug== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=9NZLRUSEvG2AjKPj6CzUWxuEFxOlnTTlN8OQUf8eq3s=; b=Jlu5Wk0C R4dkV//lRtEs6iFZXerlVkP3ONQ1ucO+/dUOLD0xh4J90jYNeqhhoYxCS81W5E9N s70Qyo8TQ8QilyCy7VTIr4SKwZmp3nSeknb52lZXd1LVUgqVC21THOrP6aEw0v3c f2IkqnFsjnNEuovvaB6Nm/PX1rkpLOs/itmE5CRrdt8W9NpGOfoQbwXivSp3bFUm ElA/ro/t5i2AN6IEsz7UKrfJpIo0ePB9mCIz8RByndg1HllgoZqCrwImQ7jHi4bN HMh4LOialFK/gHxPLQwNqeobdbXfipi0FvtUS9m+FRD13p+HKAcVTlLQxwbx7Nf9 37+N8FyMmTjU1A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudegtddgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 0253A30600B9; Thu, 3 Sep 2020 00:00:16 -0400 (EDT) From: Samuel Holland To: Stephen Boyd , Michael Turquette , Andy Gross , Bjorn Andersson , Maxime Ripard Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH RESEND 1/2] clk: Implement protected-clocks for all OF clock providers Date: Wed, 2 Sep 2020 23:00:14 -0500 Message-Id: <20200903040015.5627-2-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200903040015.5627-1-samuel@sholland.org> References: <20200903040015.5627-1-samuel@sholland.org> MIME-Version: 1.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org This is a generic implementation of the "protected-clocks" property from the common clock binding. It allows firmware to inform the OS about clocks that must not be disabled while the OS is running. This implementation comes with some caveats: 1) Clocks that have CLK_IS_CRITICAL in their init data are prepared/ enabled before they are attached to the clock tree. protected-clocks are only protected once the clock provider is added, which is generally after all of the clocks it provides have been registered. This leaves a window of opportunity where something could disable or modify the clock, such as a driver running on another CPU, or the clock core itself. There is a comment to this effect in __clk_core_init(): /* * Enable CLK_IS_CRITICAL clocks so newly added critical clocks * don't get accidentally disabled when walking the orphan tree and * reparenting clocks */ Similarly, these clocks will be enabled after they are first reparented, unlike other CLK_IS_CRITICAL clocks. See the comment in clk_core_reparent_orphans_nolock(): /* * We need to use __clk_set_parent_before() and _after() to * to properly migrate any prepare/enable count of the orphan * clock. This is important for CLK_IS_CRITICAL clocks, which * are enabled during init but might not have a parent yet. */ Ideally we could detect protected clocks before they are reparented, but there are two problems with that: a) From the clock core's perspective, hw->init is const. b) The clock core doesn't see the device_node until __clk_register is called on the first clock. So the only "race-free" way to detect protected-clocks is to do it in the middle of __clk_register, between when core->flags is initialized and calling __clk_core_init(). That requires scanning the device tree again for each clock, which is part of why I didn't do it that way. 2) __clk_protect needs to be idempotent, for two reasons: a) Clocks with CLK_IS_CRITICAL in their init data are already prepared/enabled, and we don't want to prepare/enable them again. b) of_clk_set_defaults() is called twice for (at least some) clock controllers registered with CLK_OF_DECLARE. It is called first in of_clk_add_provider()/of_clk_add_hw_provider() inside clk_init_cb, and again afterward in of_clk_init(). The second call in of_clk_init() may be unnecessary, but verifying that would require auditing all users of CLK_OF_DECLARE to ensure they called one of the of_clk_add{,_hw}_provider functions. Signed-off-by: Samuel Holland Reviewed-by: Maxime Ripard --- drivers/clk/clk-conf.c | 54 ++++++++++++++++++++++++++++++++++++++++++ drivers/clk/clk.c | 31 ++++++++++++++++++++++++ drivers/clk/clk.h | 2 ++ 3 files changed, 87 insertions(+) diff --git a/drivers/clk/clk-conf.c b/drivers/clk/clk-conf.c index 2ef819606c41..a57d28b0f397 100644 --- a/drivers/clk/clk-conf.c +++ b/drivers/clk/clk-conf.c @@ -11,6 +11,54 @@ #include #include +#include "clk.h" + +static int __set_clk_flags(struct device_node *node) +{ + struct of_phandle_args clkspec; + struct property *prop; + int i, index = 0, rc; + const __be32 *cur; + struct clk *clk; + u32 nr_cells; + + rc = of_property_read_u32(node, "#clock-cells", &nr_cells); + if (rc < 0) { + pr_err("clk: missing #clock-cells property on %pOF\n", node); + return rc; + } + + clkspec.np = node; + clkspec.args_count = nr_cells; + + of_property_for_each_u32(node, "protected-clocks", prop, cur, clkspec.args[0]) { + /* read the remainder of the clock specifier */ + for (i = 1; i < nr_cells; ++i) { + cur = of_prop_next_u32(prop, cur, &clkspec.args[i]); + if (!cur) { + pr_err("clk: invalid value of protected-clocks" + " property at %pOF\n", node); + return -EINVAL; + } + } + clk = of_clk_get_from_provider(&clkspec); + if (IS_ERR(clk)) { + if (PTR_ERR(clk) != -EPROBE_DEFER) + pr_err("clk: couldn't get protected clock" + " %u for %pOF\n", index, node); + return PTR_ERR(clk); + } + + rc = __clk_protect(clk); + if (rc < 0) + pr_warn("clk: failed to protect %s: %d\n", + __clk_get_name(clk), rc); + clk_put(clk); + index++; + } + return 0; +} + static int __set_clk_parents(struct device_node *node, bool clk_supplier) { struct of_phandle_args clkspec; @@ -135,6 +183,12 @@ int of_clk_set_defaults(struct device_node *node, bool clk_supplier) if (!node) return 0; + if (clk_supplier) { + rc = __set_clk_flags(node); + if (rc < 0) + return rc; + } + rc = __set_clk_parents(node, clk_supplier); if (rc < 0) return rc; diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 0a9261a099bd..31fde39f1bda 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -4187,6 +4187,37 @@ void devm_clk_hw_unregister(struct device *dev, struct clk_hw *hw) } EXPORT_SYMBOL_GPL(devm_clk_hw_unregister); +/* + * clk-conf helpers + */ + +int __clk_protect(struct clk *clk) +{ + struct clk_core *core = clk->core; + int ret = 0; + + clk_prepare_lock(); + + /* + * If CLK_IS_CRITICAL was set in the clock's init data, then + * the clock was already prepared/enabled when it was added. + */ + if (core->flags & CLK_IS_CRITICAL) + goto out; + + core->flags |= CLK_IS_CRITICAL; + ret = clk_core_prepare(core); + if (ret) + goto out; + + ret = clk_core_enable_lock(core); + +out: + clk_prepare_unlock(); + + return ret; +} + /* * clkdev helpers */ diff --git a/drivers/clk/clk.h b/drivers/clk/clk.h index 2d801900cad5..367a0f036b13 100644 --- a/drivers/clk/clk.h +++ b/drivers/clk/clk.h @@ -24,6 +24,7 @@ struct clk_hw *clk_find_hw(const char *dev_id, const char *con_id); #ifdef CONFIG_COMMON_CLK struct clk *clk_hw_create_clk(struct device *dev, struct clk_hw *hw, const char *dev_id, const char *con_id); +int __clk_protect(struct clk *clk); void __clk_put(struct clk *clk); #else /* All these casts to avoid ifdefs in clkdev... */ @@ -33,6 +34,7 @@ clk_hw_create_clk(struct device *dev, struct clk_hw *hw, const char *dev_id, { return (struct clk *)hw; } +static inline int __clk_protect(struct clk *clk) { return 0; } static inline void __clk_put(struct clk *clk) { } #endif From patchwork Thu Sep 3 04:00:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 11752337 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 82AAB739 for ; Thu, 3 Sep 2020 04:00:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 623BB2078E for ; Thu, 3 Sep 2020 04:00:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=sholland.org header.i=@sholland.org header.b="Kav0Y9YA"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="toW4nqzL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726025AbgICEAX (ORCPT ); Thu, 3 Sep 2020 00:00:23 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:54209 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725843AbgICEAT (ORCPT ); Thu, 3 Sep 2020 00:00:19 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 6240B5C01CF; Thu, 3 Sep 2020 00:00:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 03 Sep 2020 00:00:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=kGU1vj1XbPmI3 GbcVRuOLRdT/UokAk5NkRE0C6HEpFU=; b=Kav0Y9YAS9HFWVGY9Hn5elC31ASXJ 9gbkssJLzdj5Qm2qyEiBhoXUq24qOVyMNcZhnx/cZGnkzNAmDCpAQOKihKoIOOR/ h91eOk6R2usm4twMvrMzUf4qqEHDQjsaBir31fFirv72huZ8gLU4OXOjqjjRKP2R Jz59EYEMY0ofVCMeNnVMcIBGJBUFF4/+Rs8UEhfJCw7x4IlfE3uRbXRyp1b0tdqC Iwkc9JoHnMKIBFn9qj7LFvZWCIph8sxaPgu/sL4Ak75m3wVcAdXhFk7wMBdzJ6Hh Ga1wi3g6FNMHilksK6tKrEo056ZKdn/XkPfF9Xcro3EGGKcWgT1n0DwTw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=kGU1vj1XbPmI3GbcVRuOLRdT/UokAk5NkRE0C6HEpFU=; b=toW4nqzL c/GhCWcPpZP8p4/r5ScvQmZiSDreftq3W4cXwSdqsVmt7N+hL7ztRiJPUy9Jh+ZA urATG6M1L1bamLFk65/A23LwjOKfXKRLnaTNyS50uoKVKAOuE9289k7zqMp+vfkD e6uqkXwOfdRfV0QbyQvdTlm4r1MGO3CQ6nUie73nUTL76J2Xaw88C826S2z9emAH O9hwBehCzRgBB8g5WIFSfh9wq8C6AeE4BNLENhE7c5qDjNT7dKfdlA+6YCKvPZtb dcEukayYBrPr3GxKsV5yTM4/nmTqPDzub9pxJAWMZZaVnwVcbwNS/0vrM2idBshV DYKaZM/x63Gf6A== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudegtddgjeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefurghmuhgv lhcujfholhhlrghnugcuoehsrghmuhgvlhesshhhohhllhgrnhgurdhorhhgqeenucggtf frrghtthgvrhhnpeduhfejfedvhffgfeehtefghfeiiefgfeehgfdvvdevfeegjeehjedv gfejheeuieenucfkphepjedtrddufeehrddugeekrdduhedunecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepshgrmhhuvghlsehshhholhhlrghn ugdrohhrgh X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 6773630600A3; Thu, 3 Sep 2020 00:00:17 -0400 (EDT) From: Samuel Holland To: Stephen Boyd , Michael Turquette , Andy Gross , Bjorn Andersson , Maxime Ripard Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Samuel Holland Subject: [PATCH RESEND 2/2] Revert "clk: qcom: Support 'protected-clocks' property" Date: Wed, 2 Sep 2020 23:00:15 -0500 Message-Id: <20200903040015.5627-3-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200903040015.5627-1-samuel@sholland.org> References: <20200903040015.5627-1-samuel@sholland.org> MIME-Version: 1.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org Now that protected-clocks is handled in the clk core, this driver-specific implementation is redundant. This reverts commit b181b3b801da8893c8eb706e448dd5111b02de60. Signed-off-by: Samuel Holland --- drivers/clk/qcom/common.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index 60d2a78d1395..6e150fd32dbe 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -194,22 +194,6 @@ int qcom_cc_register_sleep_clk(struct device *dev) } EXPORT_SYMBOL_GPL(qcom_cc_register_sleep_clk); -/* Drop 'protected-clocks' from the list of clocks to register */ -static void qcom_cc_drop_protected(struct device *dev, struct qcom_cc *cc) -{ - struct device_node *np = dev->of_node; - struct property *prop; - const __be32 *p; - u32 i; - - of_property_for_each_u32(np, "protected-clocks", prop, p, i) { - if (i >= cc->num_rclks) - continue; - - cc->rclks[i] = NULL; - } -} - static struct clk_hw *qcom_cc_clk_hw_get(struct of_phandle_args *clkspec, void *data) { @@ -272,8 +256,6 @@ int qcom_cc_really_probe(struct platform_device *pdev, cc->rclks = rclks; cc->num_rclks = num_clks; - qcom_cc_drop_protected(dev, cc); - for (i = 0; i < num_clk_hws; i++) { ret = devm_clk_hw_register(dev, clk_hws[i]); if (ret)