[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <030a538b-bf28-4418-92fd-14225260eb85@collabora.com>
Date: Thu, 13 Jun 2024 09:06:58 +0200
From: AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>
To: Alper Nebi Yasak <alpernebiyasak@...il.com>,
linux-mediatek@...ts.infradead.org
Cc: linux-kernel@...r.kernel.org, Stephen Boyd <sboyd@...nel.org>,
Rob Herring <robh@...nel.org>, devicetree@...r.kernel.org,
Michael Turquette <mturquette@...libre.com>,
Uwe Kleine-König <u.kleine-koenig@...gutronix.de>,
Conor Dooley <conor+dt@...nel.org>, linux-arm-kernel@...ts.infradead.org,
Chen-Yu Tsai <wenst@...omium.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
Matthias Brugger <matthias.bgg@...il.com>, linux-clk@...r.kernel.org
Subject: Re: [PATCH RESEND v2 1/2] clk: mediatek: mt8173-infracfg: Handle
unallocated infracfg when module
Il 12/06/24 22:11, Alper Nebi Yasak ha scritto:
> The MT8173 infracfg clock driver does initialization in two steps, via a
> CLK_OF_DECLARE_DRIVER declaration. However its early init function
> doesn't get to run when it's built as a module, presumably since it's
> not loaded by the time it would have been called by of_clk_init(). This
> causes its second-step probe() to return -ENOMEM when trying to register
> clocks, as the necessary clock_data struct isn't initialized by the
> first step.
>
> MT2701 and MT6797 clock drivers also use this mechanism, but they try to
> allocate the necessary clock_data structure if missing in the second
> step. Mimic that for the MT8173 infracfg clock as well to make it work
> as a module.
>
> Signed-off-by: Alper Nebi Yasak <alpernebiyasak@...il.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>
> ---
>
> Changes in v2:
> - Rewrite patch subject for consistency
>
> v1: https://lore.kernel.org/lkml/20231108213734.140707-1-alpernebiyasak@gmail.com/
>
> drivers/clk/mediatek/clk-mt8173-infracfg.c | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/mediatek/clk-mt8173-infracfg.c b/drivers/clk/mediatek/clk-mt8173-infracfg.c
> index 2f2f074e231a..ecc8b0063ea5 100644
> --- a/drivers/clk/mediatek/clk-mt8173-infracfg.c
> +++ b/drivers/clk/mediatek/clk-mt8173-infracfg.c
> @@ -98,7 +98,17 @@ CLK_OF_DECLARE_DRIVER(mtk_infrasys, "mediatek,mt8173-infracfg",
> static int clk_mt8173_infracfg_probe(struct platform_device *pdev)
> {
> struct device_node *node = pdev->dev.of_node;
> - int r;
> + int r, i;
> +
> + if (!infra_clk_data) {
> + infra_clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK);
> + if (!infra_clk_data)
> + return -ENOMEM;
> + } else {
> + for (i = 0; i < CLK_INFRA_NR_CLK; i++)
> + if (infra_clk_data->hws[i] == ERR_PTR(-EPROBE_DEFER))
> + infra_clk_data->hws[i] = ERR_PTR(-ENOENT);
> + }
>
> r = mtk_clk_register_gates(&pdev->dev, node, infra_gates,
> ARRAY_SIZE(infra_gates), infra_clk_data);
>
> base-commit: 03d44168cbd7fc57d5de56a3730427db758fc7f6
Powered by blists - more mailing lists