Re: [PATCH net-next v4 04/11] net: dsa: realtek: convert subdrivers into modules

["Alvin Šipraga" <ALSI@bang-olufsen.dk>]

Luiz Angelo Daros de Luca <luizluca@gmail.com> writes:

> Preparing for multiple interfaces support, the drivers
> must be independent of realtek-smi.
>
> Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
> Tested-by: Arınç ÜNAL <arinc.unal@arinc9.com>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Reviewed-by: Alvin Šipraga <alsi@bang-olufsen.dk>

> ---
>  drivers/net/dsa/realtek/Kconfig               | 20 +++++++++++++++++--
>  drivers/net/dsa/realtek/Makefile              |  4 +++-
>  .../{realtek-smi-core.c => realtek-smi.c}     |  6 ++++++
>  drivers/net/dsa/realtek/rtl8365mb.c           |  4 ++++
>  .../dsa/realtek/{rtl8366.c => rtl8366-core.c} |  0
>  drivers/net/dsa/realtek/rtl8366rb.c           |  4 ++++
>  6 files changed, 35 insertions(+), 3 deletions(-)
>  rename drivers/net/dsa/realtek/{realtek-smi-core.c => realtek-smi.c} (97%)
>  rename drivers/net/dsa/realtek/{rtl8366.c => rtl8366-core.c} (100%)
>
> diff --git a/drivers/net/dsa/realtek/Kconfig b/drivers/net/dsa/realtek/Kconfig
> index 1c62212fb0ec..cd1aa95b7bf0 100644
> --- a/drivers/net/dsa/realtek/Kconfig
> +++ b/drivers/net/dsa/realtek/Kconfig
> @@ -2,8 +2,6 @@
>  menuconfig NET_DSA_REALTEK
>  	tristate "Realtek Ethernet switch family support"
>  	depends on NET_DSA
> -	select NET_DSA_TAG_RTL4_A
> -	select NET_DSA_TAG_RTL8_4
>  	select FIXED_PHY
>  	select IRQ_DOMAIN
>  	select REALTEK_PHY
> @@ -18,3 +16,21 @@ config NET_DSA_REALTEK_SMI
>  	help
>  	  Select to enable support for registering switches connected
>  	  through SMI.
> +
> +config NET_DSA_REALTEK_RTL8365MB
> +	tristate "Realtek RTL8365MB switch subdriver"
> +	default y
> +	depends on NET_DSA_REALTEK
> +	depends on NET_DSA_REALTEK_SMI
> +	select NET_DSA_TAG_RTL8_4
> +	help
> +	  Select to enable support for Realtek RTL8365MB
> +
> +config NET_DSA_REALTEK_RTL8366RB
> +	tristate "Realtek RTL8366RB switch subdriver"
> +	default y
> +	depends on NET_DSA_REALTEK
> +	depends on NET_DSA_REALTEK_SMI
> +	select NET_DSA_TAG_RTL4_A
> +	help
> +	  Select to enable support for Realtek RTL8366RB
> diff --git a/drivers/net/dsa/realtek/Makefile b/drivers/net/dsa/realtek/Makefile
> index 323b921bfce0..8b5a4abcedd3 100644
> --- a/drivers/net/dsa/realtek/Makefile
> +++ b/drivers/net/dsa/realtek/Makefile
> @@ -1,3 +1,5 @@
>  # SPDX-License-Identifier: GPL-2.0
>  obj-$(CONFIG_NET_DSA_REALTEK_SMI) 	+= realtek-smi.o
> -realtek-smi-objs			:= realtek-smi-core.o rtl8366.o rtl8366rb.o rtl8365mb.o
> +obj-$(CONFIG_NET_DSA_REALTEK_RTL8366RB) += rtl8366.o
> +rtl8366-objs 				:= rtl8366-core.o rtl8366rb.o
> +obj-$(CONFIG_NET_DSA_REALTEK_RTL8365MB) += rtl8365mb.o
> diff --git a/drivers/net/dsa/realtek/realtek-smi-core.c b/drivers/net/dsa/realtek/realtek-smi.c
> similarity index 97%
> rename from drivers/net/dsa/realtek/realtek-smi-core.c
> rename to drivers/net/dsa/realtek/realtek-smi.c
> index a917801385c9..5514fe81d64f 100644
> --- a/drivers/net/dsa/realtek/realtek-smi-core.c
> +++ b/drivers/net/dsa/realtek/realtek-smi.c
> @@ -495,19 +495,23 @@ static void realtek_smi_shutdown(struct platform_device *pdev)
>  }
>  
>  static const struct of_device_id realtek_smi_of_match[] = {
> +#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_RTL8366RB)
>  	{
>  		.compatible = "realtek,rtl8366rb",
>  		.data = &rtl8366rb_variant,
>  	},
> +#endif
>  	{
>  		/* FIXME: add support for RTL8366S and more */
>  		.compatible = "realtek,rtl8366s",
>  		.data = NULL,
>  	},

If you send a v5, maybe add a patch to remove this. It is going to crash
anyway so I am sure nobody uses it.

> +#if IS_ENABLED(CONFIG_NET_DSA_REALTEK_RTL8365MB)
>  	{
>  		.compatible = "realtek,rtl8365mb",
>  		.data = &rtl8365mb_variant,
>  	},
> +#endif
>  	{ /* sentinel */ },
>  };
>  MODULE_DEVICE_TABLE(of, realtek_smi_of_match);
> @@ -523,4 +527,6 @@ static struct platform_driver realtek_smi_driver = {
>  };
>  module_platform_driver(realtek_smi_driver);
>  
> +MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
> +MODULE_DESCRIPTION("Driver for Realtek ethernet switch connected via SMI interface");
>  MODULE_LICENSE("GPL");
> diff --git a/drivers/net/dsa/realtek/rtl8365mb.c b/drivers/net/dsa/realtek/rtl8365mb.c
> index 5fb453b5f650..b52bb987027c 100644
> --- a/drivers/net/dsa/realtek/rtl8365mb.c
> +++ b/drivers/net/dsa/realtek/rtl8365mb.c
> @@ -1987,3 +1987,7 @@ const struct realtek_variant rtl8365mb_variant = {
>  	.chip_data_sz = sizeof(struct rtl8365mb),
>  };
>  EXPORT_SYMBOL_GPL(rtl8365mb_variant);
> +
> +MODULE_AUTHOR("Alvin Šipraga <alsi@bang-olufsen.dk>");
> +MODULE_DESCRIPTION("Driver for RTL8365MB-VC ethernet switch");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/net/dsa/realtek/rtl8366.c b/drivers/net/dsa/realtek/rtl8366-core.c
> similarity index 100%
> rename from drivers/net/dsa/realtek/rtl8366.c
> rename to drivers/net/dsa/realtek/rtl8366-core.c
> diff --git a/drivers/net/dsa/realtek/rtl8366rb.c b/drivers/net/dsa/realtek/rtl8366rb.c
> index 34e371084d6d..ff607608dead 100644
> --- a/drivers/net/dsa/realtek/rtl8366rb.c
> +++ b/drivers/net/dsa/realtek/rtl8366rb.c
> @@ -1814,3 +1814,7 @@ const struct realtek_variant rtl8366rb_variant = {
>  	.chip_data_sz = sizeof(struct rtl8366rb),
>  };
>  EXPORT_SYMBOL_GPL(rtl8366rb_variant);
> +
> +MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
> +MODULE_DESCRIPTION("Driver for RTL8366RB ethernet switch");
> +MODULE_LICENSE("GPL");