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

Commit 2ea567cb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next 



Merge SFC driver changes from Ben Hutchings.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2771399a f073dde0

drivers/net/ethernet/sfc/Makefile

+1 −2
Original line number Diff line number Diff line 
sfc-y			+= efx.o nic.o falcon.o siena.o tx.o rx.o filter.o \

			   falcon_xmac.o mcdi_mac.o \

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

			   tenxpress.o txc43128_phy.o falcon_boards.o \

			   mcdi.o mcdi_phy.o mcdi_mon.o ptp.o

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

sfc-$(CONFIG_SFC_MTD)	+= mtd.o

sfc-$(CONFIG_SFC_SRIOV)	+= siena_sriov.o

drivers/net/ethernet/sfc/ethtool.c

+4 −19
Original line number Diff line number Diff line
@@ -709,7 +709,6 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev, 
	struct efx_nic *efx = netdev_priv(net_dev);

	u8 wanted_fc, old_fc;

	u32 old_adv;

	bool reset;

	int rc = 0;



	mutex_lock(&efx->mac_lock);
@@ -732,24 +731,10 @@ static int efx_ethtool_set_pauseparam(struct net_device *net_dev, 
		goto out;

	}



	/* TX flow control may automatically turn itself off if the

	 * link partner (intermittently) stops responding to pause

	 * frames. There isn't any indication that this has happened,

	 * so the best we do is leave it up to the user to spot this

	 * and fix it be cycling transmit flow control on this end. */

	reset = (wanted_fc & EFX_FC_TX) && !(efx->wanted_fc & EFX_FC_TX);

	if (EFX_WORKAROUND_11482(efx) && reset) {

		if (efx_nic_rev(efx) == EFX_REV_FALCON_B0) {

			/* Recover by resetting the EM block */

			falcon_stop_nic_stats(efx);

			falcon_drain_tx_fifo(efx);

			falcon_reconfigure_xmac(efx);

			falcon_start_nic_stats(efx);

		} else {

			/* Schedule a reset to recover */

			efx_schedule_reset(efx, RESET_TYPE_INVISIBLE);

		}

	}

	/* Hook for Falcon bug 11482 workaround */

	if (efx->type->prepare_enable_fc_tx &&

	    (wanted_fc & EFX_FC_TX) && !(efx->wanted_fc & EFX_FC_TX))

		efx->type->prepare_enable_fc_tx(efx);



	old_adv = efx->link_advertising;

	old_fc = efx->wanted_fc;

drivers/net/ethernet/sfc/falcon.c

+561 −2

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/sfc/falcon_xmac.c

deleted100644 → 0
+0 −362

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/sfc/filter.c

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ s32 efx_filter_insert_filter(struct efx_nic *efx, struct efx_filter_spec *spec, 
		BUILD_BUG_ON(EFX_FILTER_INDEX_UC_DEF != 0);

		BUILD_BUG_ON(EFX_FILTER_INDEX_MC_DEF !=

			     EFX_FILTER_MC_DEF - EFX_FILTER_UC_DEF);

		rep_index = spec->type - EFX_FILTER_INDEX_UC_DEF;

		rep_index = spec->type - EFX_FILTER_UC_DEF;

		ins_index = rep_index;



		spin_lock_bh(&state->lock);