Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-11 08:18:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sfc: Disable Siena support

Browse Source 
Disable the build of Siena code until later in this patch series.
Prevent sfc.ko from binding to Siena NICs.

efx_init_sriov/efx_fini_sriov is only used for Siena. Remove calls
to those.

Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Martin Habets 2022-05-04 08:49:53 +01:00 committed by David S. Miller
parent 402f2d6b6b
commit 0c38a5bd60
4 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/sfc/Kconfig
View File

@ -17,14 +17,14 @@ config NET_VENDOR_SOLARFLARE
if NET_VENDOR_SOLARFLARE if NET_VENDOR_SOLARFLARE
config SFC config SFC
tristate "Solarflare SFC9000/SFC9100/EF100-family support" tristate "Solarflare SFC9100/EF100-family support"
depends on PCI depends on PCI
depends on PTP_1588_CLOCK_OPTIONAL depends on PTP_1588_CLOCK_OPTIONAL
select MDIO select MDIO
select CRC32 select CRC32
help help
This driver supports 10/40-gigabit Ethernet cards based on This driver supports 10/40-gigabit Ethernet cards based on
the Solarflare SFC9000-family and SFC9100-family controllers. the Solarflare SFC9100-family controllers.
It also supports 10/25/40/100-gigabit Ethernet cards based It also supports 10/25/40/100-gigabit Ethernet cards based
on the Solarflare EF100 networking IP in Xilinx FPGAs. on the Solarflare EF100 networking IP in Xilinx FPGAs.
@ -47,11 +47,11 @@ config SFC_MCDI_MON
This exposes the on-board firmware-managed sensors as a This exposes the on-board firmware-managed sensors as a
hardware monitor device. hardware monitor device.
config SFC_SRIOV config SFC_SRIOV
bool "Solarflare SFC9000-family SR-IOV support" bool "Solarflare SFC9000/SFC9100-family SR-IOV support"
depends on SFC && PCI_IOV depends on SFC && PCI_IOV
default y default y
help help
This enables support for the SFC9000 I/O Virtualization This enables support for the Single Root I/O Virtualization
features, allowing accelerated network performance in features, allowing accelerated network performance in
virtualized environments. virtualized environments.
config SFC_MCDI_LOGGING config SFC_MCDI_LOGGING

4
drivers/net/ethernet/sfc/Makefile
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
sfc-y += efx.o efx_common.o efx_channels.o nic.o \ sfc-y += efx.o efx_common.o efx_channels.o nic.o \
farch.o siena.o ef10.o \ ef10.o \
tx.o tx_common.o tx_tso.o rx.o rx_common.o \ tx.o tx_common.o tx_tso.o rx.o rx_common.o \
selftest.o ethtool.o ethtool_common.o ptp.o \ selftest.o ethtool.o ethtool_common.o ptp.o \
mcdi.o mcdi_port.o mcdi_port_common.o \ mcdi.o mcdi_port.o mcdi_port_common.o \
@ -8,7 +8,7 @@ sfc-y += efx.o efx_common.o efx_channels.o nic.o \
ef100.o ef100_nic.o ef100_netdev.o \ ef100.o ef100_nic.o ef100_netdev.o \
ef100_ethtool.o ef100_rx.o ef100_tx.o ef100_ethtool.o ef100_rx.o ef100_tx.o
sfc-$(CONFIG_SFC_MTD) += mtd.o sfc-$(CONFIG_SFC_MTD) += mtd.o
sfc-$(CONFIG_SFC_SRIOV) += sriov.o siena_sriov.o ef10_sriov.o ef100_sriov.o sfc-$(CONFIG_SFC_SRIOV) += sriov.o ef10_sriov.o ef100_sriov.o
obj-$(CONFIG_SFC) += sfc.o obj-$(CONFIG_SFC) += sfc.o

17
drivers/net/ethernet/sfc/efx.c
View File

@ -795,10 +795,6 @@ static void efx_unregister_netdev(struct efx_nic *efx)
/* PCI device ID table */ /* PCI device ID table */
static const struct pci_device_id efx_pci_table[] = { static const struct pci_device_id efx_pci_table[] = {
{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803), /* SFC9020 */
.driver_data = (unsigned long) &siena_a0_nic_type},
{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813), /* SFL9021 */
.driver_data = (unsigned long) &siena_a0_nic_type},
{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0903), /* SFC9120 PF */ {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0903), /* SFC9120 PF */
.driver_data = (unsigned long) &efx_hunt_a0_nic_type}, .driver_data = (unsigned long) &efx_hunt_a0_nic_type},
{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x1903), /* SFC9120 VF */ {PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x1903), /* SFC9120 VF */
@ -1294,12 +1290,6 @@ static int __init efx_init_module(void)
if (rc) if (rc)
goto err_notifier; goto err_notifier;
#ifdef CONFIG_SFC_SRIOV
rc = efx_init_sriov();
if (rc)
goto err_sriov;
#endif
rc = efx_create_reset_workqueue(); rc = efx_create_reset_workqueue();
if (rc) if (rc)
goto err_reset; goto err_reset;
@ -1319,10 +1309,6 @@ static int __init efx_init_module(void)
err_pci: err_pci:
efx_destroy_reset_workqueue(); efx_destroy_reset_workqueue();
err_reset: err_reset:
#ifdef CONFIG_SFC_SRIOV
efx_fini_sriov();
err_sriov:
#endif
unregister_netdevice_notifier(&efx_netdev_notifier); unregister_netdevice_notifier(&efx_netdev_notifier);
err_notifier: err_notifier:
return rc; return rc;
@ -1335,9 +1321,6 @@ static void __exit efx_exit_module(void)
pci_unregister_driver(&ef100_pci_driver); pci_unregister_driver(&ef100_pci_driver);
pci_unregister_driver(&efx_pci_driver); pci_unregister_driver(&efx_pci_driver);
efx_destroy_reset_workqueue(); efx_destroy_reset_workqueue();
#ifdef CONFIG_SFC_SRIOV
efx_fini_sriov();
#endif
unregister_netdevice_notifier(&efx_netdev_notifier); unregister_netdevice_notifier(&efx_netdev_notifier);
} }

4
drivers/net/ethernet/sfc/nic.h
View File

@ -301,10 +301,6 @@ struct efx_ef10_nic_data {
int efx_ef10_tx_tso_desc(struct efx_tx_queue *tx_queue, struct sk_buff *skb, int efx_ef10_tx_tso_desc(struct efx_tx_queue *tx_queue, struct sk_buff *skb,
bool *data_mapped); bool *data_mapped);
int efx_init_sriov(void);
void efx_fini_sriov(void);
extern const struct efx_nic_type siena_a0_nic_type;
extern const struct efx_nic_type efx_hunt_a0_nic_type; extern const struct efx_nic_type efx_hunt_a0_nic_type;
extern const struct efx_nic_type efx_hunt_a0_vf_nic_type; extern const struct efx_nic_type efx_hunt_a0_vf_nic_type;