linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chen-Yu Tsai <wenst@chromium.org>
To: Stephen Boyd <sboyd@kernel.org>,
	Michael Turquette <mturquette@baylibre.com>,
	Matthias Brugger <matthias.bgg@gmail.com>
Cc: Chen-Yu Tsai <wenst@chromium.org>,
	Chun-Jie Chen <chun-jie.chen@mediatek.com>,
	linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 13/31] clk: mediatek: pll: Implement unregister API
Date: Sat, 22 Jan 2022 17:17:13 +0800	[thread overview]
Message-ID: <20220122091731.283592-14-wenst@chromium.org> (raw)
In-Reply-To: <20220122091731.283592-1-wenst@chromium.org>

The PLL clk type within the MediaTek clk driver library only has a
register function, and no corresponding unregister function. This
means there is no way for its users to properly implement cleanup
and removal.

Add a matching unregister function for the PLL type clk.

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
 drivers/clk/mediatek/clk-pll.c | 49 ++++++++++++++++++++++++++++++++++
 drivers/clk/mediatek/clk-pll.h |  2 ++
 2 files changed, 51 insertions(+)

diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index 64f59554bc9b..081e0df8203e 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -360,6 +360,15 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data,
 	return clk;
 }
 
+static void mtk_clk_unregister_pll(struct clk *clk)
+{
+	struct clk_hw *hw = __clk_get_hw(clk);
+	struct mtk_clk_pll *pll = to_mtk_clk_pll(hw);
+
+	clk_unregister(clk);
+	kfree(pll);
+}
+
 void mtk_clk_register_plls(struct device_node *node,
 		const struct mtk_pll_data *plls, int num_plls, struct clk_onecell_data *clk_data)
 {
@@ -388,4 +397,44 @@ void mtk_clk_register_plls(struct device_node *node,
 }
 EXPORT_SYMBOL_GPL(mtk_clk_register_plls);
 
+static __iomem void *mtk_clk_pll_get_base(struct clk *clk,
+					  const struct mtk_pll_data *data)
+{
+	struct clk_hw *hw = __clk_get_hw(clk);
+	struct mtk_clk_pll *pll = to_mtk_clk_pll(hw);
+
+	return pll->base_addr - data->reg;
+}
+
+void mtk_clk_unregister_plls(const struct mtk_pll_data *plls, int num_plls,
+			     struct clk_onecell_data *clk_data)
+{
+	__iomem void *base = NULL;
+	int i;
+
+	if (!clk_data)
+		return;
+
+	for (i = num_plls; i > 0; i--) {
+		const struct mtk_pll_data *pll = &plls[i - 1];
+
+		if (IS_ERR_OR_NULL(clk_data->clks[pll->id]))
+			continue;
+
+		/*
+		 * This is quite ugly but unfortunately the clks don't have
+		 * any device tied to them, so there's no place to store the
+		 * pointer to the I/O region base address. We have to fetch
+		 * it from one of the registered clks.
+		 */
+		base = mtk_clk_pll_get_base(clk_data->clks[pll->id], pll);
+
+		mtk_clk_unregister_pll(clk_data->clks[pll->id]);
+		clk_data->clks[pll->id] = ERR_PTR(-ENOENT);
+	}
+
+	iounmap(base);
+}
+EXPORT_SYMBOL_GPL(mtk_clk_unregister_plls);
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/clk/mediatek/clk-pll.h b/drivers/clk/mediatek/clk-pll.h
index d01b0c38311d..a889b1e472e7 100644
--- a/drivers/clk/mediatek/clk-pll.h
+++ b/drivers/clk/mediatek/clk-pll.h
@@ -51,5 +51,7 @@ struct mtk_pll_data {
 void mtk_clk_register_plls(struct device_node *node,
 			   const struct mtk_pll_data *plls, int num_plls,
 			   struct clk_onecell_data *clk_data);
+void mtk_clk_unregister_plls(const struct mtk_pll_data *plls, int num_plls,
+			     struct clk_onecell_data *clk_data);
 
 #endif /* __DRV_CLK_MTK_PLL_H */
-- 
2.35.0.rc0.227.g00780c9af4-goog


  parent reply	other threads:[~2022-01-22  9:18 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 ` Chen-Yu Tsai [this message]
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

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=20220122091731.283592-14-wenst@chromium.org \
    --to=wenst@chromium.org \
    --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 \
    /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).