Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a6681e2 authored by Edward Cree's avatar Edward Cree Committed by David S. Miller
Browse files

sfc: separate out SFC4000 ("Falcon") support into new sfc-falcon driver 



Rationale: The differences between Falcon and Siena are in many ways larger
 than those between Siena and EF10 (despite Siena being nominally "Falcon-
 architecture"); for instance, Falcon has no MCPU, so there is no MCDI.
 Removing Falcon support from the sfc driver should simplify the latter,
 and avoid the possibility of Falcon support being broken by changes to sfc
 (which are rarely if ever tested on Falcon, it being end-of-lifed hardware).

The sfc-falcon driver created in this changeset is essentially a copy of the
 sfc driver, but with Siena- and EF10-specific code, including MCDI, removed
 and with the "efx_" identifier prefix changed to "ef4_" (for "EFX 4000-
 series") to avoid collisions when both drivers are built-in.

This changeset removes Falcon from the sfc driver's PCI ID table; then in
 sfc I've removed obvious Falcon-related code: I removed the Falcon NIC
 functions, Falcon PHY code, and EFX_REV_FALCON_*, then fixed up everything
 that referenced them.

Also, increment minor version of both drivers (to 4.1).

For now, CONFIG_SFC selects CONFIG_SFC_FALCON, so that updating old configs
 doesn't cause Falcon support to disappear; but that should be undone at
 some point in the future.

Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6bb10c2b

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ source "drivers/net/ethernet/seeq/Kconfig" 
source "drivers/net/ethernet/silan/Kconfig"

source "drivers/net/ethernet/sis/Kconfig"

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

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

source "drivers/net/ethernet/sgi/Kconfig"

source "drivers/net/ethernet/smsc/Kconfig"

source "drivers/net/ethernet/stmicro/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/ 
obj-$(CONFIG_NET_VENDOR_SILAN) += silan/

obj-$(CONFIG_NET_VENDOR_SIS) += sis/

obj-$(CONFIG_SFC) += sfc/

obj-$(CONFIG_SFC_FALCON) += sfc/falcon/

obj-$(CONFIG_NET_VENDOR_SGI) += sgi/

obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/

obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/

drivers/net/ethernet/sfc/Kconfig

+4 −4
Original line number Diff line number Diff line 
config SFC

	tristate "Solarflare SFC4000/SFC9000/SFC9100-family support"

	tristate "Solarflare SFC9000/SFC9100-family support"

	depends on PCI

	select MDIO

	select CRC32

	select I2C

	select I2C_ALGOBIT

	select PTP_1588_CLOCK

	select SFC_FALCON

	---help---

	  This driver supports 10/40-gigabit Ethernet cards based on

	  the Solarflare SFC4000, SFC9000-family and SFC9100-family

	  controllers.

	  the Solarflare SFC9000-family and SFC9100-family controllers.



	  To compile this driver as a module, choose M here.  The module

	  will be called sfc.

config SFC_MTD

	bool "Solarflare SFC4000/SFC9000/SFC9100-family MTD support"

	bool "Solarflare SFC9000/SFC9100-family MTD support"

	depends on SFC && MTD && !(SFC=y && MTD=m)

	default y

	---help---

drivers/net/ethernet/sfc/Makefile

+3 −4
Original line number Diff line number Diff line 
sfc-y			+= efx.o nic.o farch.o falcon.o siena.o ef10.o tx.o \

			   rx.o selftest.o ethtool.o qt202x_phy.o mdio_10g.o \

			   tenxpress.o txc43128_phy.o falcon_boards.o \

			   mcdi.o mcdi_port.o mcdi_mon.o ptp.o tx_tso.o

sfc-y			+= efx.o nic.o farch.o siena.o ef10.o tx.o rx.o \

			   selftest.o ethtool.o ptp.o tx_tso.o \

			   mcdi.o mcdi_port.o mcdi_mon.o

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_SRIOV)	+= sriov.o siena_sriov.o ef10_sriov.o

drivers/net/ethernet/sfc/efx.c

+6 −23
Original line number Diff line number Diff line
@@ -733,16 +733,7 @@ static void efx_stop_datapath(struct efx_nic *efx) 
	}



	rc = efx->type->fini_dmaq(efx);

	if (rc && EFX_WORKAROUND_7803(efx)) {

		/* Schedule a reset to recover from the flush failure. The

		 * descriptor caches reference memory we're about to free,

		 * but falcon_reconfigure_mac_wrapper() won't reconnect

		 * the MACs because of the pending reset.

		 */

		netif_err(efx, drv, efx->net_dev,

			  "Resetting to recover from flush failure\n");

		efx_schedule_reset(efx, RESET_TYPE_ALL);

	} else if (rc) {

	if (rc) {

		netif_err(efx, drv, efx->net_dev, "failed to flush queues\n");

	} else {

		netif_dbg(efx, drv, efx->net_dev,
@@ -1892,15 +1883,13 @@ static void efx_start_all(struct efx_nic *efx) 
		queue_delayed_work(efx->workqueue, &efx->monitor_work,

				   efx_monitor_interval);



	/* If link state detection is normally event-driven, we have

	/* Link state detection is normally event-driven; we have

	 * to poll now because we could have missed a change

	 */

	if (efx_nic_rev(efx) >= EFX_REV_SIENA_A0) {

	mutex_lock(&efx->mac_lock);

	if (efx->phy_op->poll(efx))

		efx_link_status_changed(efx);

	mutex_unlock(&efx->mac_lock);

	}



	efx->type->start_stats(efx);

	efx->type->pull_stats(efx);
@@ -2842,12 +2831,6 @@ void efx_schedule_reset(struct efx_nic *efx, enum reset_type type) 


/* PCI device ID table */

static const struct pci_device_id efx_pci_table[] = {

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,

		    PCI_DEVICE_ID_SOLARFLARE_SFC4000A_0),

	 .driver_data = (unsigned long) &falcon_a1_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE,

		    PCI_DEVICE_ID_SOLARFLARE_SFC4000B),

	 .driver_data = (unsigned long) &falcon_b0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0803),	/* SFC9020 */

	 .driver_data = (unsigned long) &siena_a0_nic_type},

	{PCI_DEVICE(PCI_VENDOR_ID_SOLARFLARE, 0x0813),	/* SFL9021 */