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

Commit 54399a78 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 



Ben Hutchings says:

====================
1. Fix potential badness when running a self-test with SR-IOV enabled.
2. Fix calculation of some interface statistics that could run backward.
3. Miscellaneous cleanup.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d3818c92 c2dbab39

drivers/net/ethernet/sfc/efx.c

+5 −5
Original line number Diff line number Diff line
@@ -1103,8 +1103,8 @@ static int efx_init_io(struct efx_nic *efx) 
	 * masks event though they reject 46 bit masks.

	 */

	while (dma_mask > 0x7fffffffUL) {

		if (pci_dma_supported(pci_dev, dma_mask)) {

			rc = pci_set_dma_mask(pci_dev, dma_mask);

		if (dma_supported(&pci_dev->dev, dma_mask)) {

			rc = dma_set_mask(&pci_dev->dev, dma_mask);

			if (rc == 0)

				break;

		}
@@ -1117,10 +1117,10 @@ static int efx_init_io(struct efx_nic *efx) 
	}

	netif_dbg(efx, probe, efx->net_dev,

		  "using DMA mask %llx\n", (unsigned long long) dma_mask);

	rc = pci_set_consistent_dma_mask(pci_dev, dma_mask);

	rc = dma_set_coherent_mask(&pci_dev->dev, dma_mask);

	if (rc) {

		/* pci_set_consistent_dma_mask() is not *allowed* to

		 * fail with a mask that pci_set_dma_mask() accepted,

		/* dma_set_coherent_mask() is not *allowed* to

		 * fail with a mask that dma_set_mask() accepted,

		 * but just in case...

		 */

		netif_err(efx, probe, efx->net_dev,

drivers/net/ethernet/sfc/enum.h

+4 −4
Original line number Diff line number Diff line
@@ -136,10 +136,10 @@ enum efx_loopback_mode { 
 *

 * Reset methods are numbered in order of increasing scope.

 *

 * @RESET_TYPE_INVISIBLE: don't reset the PHYs or interrupts

 * @RESET_TYPE_ALL: reset everything but PCI core blocks

 * @RESET_TYPE_WORLD: reset everything, save & restore PCI config

 * @RESET_TYPE_DISABLE: disable NIC

 * @RESET_TYPE_INVISIBLE: Reset datapath and MAC (Falcon only)

 * @RESET_TYPE_ALL: Reset datapath, MAC and PHY

 * @RESET_TYPE_WORLD: Reset as much as possible

 * @RESET_TYPE_DISABLE: Reset datapath, MAC and PHY; leave NIC disabled

 * @RESET_TYPE_TX_WATCHDOG: reset due to TX watchdog

 * @RESET_TYPE_INT_ERROR: reset due to internal error

 * @RESET_TYPE_RX_RECOVERY: reset to recover from RX datapath errors

drivers/net/ethernet/sfc/ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ static void efx_ethtool_get_strings(struct net_device *net_dev, 
	switch (string_set) {

	case ETH_SS_STATS:

		for (i = 0; i < EFX_ETHTOOL_NUM_STATS; i++)

			strncpy(ethtool_strings[i].name,

			strlcpy(ethtool_strings[i].name,

				efx_ethtool_stats[i].name,

				sizeof(ethtool_strings[i].name));

		break;

drivers/net/ethernet/sfc/falcon.c

+31 −4
Original line number Diff line number Diff line
@@ -25,9 +25,12 @@ 
#include "io.h"

#include "phy.h"

#include "workarounds.h"

#include "selftest.h"



/* Hardware control for SFC4000 (aka Falcon). */



static int falcon_reset_hw(struct efx_nic *efx, enum reset_type method);



static const unsigned int

/* "Large" EEPROM device: Atmel AT25640 or similar

 * 8 KB, 16-bit address, 32 B write block */
@@ -1034,10 +1037,34 @@ static const struct efx_nic_register_test falcon_b0_register_tests[] = { 
	  EFX_OWORD32(0x0003FF0F, 0x00000000, 0x00000000, 0x00000000) },

};



static int falcon_b0_test_registers(struct efx_nic *efx)

static int

falcon_b0_test_chip(struct efx_nic *efx, struct efx_self_tests *tests)

{

	return efx_nic_test_registers(efx, falcon_b0_register_tests,

				      ARRAY_SIZE(falcon_b0_register_tests));

	enum reset_type reset_method = RESET_TYPE_INVISIBLE;

	int rc, rc2;



	mutex_lock(&efx->mac_lock);

	if (efx->loopback_modes) {

		/* We need the 312 clock from the PHY to test the XMAC

		 * registers, so move into XGMII loopback if available */

		if (efx->loopback_modes & (1 << LOOPBACK_XGMII))

			efx->loopback_mode = LOOPBACK_XGMII;

		else

			efx->loopback_mode = __ffs(efx->loopback_modes);

	}

	__efx_reconfigure_port(efx);

	mutex_unlock(&efx->mac_lock);



	efx_reset_down(efx, reset_method);



	tests->registers =

		efx_nic_test_registers(efx, falcon_b0_register_tests,

				       ARRAY_SIZE(falcon_b0_register_tests))

		? -1 : 1;



	rc = falcon_reset_hw(efx, reset_method);

	rc2 = efx_reset_up(efx, reset_method, rc == 0);

	return rc ? rc : rc2;

}



/**************************************************************************
@@ -1818,7 +1845,7 @@ const struct efx_nic_type falcon_b0_nic_type = { 
	.get_wol = falcon_get_wol,

	.set_wol = falcon_set_wol,

	.resume_wol = efx_port_dummy_op_void,

	.test_registers = falcon_b0_test_registers,

	.test_chip = falcon_b0_test_chip,

	.test_nvram = falcon_test_nvram,



	.revision = EFX_REV_FALCON_B0,

drivers/net/ethernet/sfc/falcon_xmac.c

+6 −6
Original line number Diff line number Diff line
@@ -341,11 +341,11 @@ void falcon_update_stats_xmac(struct efx_nic *efx) 
	FALCON_STAT(efx, XgTxIpSrcErrPkt, tx_ip_src_error);



	/* Update derived statistics */

	mac_stats->tx_good_bytes =

		(mac_stats->tx_bytes - mac_stats->tx_bad_bytes -

	efx_update_diff_stat(&mac_stats->tx_good_bytes,

			     mac_stats->tx_bytes - mac_stats->tx_bad_bytes -

			     mac_stats->tx_control * 64);

	mac_stats->rx_bad_bytes =

		(mac_stats->rx_bytes - mac_stats->rx_good_bytes -

	efx_update_diff_stat(&mac_stats->rx_bad_bytes,

			     mac_stats->rx_bytes - mac_stats->rx_good_bytes -

			     mac_stats->rx_control * 64);

}