Commit bca56ea6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'move-siena-into-a-separate-subdirectory'

Martin Habets says:

====================
Move Siena into a separate subdirectory

The Siena NICs (SFN5000 and SFN6000 series) went EOL in November 2021.
Most of these adapters have been remove from our test labs, and testing
has been reduced to a minimum.

This patch series creates a separate kernel module for the Siena architecture,
analogous to what was done for Falcon some years ago.
This reduces our maintenance for the sfc.ko module, and allows us to
enhance the EF10 and EF100 drivers without the risk of breaking Siena NICs.

After this series further enhancements are needed to differentiate the
new kernel module from sfc.ko, and the Siena code can be removed from sfc.ko.
Thes will be posted as a small follow-up series.
The Siena module is not built by default, but can be enabled
using Kconfig option SFC_SIENA. This will create module sfc-siena.ko.

	Patches

Patches 1-3 establish the code base for the Siena driver.
Patches 4-10 ensure the allyesconfig build succeeds.
Patch 11 adds the basic Siena module.

I do not expect patch 1 through 3 to be reviewed, they are FYI only.
No checkpatch issues were resolved as part of these, but they
were fixed in the subsequent patches.

	Testing

Various build tests were done such as allyesconfig, W=1 and sparse.
The new sfc-siena.ko and sfc.ko modules were tested on a machine with both
these NICs in them, and several tests were run on both drivers.
====================

Link: https://lore.kernel.org/r/165211018297.5289.9658523545298485394.stgit@palantir17.mph.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 61004d1d c5a13c31
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -65,5 +65,6 @@ config SFC_MCDI_LOGGING
	  a sysfs file 'mcdi_logging' under the PCI device.

source "drivers/net/ethernet/sfc/falcon/Kconfig"
source "drivers/net/ethernet/sfc/siena/Kconfig"

endif # NET_VENDOR_SOLARFLARE
+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ sfc-$(CONFIG_SFC_SRIOV) += sriov.o ef10_sriov.o ef100_sriov.o
obj-$(CONFIG_SFC)	+= sfc.o

obj-$(CONFIG_SFC_FALCON) += falcon/
obj-$(CONFIG_SFC_SIENA) += siena/
+12 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-only
config SFC_SIENA
	tristate "Solarflare SFC9000 support"
	depends on PCI
	select MDIO
	select CRC32
	help
	  This driver supports 10-gigabit Ethernet cards based on
	  the Solarflare SFC9000 controller.

	  To compile this driver as a module, choose M here.  The module
	  will be called sfc-siena.
+11 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
sfc-siena-y		+= farch.o siena.o \
			   efx.o efx_common.o efx_channels.o nic.o \
			   tx.o tx_common.o rx.o rx_common.o \
			   selftest.o ethtool.o ethtool_common.o ptp.o \
			   mcdi.o mcdi_port.o mcdi_port_common.o \
			   mcdi_mon.o
sfc-siena-$(CONFIG_SFC_MTD)	+= mtd.o
sfc-siena-$(CONFIG_SFC_SRIOV)	+= siena_sriov.o

obj-$(CONFIG_SFC_SIENA)	+= sfc-siena.o
+614 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading