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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

====================
This series contains updates to e1000, e1000e, igb, igbvf and ixgbe.
The e1000, e1000e, igb and igbvf are single patch changes and the
remaining 11 patches are all against ixgbe.

The e1000 patch is a comment cleanup to align e1000 with the code
commenting style for /drivers/net.  It also contains a few other white
space cleanups (i.e. fix lines over 80 char, remove unnecessary blank
lines and fix the use of tabs/spaces).

The e1000e patch from Koki (Fujitsu) adds a warning when link speed is
downgraded due to SmartSpeed.

The igb patch from Stefan (Red Hat) increases the timeout in the ethtool
offline self-test because some i350 adapters would sometimes fail the
self-test because link auto negotiation may take longer than the current
4 second timeout.

The igbvf patch from Alex is meant to address several race issues that
become possible because next_to_watch could possibly be set to a value
that shows that the descriptor is done when it is not.  In order to correct
that we instead make next_to_watch a pointer that is set to NULL during
cleanup, and set to the eop_desc after the descriptor rings have been written.

The remaining patches for ixgbe are a mix of fixes and added support as well
as some cleanup.  Most notably is the added support for displaying the
number of Tx/Rx channels via ethtool by Alex.  Also Aurélien adds the
ability for reading data from SFP+ modules over i2c for diagnostic
monitoring.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 96b45cbd 990a3158

drivers/net/ethernet/intel/e1000/e1000.h

+33 −32
Original line number Diff line number Diff line
@@ -142,7 +142,8 @@ struct e1000_adapter; 
#define E1000_MNG_VLAN_NONE	(-1)



/* wrapper around a pointer to a socket buffer,

 * so a DMA handle can be stored along with the buffer */

 * so a DMA handle can be stored along with the buffer

 */

struct e1000_buffer {

	struct sk_buff *skb;

	dma_addr_t dma;

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

+72 −68
Original line number Diff line number Diff line
@@ -161,8 +161,8 @@ static int e1000_get_settings(struct net_device *netdev, 
		ethtool_cmd_speed_set(ecmd, adapter->link_speed);



		/* unfortunately FULL_DUPLEX != DUPLEX_FULL

		 *          and HALF_DUPLEX != DUPLEX_HALF */



		 * and HALF_DUPLEX != DUPLEX_HALF

		 */

		if (adapter->link_duplex == FULL_DUPLEX)

			ecmd->duplex = DUPLEX_FULL;

		else
@@ -179,8 +179,7 @@ static int e1000_get_settings(struct net_device *netdev, 
	if ((hw->media_type == e1000_media_type_copper) &&

	    netif_carrier_ok(netdev))

		ecmd->eth_tp_mdix = (!!adapter->phy_info.mdix_mode ?

							ETH_TP_MDI_X :

							ETH_TP_MDI);

				     ETH_TP_MDI_X : ETH_TP_MDI);

	else

		ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID;
@@ -197,8 +196,7 @@ static int e1000_set_settings(struct net_device *netdev, 
	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;



	/*

	 * MDI setting is only allowed when autoneg enabled because

	/* MDI setting is only allowed when autoneg enabled because

	 * some hardware doesn't allow MDI setting when speed or

	 * duplex is forced.

	 */
@@ -260,8 +258,7 @@ static u32 e1000_get_link(struct net_device *netdev) 
{

	struct e1000_adapter *adapter = netdev_priv(netdev);



	/*

	 * If the link is not reported up to netdev, interrupts are disabled,

	/* If the link is not reported up to netdev, interrupts are disabled,

	 * and so the physical link state may have changed since we last

	 * looked. Set get_link_status to make sure that the true link

	 * state is interrogated, rather than pulling a cached and possibly
@@ -517,15 +514,17 @@ static int e1000_set_eeprom(struct net_device *netdev, 
	ptr = (void *)eeprom_buff;



	if (eeprom->offset & 1) {

		/* need read/modify/write of first changed EEPROM word */

		/* only the second byte of the word is being modified */

		/* need read/modify/write of first changed EEPROM word

		 * only the second byte of the word is being modified

		 */

		ret_val = e1000_read_eeprom(hw, first_word, 1,

					    &eeprom_buff[0]);

		ptr++;

	}

	if (((eeprom->offset + eeprom->len) & 1) && (ret_val == 0)) {

		/* need read/modify/write of last changed EEPROM word */

		/* only the first byte of the word is being modified */

		/* need read/modify/write of last changed EEPROM word

		 * only the first byte of the word is being modified

		 */

		ret_val = e1000_read_eeprom(hw, last_word, 1,

		                  &eeprom_buff[last_word - first_word]);

	}
@@ -606,11 +605,13 @@ static int e1000_set_ringparam(struct net_device *netdev, 
	rx_old = adapter->rx_ring;



	err = -ENOMEM;

	txdr = kcalloc(adapter->num_tx_queues, sizeof(struct e1000_tx_ring), GFP_KERNEL);

	txdr = kcalloc(adapter->num_tx_queues, sizeof(struct e1000_tx_ring),

		       GFP_KERNEL);

	if (!txdr)

		goto err_alloc_tx;



	rxdr = kcalloc(adapter->num_rx_queues, sizeof(struct e1000_rx_ring), GFP_KERNEL);

	rxdr = kcalloc(adapter->num_rx_queues, sizeof(struct e1000_rx_ring),

		       GFP_KERNEL);

	if (!rxdr)

		goto err_alloc_rx;
@@ -642,7 +643,8 @@ static int e1000_set_ringparam(struct net_device *netdev, 
			goto err_setup_tx;



		/* save the new, restore the old in order to free it,

		 * then restore the new back again */

		 * then restore the new back again

		 */



		adapter->rx_ring = rx_old;

		adapter->tx_ring = tx_old;
@@ -784,7 +786,6 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) 
	REG_SET_AND_CHECK(TCTL, 0xFFFFFFFF, 0x00000000);



	if (hw->mac_type >= e1000_82543) {



		REG_SET_AND_CHECK(RCTL, before, 0xFFFFFFFF);

		REG_PATTERN_TEST(RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);

		REG_PATTERN_TEST(TXCW, 0xC000FFFF, 0x0000FFFF);
@@ -795,14 +796,11 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) 
			REG_PATTERN_TEST(RA + (((i << 1) + 1) << 2), 0x8003FFFF,

			                 0xFFFFFFFF);

		}



	} else {



		REG_SET_AND_CHECK(RCTL, 0xFFFFFFFF, 0x01FFFFFF);

		REG_PATTERN_TEST(RDBAL, 0xFFFFF000, 0xFFFFFFFF);

		REG_PATTERN_TEST(TXCW, 0x0000FFFF, 0x0000FFFF);

		REG_PATTERN_TEST(TDBAL, 0xFFFFF000, 0xFFFFFFFF);



	}



	value = E1000_MC_TBL_SIZE;
@@ -858,8 +856,9 @@ static int e1000_intr_test(struct e1000_adapter *adapter, u64 *data) 


	*data = 0;



	/* NOTE: we don't test MSI interrupts here, yet */

	/* Hook up test interrupt handler just for this test */

	/* NOTE: we don't test MSI interrupts here, yet

	 * Hook up test interrupt handler just for this test

	 */

	if (!request_irq(irq, e1000_test_intr, IRQF_PROBE_SHARED, netdev->name,

			 netdev))

		shared_int = false;
@@ -1260,7 +1259,8 @@ static int e1000_integrated_phy_loopback(struct e1000_adapter *adapter) 
		ctrl_reg |= E1000_CTRL_ILOS; /* Invert Loss of Signal */

	else {

		/* Set the ILOS bit on the fiber Nic is half

		 * duplex link is detected. */

		 * duplex link is detected.

		 */

		stat_reg = er32(STATUS);

		if ((stat_reg & E1000_STATUS_FD) == 0)

			ctrl_reg |= (E1000_CTRL_ILOS | E1000_CTRL_SLU);
@@ -1493,7 +1493,8 @@ static int e1000_link_test(struct e1000_adapter *adapter, u64 *data) 
		hw->serdes_has_link = false;



		/* On some blade server designs, link establishment

		 * could take as long as 2-3 minutes */

		 * could take as long as 2-3 minutes

		 */

		do {

			e1000_check_for_link(hw);

			if (hw->serdes_has_link)
@@ -1545,7 +1546,8 @@ static void e1000_diag_test(struct net_device *netdev, 
		e_info(hw, "offline testing starting\n");



		/* Link test performed before hardware reset so autoneg doesn't

		 * interfere with test result */

		 * interfere with test result

		 */

		if (e1000_link_test(adapter, &data[4]))

			eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -1639,7 +1641,8 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, 
	default:

		/* dual port cards only support WoL on port A from now on

		 * unless it was enabled in the eeprom for port B

		 * so exclude FUNC_1 ports from having WoL enabled */

		 * so exclude FUNC_1 ports from having WoL enabled

		 */

		if (er32(STATUS) & E1000_STATUS_FUNC_1 &&

		    !adapter->eeprom_wol) {

			wol->supported = 0;
@@ -1663,7 +1666,8 @@ static void e1000_get_wol(struct net_device *netdev, 
	wol->wolopts = 0;



	/* this function will set ->supported = 0 and return 1 if wol is not

	 * supported by this hardware */

	 * supported by this hardware

	 */

	if (e1000_wol_exclusion(adapter, wol) ||

	    !device_can_wakeup(&adapter->pdev->dev))

		return;

drivers/net/ethernet/intel/e1000/e1000_hw.c

+309 −249

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/e1000/e1000_main.c

+158 −164

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/e1000/e1000_param.c

+14 −15
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter); 
 * value exists, a default value is used.  The final value is stored

 * in a variable in the adapter structure.

 **/



void e1000_check_options(struct e1000_adapter *adapter)

{

	struct e1000_option opt;
@@ -319,7 +318,8 @@ void e1000_check_options(struct e1000_adapter *adapter) 
			.def  = E1000_DEFAULT_RXD,

			.arg  = { .r = {

				.min = E1000_MIN_RXD,

				.max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD

				.max = mac_type < e1000_82544 ? E1000_MAX_RXD :

				       E1000_MAX_82544_RXD

			}}

		};
@@ -488,7 +488,8 @@ void e1000_check_options(struct e1000_adapter *adapter) 
				/* save the setting, because the dynamic bits

				 * change itr.

				 * clear the lower two bits because they are

				 * used as control */

				 * used as control

				 */

				adapter->itr_setting = adapter->itr & ~3;

				break;

			}
@@ -533,7 +534,6 @@ void e1000_check_options(struct e1000_adapter *adapter) 
 *

 * Handles speed and duplex options on fiber adapters

 **/



static void e1000_check_fiber_options(struct e1000_adapter *adapter)

{

	int bd = adapter->bd_number;
@@ -559,7 +559,6 @@ static void e1000_check_fiber_options(struct e1000_adapter *adapter) 
 *

 * Handles speed and duplex options on copper adapters

 **/



static void e1000_check_copper_options(struct e1000_adapter *adapter)

{

	struct e1000_option opt;

CRA Git | Maintained and supported by SUSTech CRA and CCSE