From patchwork Sat Feb 24 16:56:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13570563 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DF734C6B; Sat, 24 Feb 2024 16:56:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708793774; cv=none; b=RvwzJ67WuFxcrycky8M46a08lr0xS/U580+mkZ5EA/vd2Bp2kXUgKjIHJGt8bLLUtsX6uMJK1VxTSZbmGyRwty/+1FlCpu/eiQFp9TGPuW6STaMfYFFx74GAByTa5Qs+wKznV5/RuyMNjWIBLiLeve5PCjJP+/OqxmHHCDFzBJ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708793774; c=relaxed/simple; bh=wKkGrhKZpWd/BwtJ4dXpC6KH8T0ZmrTFSOOKkvCP4Ng=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ntF3EP7gV9Du3tqTIj5TLjtVBzXFVydqxHjHjU4OU/fFQo1IWYeQZs318xQnfr9S/69SE3FnHjApk2ONSYVZf5c0tQ2xLFCMlN3wOkLF3RtbN4EZnT3d/UR2n1eCRU14GUXc9Ro6KJ4aXLEUS5OQSATw1vSKp/e+wLTpaagk6Zg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XIEJNvi8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XIEJNvi8" Received: by smtp.kernel.org (Postfix) with ESMTPS id 0A8E3C433C7; Sat, 24 Feb 2024 16:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708793774; bh=wKkGrhKZpWd/BwtJ4dXpC6KH8T0ZmrTFSOOKkvCP4Ng=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=XIEJNvi8A7YkihzdAP4sCB9StegVyE9U+CoRFcODaUzHwA3e56SdnPY0nJagN2TdK PCYNCBx/GMF5A95LhaS5UL1ryS022OxKvaMTYXNgHWtxa1CHzfZciPuD1au7011u7T LtT0Ie0s6kDr4rdjJVVcIjxigXSLhSGdMsPtGwk/Cnn73yf3qFT+f5lNYkTo4h9ZKM sT1zIDXkkvqc243PwuyAVmdpEe3bMxDkJm/l3ST2tCcLh01gm92TsXqvheNnW7C3Lu QQ/zN6ITlh1CwZqdbhXMvzKxz9icJbiaFl35Pwv59YoCVTl9LDYlXJSLnAUMlKugNY W/sIEXFYTzg7g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E29EEC54E49; Sat, 24 Feb 2024 16:56:13 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sun, 25 Feb 2024 00:56:09 +0800 Subject: [PATCH RFC 1/2] clk: hisilicon: rename hi3519 PLL registration function Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240225-pll-v1-1-fad6511479c6@outlook.com> References: <20240225-pll-v1-0-fad6511479c6@outlook.com> In-Reply-To: <20240225-pll-v1-0-fad6511479c6@outlook.com> To: Michael Turquette , Stephen Boyd Cc: David Yang , Igor Opaniuk , Jorge Ramirez-Ortiz Gmail , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708793775; l=1253; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=RjDdWKwpGyzyVB1dZKcx8ShQs0qG7CAnl7kkoTOnoFc=; b=QlwkUL5n+D2xcLQWoH0d8vCOTVanik7rxPAd2tCP7zr67tXHaUwqziZ5IYv4k0T+7Ac0VN/OM +Ga6WfGfqWmAaZQ6NxFn6zHRMCAR1RHP2JR+SidKbtQ2MGxW+gmZqd1 X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: From: Yang Xiwen Hi3559 clock drivers implemented their own PLL driver. Unfortunately our generic PLL driver will use a same name. So add a prefix "_" to avoid that. Signed-off-by: Yang Xiwen --- drivers/clk/hisilicon/clk-hi3559a.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/hisilicon/clk-hi3559a.c b/drivers/clk/hisilicon/clk-hi3559a.c index ff4ca0edce06..77fa4203a428 100644 --- a/drivers/clk/hisilicon/clk-hi3559a.c +++ b/drivers/clk/hisilicon/clk-hi3559a.c @@ -452,7 +452,7 @@ static const struct clk_ops hisi_clk_pll_ops = { .recalc_rate = clk_pll_recalc_rate, }; -static void hisi_clk_register_pll(struct hi3559av100_pll_clock *clks, +static void _hisi_clk_register_pll(struct hi3559av100_pll_clock *clks, int nums, struct hisi_clock_data *data, struct device *dev) { void __iomem *base = data->base; @@ -517,7 +517,7 @@ static struct hisi_clock_data *hi3559av100_clk_register( if (ret) return ERR_PTR(ret); - hisi_clk_register_pll(hi3559av100_pll_clks, + _hisi_clk_register_pll(hi3559av100_pll_clks, ARRAY_SIZE(hi3559av100_pll_clks), clk_data, &pdev->dev); ret = hisi_clk_register_mux(hi3559av100_mux_clks_crg, From patchwork Sat Feb 24 16:56:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13570565 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DFD88488; Sat, 24 Feb 2024 16:56:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708793774; cv=none; b=HqTPDdD6AsMjo/jX1wXNpm2Ghw5TED1sxZW+GshKSX/9sW/zukzIBylyfJc2xHiHYicUrKrNxkRrykamHAIvsJh083ngkVnOD+LIV3b01cpVYr+f7N3uB/rwUK3rSBqXQ82GTpQARtve3KYTLq36gZEezBIXb2MX0vW2GnZXpCo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708793774; c=relaxed/simple; bh=3/raq+B4QXWUT34cUDo7y4OvDKI5+FlYPmWUBoWlrnI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FdSorFFGRWU3qETnCBy5DaeJjbNqEc0YesdLROyenoM8N09DioUyVWADplP0U0ThszTdpkwfLaaMyvPvHaV7RTZ2pnCmMqQIzT7+JFb1yrcLsM+upJVd2/K2n9AYj8ax9TAHmGyr+iDwRQusnQs4CSpXDgWGjyHY5N35ATQaagA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RqiV0yaV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RqiV0yaV" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1AD46C43390; Sat, 24 Feb 2024 16:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708793774; bh=3/raq+B4QXWUT34cUDo7y4OvDKI5+FlYPmWUBoWlrnI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=RqiV0yaVtwg+B6yeJ2jZ0ZL+lFZDf8JTXOebX8R0GnDgf0Q/OQIJQNhkhwRlsfpRL rskwxCFb9uh8fuu4qfeV23EotOAMCUlR438IW41RqQbmZBfYHK9s/zM0ShzwMQAPzY kvymx3JdKYGGL3mo+rfbn00y6/tks6LRJcifYZiDM+8DKkJYOJYea5gQChBnIgKdt3 aeFiSX/GRFSaFZCGK95DFZS1j1hQ8htKUgNNLEhK82ObQtagGII0F9Fidj3orGA11g lFx9Lmrf7YzFVtCiPETfntgnDF5aVwfE/wmRaiRgT1n+Din7W2l785gjz/TfqdKruf 5AM4L9DByHQYA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 008EBC48BF6; Sat, 24 Feb 2024 16:56:14 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sun, 25 Feb 2024 00:56:10 +0800 Subject: [PATCH RFC 2/2] clk: hisilicon: add support for PLL Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240225-pll-v1-2-fad6511479c6@outlook.com> References: <20240225-pll-v1-0-fad6511479c6@outlook.com> In-Reply-To: <20240225-pll-v1-0-fad6511479c6@outlook.com> To: Michael Turquette , Stephen Boyd Cc: David Yang , Igor Opaniuk , Jorge Ramirez-Ortiz Gmail , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708793775; l=8081; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=oWwFpaJNUWlczClxS/GMcg8U81/j+wConETIKYXB4HI=; b=SbAmG842lGDN06+28a5FjrBNA6W9Av+1wuA5R7l59KKOLImNzqhUCqtmNrevecQ1eX3Gu8hzz sS4jqFq9gcuCxPCYQuYRKv1fSEgwtN0uJ9SkY0DstM7eJQABvtDeHSy X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: From: Yang Xiwen Add support for PLL used by various HiSilicon SoCs Signed-off-by: Yang Xiwen --- drivers/clk/hisilicon/Makefile | 2 +- drivers/clk/hisilicon/clk-pll.c | 171 ++++++++++++++++++++++++++++++++++++++++ drivers/clk/hisilicon/clk.c | 24 ++++++ drivers/clk/hisilicon/clk.h | 12 +++ 4 files changed, 208 insertions(+), 1 deletion(-) diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile index 2978e56cb876..5e4d54b4cdd3 100644 --- a/drivers/clk/hisilicon/Makefile +++ b/drivers/clk/hisilicon/Makefile @@ -3,7 +3,7 @@ # Hisilicon Clock specific Makefile # -obj-y += clk.o clkgate-separated.o clkdivider-hi6220.o clk-hisi-phase.o +obj-y += clk.o clkgate-separated.o clkdivider-hi6220.o clk-hisi-phase.o clk-pll.o obj-$(CONFIG_ARCH_HI3xxx) += clk-hi3620.o obj-$(CONFIG_ARCH_HIP04) += clk-hip04.o diff --git a/drivers/clk/hisilicon/clk-pll.c b/drivers/clk/hisilicon/clk-pll.c new file mode 100644 index 000000000000..c5c07a65fcf4 --- /dev/null +++ b/drivers/clk/hisilicon/clk-pll.c @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * PLL driver for HiSilicon SoCs + * + * Copyright 2024 (c) Yang Xiwen + */ + +#include +#include +#include +#include + +#include "clk.h" + +/* PLL has two conf regs in total */ +#define HISI_PLL_CFG(n) ((n) * 4) + +/* reg 0 definitions */ +#define HISI_PLL_FRAC GENMASK(23, 0) +#define HISI_PLL_POSTDIV1 GENMASK(26, 24) +#define HISI_PLL_POSTDIV2 GENMASK(30, 28) + +/* reg 1 definitions */ +#define HISI_PLL_FBDIV GENMASK(11, 0) +#define HISI_PLL_REFDIV GENMASK(17, 12) +#define HISI_PLL_PD BIT(20) +#define HISI_PLL_FOUTVCOPD BIT(21) +#define HISI_PLL_FOUT4PHASEPD BIT(22) +#define HISI_PLL_FOUTPOSTDIVPD BIT(23) +#define HISI_PLL_DACPD BIT(24) +#define HISI_PLL_DSMPD BIT(25) +#define HISI_PLL_BYPASS BIT(26) + +/* + * Datasheet said the maximum is 3.2GHz, + * but tests show it can be very high + * + * Leave some margin here (8 GHz should be fine) + */ +#define HISI_PLL_FOUTVCO_MAX_RATE 8000000000 +/* 800 MHz */ +#define HISI_PLL_FOUTVCO_MIN_RATE 800000000 + +struct hisi_pll { + struct clk_hw hw; + void __iomem *base; + u8 postdiv1, postdiv2, refdiv; + u32 divisor; +}; + +#define to_hisi_pll(_hw) container_of(_hw, struct hisi_pll, hw) + +static int hisi_pll_prepare(struct clk_hw *hw) +{ + struct hisi_pll *pll = to_hisi_pll(hw); + u32 reg; + + reg = readl(pll->base + HISI_PLL_CFG(0)); + pll->postdiv1 = FIELD_GET(HISI_PLL_POSTDIV1, reg); + pll->postdiv2 = FIELD_GET(HISI_PLL_POSTDIV2, reg); + // We don't use frac, clear it + reg &= ~HISI_PLL_FRAC; + writel(reg, pll->base + HISI_PLL_CFG(0)); + + reg = readl(pll->base + HISI_PLL_CFG(1)); + pll->refdiv = FIELD_GET(HISI_PLL_REFDIV, reg); + + pll->divisor = pll->refdiv * pll->postdiv1 * pll->postdiv2; + + // return -EINVAL if boot loader does not init PLL correctly + if (pll->divisor == 0) { + pr_err("%s: PLLs are not initialized by boot loader correctly!\n", __func__); + return -EINVAL; + } + + return 0; +} + +static int hisi_pll_set_rate(struct clk_hw *hw, ulong rate, ulong parent_rate) +{ + struct hisi_pll *pll = to_hisi_pll(hw); + u64 fbdiv = rate * pll->divisor; + u32 reg; + + do_div(fbdiv, parent_rate); + + reg = readl(pll->base + HISI_PLL_CFG(1)); + reg &= ~HISI_PLL_FBDIV; + reg |= FIELD_PREP(HISI_PLL_FBDIV, fbdiv); + writel(reg, pll->base + HISI_PLL_CFG(1)); + + /* TODO: wait for PLL lock? */ + + return 0; +} + +static int hisi_pll_determine_rate(struct clk_hw *hw, struct clk_rate_request *req) +{ + struct hisi_pll *pll = to_hisi_pll(hw); + u64 vco, ref_rate = req->best_parent_rate; + + if (ref_rate == 0) + return -EINVAL; + + do_div(ref_rate, pll->refdiv); + vco = clamp(req->rate * (pll->postdiv1 * pll->postdiv2), + HISI_PLL_FOUTVCO_MIN_RATE, HISI_PLL_FOUTVCO_MAX_RATE); + vco = rounddown(vco, ref_rate); + if (vco < HISI_PLL_FOUTVCO_MIN_RATE) + vco += ref_rate; + + do_div(vco, pll->postdiv1 * pll->postdiv2); + req->rate = vco; + + return 0; +} + +static ulong hisi_pll_recalc_rate(struct clk_hw *hw, ulong parent_rate) +{ + struct hisi_pll *pll = to_hisi_pll(hw); + u32 reg, fbdiv; + + reg = readl(pll->base + HISI_PLL_CFG(1)); + fbdiv = FIELD_GET(HISI_PLL_FBDIV, reg); + parent_rate *= fbdiv; + do_div(parent_rate, pll->divisor); + + return parent_rate; +} + +static const struct clk_ops hisi_pll_ops = { + .prepare = hisi_pll_prepare, + .set_rate = hisi_pll_set_rate, + .determine_rate = hisi_pll_determine_rate, + .recalc_rate = hisi_pll_recalc_rate, +}; + +/* + * devm_hisi_pll_register - register a HiSilicon PLL + * + * @dev: clk provider + * @name: clock name + * @parent_name: parent clock, usually 24MHz OSC + * #flags: CCF common flags + * @reg: register address + */ +struct clk *devm_clk_register_hisi_pll(struct device *dev, const char *name, const char *parent, + unsigned int flags, void __iomem *reg) +{ + struct hisi_pll *pll; + struct clk_init_data init; + + pll = devm_kzalloc(dev, sizeof(*pll), GFP_KERNEL); + if (!pll) + return ERR_PTR(-ENOMEM); + + if (!parent) + return ERR_PTR(-EINVAL); + + init.name = name; + init.ops = &hisi_pll_ops; + init.flags = flags; + init.parent_names = &parent; + init.num_parents = 1; + + pll->base = reg; + pll->hw.init = &init; + + return devm_clk_register(dev, &pll->hw); +} +EXPORT_SYMBOL_GPL(devm_clk_register_hisi_pll); diff --git a/drivers/clk/hisilicon/clk.c b/drivers/clk/hisilicon/clk.c index 09368fd32bef..0e9b0f13b494 100644 --- a/drivers/clk/hisilicon/clk.c +++ b/drivers/clk/hisilicon/clk.c @@ -341,3 +341,27 @@ void __init hi6220_clk_register_divider(const struct hi6220_divider_clock *clks, data->clk_data.clks[clks[i].id] = clk; } } + +int hisi_clk_register_pll(struct device *dev, const struct hisi_pll_clock *clks, + int nums, struct hisi_clock_data *data) +{ + struct clk *clk; + void __iomem *base = data->base; + int i; + + for (i = 0; i < nums; i++) { + clk = devm_clk_register_hisi_pll(dev, clks[i].name, clks[i].parent_name, + clks[i].flags, base + clks[i].offset); + if (IS_ERR(clk)) { + pr_err("%s: failed to register clock %s\n", + __func__, clks[i].name); + return PTR_ERR(clk); + } + + + data->clk_data.clks[clks[i].id] = clk; + } + + return 0; +} +EXPORT_SYMBOL_GPL(hisi_clk_register_pll); diff --git a/drivers/clk/hisilicon/clk.h b/drivers/clk/hisilicon/clk.h index 7a9b42e1b027..8c59f3927152 100644 --- a/drivers/clk/hisilicon/clk.h +++ b/drivers/clk/hisilicon/clk.h @@ -103,6 +103,14 @@ struct hisi_gate_clock { const char *alias; }; +struct hisi_pll_clock { + unsigned int id; + const char *name; + const char *parent_name; + unsigned long flags; + unsigned long offset; +}; + struct clk *hisi_register_clkgate_sep(struct device *, const char *, const char *, unsigned long, void __iomem *, u8, @@ -122,6 +130,8 @@ int hisi_clk_register_mux(const struct hisi_mux_clock *, int, struct clk *clk_register_hisi_phase(struct device *dev, const struct hisi_phase_clock *clks, void __iomem *base, spinlock_t *lock); +struct clk *devm_clk_register_hisi_pll(struct device *dev, const char *name, const char *parent, + unsigned int flags, void __iomem *reg); int hisi_clk_register_phase(struct device *dev, const struct hisi_phase_clock *clks, int nums, struct hisi_clock_data *data); @@ -133,6 +143,8 @@ void hisi_clk_register_gate_sep(const struct hisi_gate_clock *, int, struct hisi_clock_data *); void hi6220_clk_register_divider(const struct hi6220_divider_clock *, int, struct hisi_clock_data *); +int hisi_clk_register_pll(struct device *dev, const struct hisi_pll_clock *clks, + int nums, struct hisi_clock_data *data); #define hisi_clk_unregister(type) \ static inline \