netdev - Re: [PATCH net-next] net: dsa: ocelot: build felix.c into a dedicated kernel module

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <Y9Kxk8xP/hEVgRdK@COLIN-DESKTOP1.localdomain>
Date:   Thu, 26 Jan 2023 09:00:03 -0800
From:   Colin Foster <colin.foster@...advantage.com>
To:     Vladimir Oltean <vladimir.oltean@....com>
Cc:     netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
        Eric Dumazet <edumazet@...gle.com>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Claudiu Manoil <claudiu.manoil@....com>,
        UNGLinuxDriver@...rochip.com,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Andrew Lunn <andrew@...n.ch>,
        Florian Fainelli <f.fainelli@...il.com>,
        Alexander Lobakin <alobakin@...me>
Subject: Re: [PATCH net-next] net: dsa: ocelot: build felix.c into a
 dedicated kernel module

On Wed, Jan 25, 2023 at 04:57:16PM +0200, Vladimir Oltean wrote:
> The build system currently complains:
> 
> scripts/Makefile.build:252: drivers/net/dsa/ocelot/Makefile:
> felix.o is added to multiple modules: mscc_felix mscc_seville
> 
> Since felix.c holds the DSA glue layer, create a mscc_felix_dsa_lib.ko.
> This is similar to how mscc_ocelot_switch_lib.ko holds a library for
> configuring the hardware.
> 

I remember seeing this at one point. I thought I'd fixed it, but
apparently not. 

Acked-by: Colin Foster <colin.foster@...advantage.com>

> Signed-off-by: Vladimir Oltean <vladimir.oltean@....com>
> ---
>  drivers/net/dsa/ocelot/Kconfig  | 11 +++++++++++
>  drivers/net/dsa/ocelot/Makefile | 11 ++++-------
>  drivers/net/dsa/ocelot/felix.c  |  6 ++++++
>  3 files changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/dsa/ocelot/Kconfig b/drivers/net/dsa/ocelot/Kconfig
> index 08db9cf76818..60f1f7ada465 100644
> --- a/drivers/net/dsa/ocelot/Kconfig
> +++ b/drivers/net/dsa/ocelot/Kconfig
> @@ -1,4 +1,13 @@
>  # SPDX-License-Identifier: GPL-2.0-only
> +config NET_DSA_MSCC_FELIX_DSA_LIB
> +	tristate
> +	help
> +	  This is an umbrella module for all network switches that are
> +	  register-compatible with Ocelot and that perform I/O to their host
> +	  CPU through an NPI (Node Processor Interface) Ethernet port.
> +	  Its name comes from the first hardware chip to make use of it
> +	  (VSC9959), code named Felix.
> +
>  config NET_DSA_MSCC_FELIX
>  	tristate "Ocelot / Felix Ethernet switch support"
>  	depends on NET_DSA && PCI
> @@ -8,6 +17,7 @@ config NET_DSA_MSCC_FELIX
>  	depends on PTP_1588_CLOCK_OPTIONAL
>  	depends on NET_SCH_TAPRIO || NET_SCH_TAPRIO=n
>  	select MSCC_OCELOT_SWITCH_LIB
> +	select NET_DSA_MSCC_FELIX_DSA_LIB
>  	select NET_DSA_TAG_OCELOT_8021Q
>  	select NET_DSA_TAG_OCELOT
>  	select FSL_ENETC_MDIO
> @@ -24,6 +34,7 @@ config NET_DSA_MSCC_SEVILLE
>  	depends on PTP_1588_CLOCK_OPTIONAL
>  	select MDIO_MSCC_MIIM
>  	select MSCC_OCELOT_SWITCH_LIB
> +	select NET_DSA_MSCC_FELIX_DSA_LIB
>  	select NET_DSA_TAG_OCELOT_8021Q
>  	select NET_DSA_TAG_OCELOT
>  	select PCS_LYNX
> diff --git a/drivers/net/dsa/ocelot/Makefile b/drivers/net/dsa/ocelot/Makefile
> index f6dd131e7491..fd7dde570d4e 100644
> --- a/drivers/net/dsa/ocelot/Makefile
> +++ b/drivers/net/dsa/ocelot/Makefile
> @@ -1,11 +1,8 @@
>  # SPDX-License-Identifier: GPL-2.0-only
> +obj-$(CONFIG_NET_DSA_MSCC_FELIX_DSA_LIB) += mscc_felix_dsa_lib.o
>  obj-$(CONFIG_NET_DSA_MSCC_FELIX) += mscc_felix.o
>  obj-$(CONFIG_NET_DSA_MSCC_SEVILLE) += mscc_seville.o
>  
> -mscc_felix-objs := \
> -	felix.o \
> -	felix_vsc9959.o
> -
> -mscc_seville-objs := \
> -	felix.o \
> -	seville_vsc9953.o
> +mscc_felix_dsa_lib-objs := felix.o
> +mscc_felix-objs := felix_vsc9959.o
> +mscc_seville-objs := seville_vsc9953.o
> diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
> index d21e7be2f8c7..f57b4095b793 100644
> --- a/drivers/net/dsa/ocelot/felix.c
> +++ b/drivers/net/dsa/ocelot/felix.c
> @@ -2131,6 +2131,7 @@ const struct dsa_switch_ops felix_switch_ops = {
>  	.port_set_host_flood		= felix_port_set_host_flood,
>  	.port_change_master		= felix_port_change_master,
>  };
> +EXPORT_SYMBOL_GPL(felix_switch_ops);
>  
>  struct net_device *felix_port_to_netdev(struct ocelot *ocelot, int port)
>  {
> @@ -2142,6 +2143,7 @@ struct net_device *felix_port_to_netdev(struct ocelot *ocelot, int port)
>  
>  	return dsa_to_port(ds, port)->slave;
>  }
> +EXPORT_SYMBOL_GPL(felix_port_to_netdev);
>  
>  int felix_netdev_to_port(struct net_device *dev)
>  {
> @@ -2153,3 +2155,7 @@ int felix_netdev_to_port(struct net_device *dev)
>  
>  	return dp->index;
>  }
> +EXPORT_SYMBOL_GPL(felix_netdev_to_port);
> +
> +MODULE_DESCRIPTION("Felix DSA library");
> +MODULE_LICENSE("GPL");
> -- 
> 2.34.1
>