From: Miles Chen <miles.chen@mediatek.com>
To: <wenst@chromium.org>
Cc: <chun-jie.chen@mediatek.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-clk@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>, <matthias.bgg@gmail.com>,
<mturquette@baylibre.com>, <sboyd@kernel.org>
Subject: Re: [PATCH 31/31] clk: mediatek: Warn if clk IDs are duplicated
Date: Wed, 26 Jan 2022 16:59:47 +0800 [thread overview]
Message-ID: <20220126085947.31507-1-miles.chen@mediatek.com> (raw)
In-Reply-To: <20220122091731.283592-32-wenst@chromium.org>
>The Mediatek clk driver library handles duplicate clock IDs in two
>different ways: either ignoring the duplicate entry, or overwriting
>the old clk. Either way may cause unexpected behavior, and the latter
>also causes an orphan clk that cannot be cleaned up.
>
>Align the behavior so that later duplicate entries are ignored, and
>a warning printed. The warning will also aid in making the issue
>noticeable.
>
>Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
>---
> drivers/clk/mediatek/clk-cpumux.c | 6 ++++++
> drivers/clk/mediatek/clk-gate.c | 5 ++++-
> drivers/clk/mediatek/clk-mtk.c | 18 ++++++++++++++----
> drivers/clk/mediatek/clk-mux.c | 5 ++++-
> drivers/clk/mediatek/clk-pll.c | 6 ++++++
> 5 files changed, 34 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/clk/mediatek/clk-cpumux.c b/drivers/clk/mediatek/clk-cpumux.c
>index 499c60432280..c11b3fae622e 100644
>--- a/drivers/clk/mediatek/clk-cpumux.c
>+++ b/drivers/clk/mediatek/clk-cpumux.c
>@@ -120,6 +120,12 @@ int mtk_clk_register_cpumuxes(struct device_node *node,
> for (i = 0; i < num; i++) {
> const struct mtk_composite *mux = &clks[i];
>
>+ if (!IS_ERR_OR_NULL(clk_data->clks[mux->id])) {
>+ pr_warn("%pOF: Trying to register duplicate clock ID: %d\n",
>+ node, mux->id);
>+ continue;
%pOF is an useful information when this happens.
Reviewed-by: Miles Chen <miles.chen@mediatek.com>
>+ }
>+
> clk = mtk_clk_register_cpumux(mux, regmap);
> if (IS_ERR(clk)) {
> pr_err("Failed to register clk %s: %pe\n", mux->name, clk);
>diff --git a/drivers/clk/mediatek/clk-gate.c b/drivers/clk/mediatek/clk-gate.c
>index 631ff170b7b9..da52023f8455 100644
>--- a/drivers/clk/mediatek/clk-gate.c
>+++ b/drivers/clk/mediatek/clk-gate.c
>@@ -224,8 +224,11 @@ int mtk_clk_register_gates_with_dev(struct device_node *node,
> for (i = 0; i < num; i++) {
> const struct mtk_gate *gate = &clks[i];
>
>- if (!IS_ERR_OR_NULL(clk_data->clks[gate->id]))
>+ if (!IS_ERR_OR_NULL(clk_data->clks[gate->id])) {
>+ pr_warn("%pOF: Trying to register duplicate clock ID: %d\n",
>+ node, gate->id);
> continue;
>+ }
>
> clk = mtk_clk_register_gate(gate->name, gate->parent_name,
> regmap,
>diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
>index 6d0b8842971b..b2a3568922b2 100644
>--- a/drivers/clk/mediatek/clk-mtk.c
>+++ b/drivers/clk/mediatek/clk-mtk.c
>@@ -65,8 +65,10 @@ int mtk_clk_register_fixed_clks(const struct mtk_fixed_clk *clks, int num,
> for (i = 0; i < num; i++) {
> const struct mtk_fixed_clk *rc = &clks[i];
>
>- if (!IS_ERR_OR_NULL(clk_data->clks[rc->id]))
>+ if (!IS_ERR_OR_NULL(clk_data->clks[rc->id])) {
>+ pr_warn("Trying to register duplicate clock ID: %d\n", rc->id);
> continue;
>+ }
>
> clk = clk_register_fixed_rate(NULL, rc->name, rc->parent, 0,
> rc->rate);
>@@ -128,8 +130,10 @@ int mtk_clk_register_factors(const struct mtk_fixed_factor *clks, int num,
> for (i = 0; i < num; i++) {
> const struct mtk_fixed_factor *ff = &clks[i];
>
>- if (!IS_ERR_OR_NULL(clk_data->clks[ff->id]))
>+ if (!IS_ERR_OR_NULL(clk_data->clks[ff->id])) {
>+ pr_warn("Trying to register duplicate clock ID: %d\n", ff->id);
> continue;
>+ }
>
> clk = clk_register_fixed_factor(NULL, ff->name, ff->parent_name,
> CLK_SET_RATE_PARENT, ff->mult, ff->div);
>@@ -300,8 +304,11 @@ int mtk_clk_register_composites(const struct mtk_composite *mcs, int num,
> for (i = 0; i < num; i++) {
> const struct mtk_composite *mc = &mcs[i];
>
>- if (clk_data && !IS_ERR_OR_NULL(clk_data->clks[mc->id]))
>+ if (!IS_ERR_OR_NULL(clk_data->clks[mc->id])) {
>+ pr_warn("Trying to register duplicate clock ID: %d\n",
>+ mc->id);
> continue;
>+ }
>
> clk = mtk_clk_register_composite(mc, base, lock);
>
>@@ -363,8 +370,11 @@ int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num,
> for (i = 0; i < num; i++) {
> const struct mtk_clk_divider *mcd = &mcds[i];
>
>- if (!IS_ERR_OR_NULL(clk_data->clks[mcd->id]))
>+ if (!IS_ERR_OR_NULL(clk_data->clks[mcd->id])) {
>+ pr_warn("Trying to register duplicate clock ID: %d\n",
>+ mcd->id);
> continue;
>+ }
>
> clk = clk_register_divider(NULL, mcd->name, mcd->parent_name,
> mcd->flags, base + mcd->div_reg, mcd->div_shift,
>diff --git a/drivers/clk/mediatek/clk-mux.c b/drivers/clk/mediatek/clk-mux.c
>index f51e67650f03..21ad5a4afd65 100644
>--- a/drivers/clk/mediatek/clk-mux.c
>+++ b/drivers/clk/mediatek/clk-mux.c
>@@ -208,8 +208,11 @@ int mtk_clk_register_muxes(const struct mtk_mux *muxes,
> for (i = 0; i < num; i++) {
> const struct mtk_mux *mux = &muxes[i];
>
>- if (!IS_ERR_OR_NULL(clk_data->clks[mux->id]))
>+ if (!IS_ERR_OR_NULL(clk_data->clks[mux->id])) {
>+ pr_warn("%pOF: Trying to register duplicate clock ID: %d\n",
>+ node, mux->id);
> continue;
>+ }
>
> clk = mtk_clk_register_mux(mux, regmap, lock);
>
>diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
>index 1dd15f560659..e5e9c188be99 100644
>--- a/drivers/clk/mediatek/clk-pll.c
>+++ b/drivers/clk/mediatek/clk-pll.c
>@@ -386,6 +386,12 @@ int mtk_clk_register_plls(struct device_node *node,
> for (i = 0; i < num_plls; i++) {
> const struct mtk_pll_data *pll = &plls[i];
>
>+ if (!IS_ERR_OR_NULL(clk_data->clks[pll->id])) {
>+ pr_warn("%pOF: Trying to register duplicate clock ID: %d\n",
>+ node, pll->id);
>+ continue;
>+ }
>+
> clk = mtk_clk_register_pll(pll, base);
>
> if (IS_ERR(clk)) {
>--
>2.35.0.rc0.227.g00780c9af4-goog
>
>
prev parent reply other threads:[~2022-01-26 8:59 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-22 9:17 [PATCH 00/31] clk: mediatek: Cleanups and Improvements - Part 1 Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 01/31] clk: mediatek: Use %pe to print errors Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 02/31] clk: mediatek: gate: Consolidate gate type clk related code Chen-Yu Tsai
2022-01-24 16:04 ` Miles Chen
2022-01-22 9:17 ` [PATCH 03/31] clk: mediatek: gate: Internalize clk implementation Chen-Yu Tsai
2022-01-24 16:09 ` Miles Chen
2022-01-22 9:17 ` [PATCH 04/31] clk: mediatek: gate: Implement unregister API Chen-Yu Tsai
2022-01-24 16:21 ` Miles Chen
2022-01-22 9:17 ` [PATCH 05/31] clk: mediatek: gate: Clean up included headers Chen-Yu Tsai
2022-01-24 16:29 ` Miles Chen
2022-01-22 9:17 ` [PATCH 06/31] clk: mediatek: cpumux: Implement unregister API Chen-Yu Tsai
2022-01-25 17:11 ` Miles Chen
2022-01-22 9:17 ` [PATCH 07/31] clk: mediatek: cpumux: Internalize struct mtk_clk_cpumux Chen-Yu Tsai
2022-01-25 17:14 ` Miles Chen
2022-01-22 9:17 ` [PATCH 08/31] clk: mediatek: cpumux: Clean up included headers Chen-Yu Tsai
2022-01-25 17:16 ` Miles Chen
2022-01-22 9:17 ` [PATCH 09/31] clk: mediatek: mux: Implement unregister API Chen-Yu Tsai
2022-01-25 17:20 ` Miles Chen
2022-01-26 6:04 ` [PATCH 13/31] clk: mediatek: pll: " Miles Chen
2022-01-26 6:18 ` Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 10/31] clk: mediatek: mux: Internalize struct mtk_clk_mux Chen-Yu Tsai
2022-01-25 17:22 ` Miles Chen
2022-01-22 9:17 ` [PATCH 11/31] clk: mediatek: mux: Clean up included headers Chen-Yu Tsai
2022-01-25 17:38 ` Miles Chen
2022-01-26 6:32 ` Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 12/31] clk: mediatek: pll: Split definitions into separate header file Chen-Yu Tsai
2022-01-26 6:06 ` Miles Chen
2022-01-22 9:17 ` [PATCH 13/31] clk: mediatek: pll: Implement unregister API Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 14/31] clk: mediatek: pll: Clean up included headers Chen-Yu Tsai
2022-01-26 6:36 ` Miles Chen
2022-02-02 12:58 ` Chen-Yu Tsai
2022-01-22 9:17 ` [PATCH 15/31] clk: mediatek: Implement mtk_clk_unregister_fixed_clks() API Chen-Yu Tsai
2022-01-26 6:55 ` Miles Chen
2022-01-22 9:17 ` [PATCH 16/31] clk: mediatek: Implement mtk_clk_unregister_factors() API Chen-Yu Tsai
2022-01-26 6:56 ` Miles Chen
2022-01-22 9:17 ` [PATCH 17/31] clk: mediatek: Implement mtk_clk_unregister_divider_clks() API Chen-Yu Tsai
2022-01-26 6:58 ` Miles Chen
2022-01-22 9:17 ` [PATCH 18/31] clk: mediatek: Implement mtk_clk_unregister_composites() API Chen-Yu Tsai
2022-01-26 7:06 ` Miles Chen
2022-01-22 9:17 ` [PATCH 19/31] clk: mediatek: Add mtk_clk_simple_remove() Chen-Yu Tsai
2022-01-26 7:13 ` Miles Chen
2022-01-22 9:17 ` [PATCH 20/31] clk: mediatek: mtk: Clean up included headers Chen-Yu Tsai
2022-01-26 7:26 ` Miles Chen
2022-01-22 9:17 ` [PATCH 21/31] clk: mediatek: cpumux: Implement error handling in register API Chen-Yu Tsai
2022-01-26 7:29 ` Miles Chen
2022-01-22 9:17 ` [PATCH 22/31] clk: mediatek: gate: " Chen-Yu Tsai
2022-01-26 7:42 ` Miles Chen
2022-01-22 9:17 ` [PATCH 23/31] clk: mediatek: mux: Reverse check for existing clk to reduce nesting level Chen-Yu Tsai
2022-01-26 8:08 ` Miles Chen
2022-01-22 9:17 ` [PATCH 24/31] clk: mediatek: mux: Implement error handling in register API Chen-Yu Tsai
2022-01-26 8:09 ` Miles Chen
2022-01-22 9:17 ` [PATCH 25/31] clk: mediatek: pll: " Chen-Yu Tsai
2022-01-24 12:05 ` [PATCH] clk: mediatek: pll: fix semicolon.cocci warnings kernel test robot
2022-01-24 12:14 ` [PATCH 25/31] clk: mediatek: pll: Implement error handling in register API kernel test robot
2022-01-26 8:13 ` Miles Chen
2022-01-22 9:17 ` [PATCH 26/31] clk: mediatek: mtk: Implement error handling in register APIs Chen-Yu Tsai
2022-01-26 8:16 ` Miles Chen
2022-01-22 9:17 ` [PATCH 27/31] clk: mediatek: Unregister clks in mtk_clk_simple_probe() error path Chen-Yu Tsai
2022-01-26 8:19 ` Miles Chen
2022-01-22 9:17 ` [PATCH 28/31] clk: mediatek: mt8195: Hook up mtk_clk_simple_remove() Chen-Yu Tsai
2022-01-26 8:23 ` Miles Chen
2022-01-22 9:17 ` [PATCH 29/31] clk: mediatek: mt8195: Implement error handling in probe functions Chen-Yu Tsai
2022-01-26 8:37 ` Miles Chen
2022-01-22 9:17 ` [PATCH 30/31] clk: mediatek: mt8195: Implement remove functions Chen-Yu Tsai
2022-01-26 8:40 ` Miles Chen
2022-01-22 9:17 ` [PATCH 31/31] clk: mediatek: Warn if clk IDs are duplicated Chen-Yu Tsai
2022-01-26 8:59 ` Miles Chen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220126085947.31507-1-miles.chen@mediatek.com \
--to=miles.chen@mediatek.com \
--cc=chun-jie.chen@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=wenst@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).