Re: [PATCH v2 3/3] clk: mediatek: add MT7981 clock support

AngeloGioacchino Del Regno
2023-01-20T08:47:17Z

Il 20/01/23 02:27, Daniel Golle ha scritto:
> Add MT7986 clock support, include topckgen, apmixedsys, infracfg and
> ethernet subsystem clocks.
>
> The drivers are based on clk-mt7981.c which can be found in MediaTek's
> SDK sources. To be fit for upstream inclusion the driver has been split
> into clock domains and the infracfg part has been significantly
> de-bloated by removing all the 1:1 factors (aliases).
>
> Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> ---
> drivers/clk/mediatek/Kconfig | 17 +
> drivers/clk/mediatek/Makefile | 4 +
> drivers/clk/mediatek/clk-mt7981-apmixed.c | 103 +++++
> drivers/clk/mediatek/clk-mt7981-eth.c | 138 +++++++
> drivers/clk/mediatek/clk-mt7981-infracfg.c | 236 ++++++++++++
> drivers/clk/mediatek/clk-mt7981-topckgen.c | 423 +++++++++++++++++++++
> 6 files changed, 921 insertions(+)
> create mode 100644 drivers/clk/mediatek/clk-mt7981-apmixed.c
> create mode 100644 drivers/clk/mediatek/clk-mt7981-eth.c
> create mode 100644 drivers/clk/mediatek/clk-mt7981-infracfg.c
> create mode 100644 drivers/clk/mediatek/clk-mt7981-topckgen.c
>
> diff --git a/drivers/clk/mediatek/Kconfig b/drivers/clk/mediatek/Kconfig
> index a40135f563777..c8f045a7f4aa8 100644
> --- a/drivers/clk/mediatek/Kconfig
> +++ b/drivers/clk/mediatek/Kconfig
> @@ -388,6 +388,23 @@ config COMMON_CLK_MT7629_HIFSYS
> This driver supports MediaTek MT7629 HIFSYS clocks providing
> to PCI-E and USB.
>
> +config COMMON_CLK_MT7981
> + bool "Clock driver for MediaTek MT7981"
> + depends on ARCH_MEDIATEK || COMPILE_TEST
> + select COMMON_CLK_MEDIATEK
> + default ARCH_MEDIATEK
> + help
> + This driver supports MediaTek MT7981 basic clocks and clocks
> + required for various peripherals found on this SoC.
> +
> +config COMMON_CLK_MT7981_ETHSYS
> + bool "Clock driver for MediaTek MT7981 ETHSYS"

If you convert this to platform driver, you can change this bool to tristate
and compile ETHSYS as a module, as this is not a boot-critical clock driver.
Usually, you want to boot from eMMC/SD... but in case you really want to boot
from ethernet (nfs?) you can always either compile this as builtin or keep it
a module and provide a ramdisk(/initrd) that has this module inside.

Please, do so.

> diff --git a/drivers/clk/mediatek/clk-mt7981-apmixed.c b/drivers/clk/mediatek/clk-mt7981-apmixed.c
> new file mode 100644
> index 0000000000000..df41d2aa8706e
> --- /dev/null
> +++ b/drivers/clk/mediatek/clk-mt7981-apmixed.c
> @@ -0,0 +1,103 @@

..snip..

> +
> +static int clk_mt7981_apmixed_probe(struct platform_device *pdev)
> +{
> + struct clk_hw_onecell_data *clk_data;
> + struct device_node *node = pdev->dev.of_node;
> + int r;
> +
> + clk_data = mtk_alloc_clk_data(ARRAY_SIZE(plls));
> + if (!clk_data)
> + return -ENOMEM;
> +
> + mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls), clk_data);
> +
> + clk_prepare_enable(clk_data->hws[CLK_APMIXED_ARMPLL]->clk);

No, this is not the right way of managing a clock that has to be always on.
The CLK_IS_CRITICAL flag is what you're looking for.

> +
> + r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
> + if (r) {
> + pr_err("%s(): could not register clock provider: %d\n",
> + __func__, r);
> + goto free_apmixed_data;
> + }
> + return r;
> +
> +free_apmixed_data:
> + mtk_free_clk_data(clk_data);
> + return r;
> +}
> +
> +static struct platform_driver clk_mt7981_apmixed_drv = {
> + .probe = clk_mt7981_apmixed_probe,
> + .driver = {
> + .name = "clk-mt7981-apmixed",
> + .of_match_table = of_match_clk_mt7981_apmixed,
> + },
> +};
> +builtin_platform_driver(clk_mt7981_apmixed_drv);
> diff --git a/drivers/clk/mediatek/clk-mt7981-eth.c b/drivers/clk/mediatek/clk-mt7981-eth.c
> new file mode 100644
> index 0000000000000..ade7645c921ec
> --- /dev/null
> +++ b/drivers/clk/mediatek/clk-mt7981-eth.c
> @@ -0,0 +1,138 @@

..snip..

> +
> +static void __init mtk_sgmiisys_0_init(struct device_node *node)
> +{
> + struct clk_hw_onecell_data *clk_data;
> + int r;
> +
> + clk_data = mtk_alloc_clk_data(ARRAY_SIZE(sgmii0_clks));
> +
> + mtk_clk_register_gates(NULL, node, sgmii0_clks, ARRAY_SIZE(sgmii0_clks),
> + clk_data);
> +
> + r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
> + if (r)
> + pr_err("%s(): could not register clock provider: %d\n",
> + __func__, r);
> +}
> +CLK_OF_DECLARE(mtk_sgmiisys_0, "mediatek,mt7981-sgmiisys_0",
> + mtk_sgmiisys_0_init);

Do you really need to use CLK_OF_DECLARE?

Is there any reason why SGMIISYS 0/1 and ETHSYS are not platform drivers?

Please, convert to platform drivers.

> diff --git a/drivers/clk/mediatek/clk-mt7981-infracfg.c b/drivers/clk/mediatek/clk-mt7981-infracfg.c
> new file mode 100644
> index 0000000000000..0cb301895c7bf
> --- /dev/null
> +++ b/drivers/clk/mediatek/clk-mt7981-infracfg.c
> @@ -0,0 +1,236 @@

..snip..

You can remove this probe function entirely:

static const struct mtk_clk_desc topck_desc = {
.factor_clks = infra_divs,
.num_factor_clks = ARRAY_SIZE(infra_divs),
.mux_clks = infra_muxes,
.num_mux_clks = ARRAY_SIZE(infra_muxes),
.clks = infra_clks,
.num_clks = ARRAY_SIZE(infra_clks),
.clk_lock = &mt7981_clk_lock,
};

> +static int clk_mt7981_infracfg_probe(struct platform_device *pdev)
> +{
> + struct clk_hw_onecell_data *clk_data;
> + struct device_node *node = pdev->dev.of_node;
> + int r;
> + void __iomem *base;
> + int nr = ARRAY_SIZE(infra_divs) + ARRAY_SIZE(infra_muxes) +
> + ARRAY_SIZE(infra_clks);
> +
> + base = of_iomap(node, 0);
> + if (!base) {
> + pr_err("%s(): ioremap failed\n", __func__);
> + return -ENOMEM;
> + }
> +
> + clk_data = mtk_alloc_clk_data(nr);
> +
> + if (!clk_data)
> + return -ENOMEM;
> +
> + mtk_clk_register_factors(infra_divs, ARRAY_SIZE(infra_divs), clk_data);
> + mtk_clk_register_muxes(&pdev->dev, infra_muxes, ARRAY_SIZE(infra_muxes), node,
> + &mt7981_clk_lock, clk_data);
> + mtk_clk_register_gates(&pdev->dev, node, infra_clks, ARRAY_SIZE(infra_clks),
> + clk_data);
> +
> + r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
> + if (r) {
> + pr_err("%s(): could not register clock provider: %d\n",
> + __func__, r);
> + goto free_infracfg_data;
> + }
> + return r;
> +
> +free_infracfg_data:
> + mtk_free_clk_data(clk_data);
> + return r;
> +
> +}
> +
> +static const struct of_device_id of_match_clk_mt7981_infracfg[] = {
> + { .compatible = "mediatek,mt7981-infracfg", },
> + {}

Please always end of_device_id arrays with

{ /* sentinel */ }

> +};
> +
> +static struct platform_driver clk_mt7981_infracfg_drv = {
> + .probe = clk_mt7981_infracfg_probe,
> + .driver = {
> + .name = "clk-mt7981-infracfg",
> + .of_match_table = of_match_clk_mt7981_infracfg,
> + },
> +};
> +builtin_platform_driver(clk_mt7981_infracfg_drv);
> diff --git a/drivers/clk/mediatek/clk-mt7981-topckgen.c b/drivers/clk/mediatek/clk-mt7981-topckgen.c
> new file mode 100644
> index 0000000000000..e711c39993dd3
> --- /dev/null
> +++ b/drivers/clk/mediatek/clk-mt7981-topckgen.c
> @@ -0,0 +1,423 @@

..snip..

> +static const struct of_device_id of_match_clk_mt7981_topckgen[] = {
> + { .compatible = "mediatek,mt7981-topckgen", .data = &topck_desc },
> + {}

{ /* sentinel */ }

> +};
> +
> +static struct platform_driver clk_mt7981_topckgen_drv = {
> + .probe = mtk_clk_simple_probe,
> + .remove = mtk_clk_simple_remove,
> +

Please remove this unnecessary blank line.

> + .driver = {
> + .name = "clk-mt7981-topckgen",
> + .of_match_table = of_match_clk_mt7981_topckgen,
> + },
> +};
> +builtin_platform_driver(clk_mt7981_topckgen_drv);