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

Commit 31400fe3 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 e1000e, igb and ixgbe.

Bruce Allan provide 2 minor cleanups for e1000e to resolve whitespace
issues and build warnings about unused parameters.

Carolyn provides a couple of fixes for igb, one being a fix for a
possible panic when the interface is down and receive traffic
arrives.  The second fix resolves an issue on newer parts which have
multiple checksum fields and set_ethtool was only checking to update
the first checksum of the NVM image.

Akeem provides majority of the changes in this patch set.  Akeem
provides a fix for e1000e on an issue reported from the community to
resolve the issue of unlocking swflag_mutex for 82574 and 82583
devices even if the hardware semaphore was successfully acquired.
The other patches from Akeem are against igb, where he adds support
SFP module discovery, LED blink mechanism for devices using cathodes,
LED support for i210/i211 parts and cleanup of a i2c function which
was not being used.

Matthew provides an update for igb to support a more accurate check
for a PTP RX hang.

Amir provides a patch for ixgbe to set the software prio_tc values at
initialization to the hardware setting to remove the need to reset the
device at the first time we call ixgbe_dcbnl_ieee_setets.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5ea94e76 e8915beb

drivers/net/ethernet/intel/e1000e/82571.c

+15 −15
Original line number Diff line number Diff line
@@ -1003,8 +1003,6 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) 
	default:

		break;

	}

	if (ret_val)

		e_dbg("Cannot acquire MDIO ownership\n");



	ctrl = er32(CTRL);
@@ -1015,6 +1013,8 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw) 
	switch (hw->mac.type) {

	case e1000_82574:

	case e1000_82583:

		/* Release mutex only if the hw semaphore is acquired */

		if (!ret_val)

			e1000_put_hw_semaphore_82574(hw);

		break;

	default:

drivers/net/ethernet/intel/e1000e/netdev.c

+27 −28
Original line number Diff line number Diff line
@@ -2673,7 +2673,7 @@ static int e1000e_poll(struct napi_struct *napi, int weight) 
}



static int e1000_vlan_rx_add_vid(struct net_device *netdev,

				 __be16 proto, u16 vid)

				 __always_unused __be16 proto, u16 vid)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;
@@ -2699,7 +2699,7 @@ static int e1000_vlan_rx_add_vid(struct net_device *netdev, 
}



static int e1000_vlan_rx_kill_vid(struct net_device *netdev,

				  __be16 proto, u16 vid)

				  __always_unused __be16 proto, u16 vid)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;
@@ -7034,7 +7034,6 @@ static void __exit e1000_exit_module(void) 
}

module_exit(e1000_exit_module);





MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");

MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");

MODULE_LICENSE("GPL");

drivers/net/ethernet/intel/e1000e/nvm.c

+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ static u16 e1000_shift_in_eec_bits(struct e1000_hw *hw, u16 count) 
	u16 data;



	eecd = er32(EECD);



	eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);

	data = 0;

drivers/net/ethernet/intel/igb/e1000_82575.c

+115 −5
Original line number Diff line number Diff line
@@ -401,12 +401,82 @@ static s32 igb_init_mac_params_82575(struct e1000_hw *hw) 
	return 0;

}



/**

 *  igb_set_sfp_media_type_82575 - derives SFP module media type.

 *  @hw: pointer to the HW structure

 *

 *  The media type is chosen based on SFP module.

 *  compatibility flags retrieved from SFP ID EEPROM.

 **/

static s32 igb_set_sfp_media_type_82575(struct e1000_hw *hw)

{

	s32 ret_val = E1000_ERR_CONFIG;

	u32 ctrl_ext = 0;

	struct e1000_dev_spec_82575 *dev_spec = &hw->dev_spec._82575;

	struct e1000_sfp_flags *eth_flags = &dev_spec->eth_flags;

	u8 tranceiver_type = 0;

	s32 timeout = 3;



	/* Turn I2C interface ON and power on sfp cage */

	ctrl_ext = rd32(E1000_CTRL_EXT);

	ctrl_ext &= ~E1000_CTRL_EXT_SDP3_DATA;

	wr32(E1000_CTRL_EXT, ctrl_ext | E1000_CTRL_I2C_ENA);



	wrfl();



	/* Read SFP module data */

	while (timeout) {

		ret_val = igb_read_sfp_data_byte(hw,

			E1000_I2CCMD_SFP_DATA_ADDR(E1000_SFF_IDENTIFIER_OFFSET),

			&tranceiver_type);

		if (ret_val == 0)

			break;

		msleep(100);

		timeout--;

	}

	if (ret_val != 0)

		goto out;



	ret_val = igb_read_sfp_data_byte(hw,

			E1000_I2CCMD_SFP_DATA_ADDR(E1000_SFF_ETH_FLAGS_OFFSET),

			(u8 *)eth_flags);

	if (ret_val != 0)

		goto out;



	/* Check if there is some SFP module plugged and powered */

	if ((tranceiver_type == E1000_SFF_IDENTIFIER_SFP) ||

	    (tranceiver_type == E1000_SFF_IDENTIFIER_SFF)) {

		dev_spec->module_plugged = true;

		if (eth_flags->e1000_base_lx || eth_flags->e1000_base_sx) {

			hw->phy.media_type = e1000_media_type_internal_serdes;

		} else if (eth_flags->e100_base_fx) {

			dev_spec->sgmii_active = true;

			hw->phy.media_type = e1000_media_type_internal_serdes;

		} else if (eth_flags->e1000_base_t) {

			dev_spec->sgmii_active = true;

			hw->phy.media_type = e1000_media_type_copper;

		} else {

			hw->phy.media_type = e1000_media_type_unknown;

			hw_dbg("PHY module has not been recognized\n");

			goto out;

		}

	} else {

		hw->phy.media_type = e1000_media_type_unknown;

	}

	ret_val = 0;

out:

	/* Restore I2C interface setting */

	wr32(E1000_CTRL_EXT, ctrl_ext);

	return ret_val;

}



static s32 igb_get_invariants_82575(struct e1000_hw *hw)

{

	struct e1000_mac_info *mac = &hw->mac;

	struct e1000_dev_spec_82575 * dev_spec = &hw->dev_spec._82575;

	s32 ret_val;

	u32 ctrl_ext = 0;

	u32 link_mode = 0;



	switch (hw->device_id) {

	case E1000_DEV_ID_82575EB_COPPER:
@@ -470,15 +540,55 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 
	 */

	hw->phy.media_type = e1000_media_type_copper;

	dev_spec->sgmii_active = false;

	dev_spec->module_plugged = false;



	ctrl_ext = rd32(E1000_CTRL_EXT);

	switch (ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK) {



	link_mode = ctrl_ext & E1000_CTRL_EXT_LINK_MODE_MASK;

	switch (link_mode) {

	case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX:

		hw->phy.media_type = e1000_media_type_internal_serdes;

		break;

	case E1000_CTRL_EXT_LINK_MODE_SGMII:

		/* Get phy control interface type set (MDIO vs. I2C)*/

		if (igb_sgmii_uses_mdio_82575(hw)) {

			hw->phy.media_type = e1000_media_type_copper;

			dev_spec->sgmii_active = true;

			break;

	case E1000_CTRL_EXT_LINK_MODE_1000BASE_KX:

		}

		/* fall through for I2C based SGMII */

	case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES:

		/* read media type from SFP EEPROM */

		ret_val = igb_set_sfp_media_type_82575(hw);

		if ((ret_val != 0) ||

		    (hw->phy.media_type == e1000_media_type_unknown)) {

			/* If media type was not identified then return media

			 * type defined by the CTRL_EXT settings.

			 */

			hw->phy.media_type = e1000_media_type_internal_serdes;



			if (link_mode == E1000_CTRL_EXT_LINK_MODE_SGMII) {

				hw->phy.media_type = e1000_media_type_copper;

				dev_spec->sgmii_active = true;

			}



			break;

		}



		/* do not change link mode for 100BaseFX */

		if (dev_spec->eth_flags.e100_base_fx)

			break;



		/* change current link mode setting */

		ctrl_ext &= ~E1000_CTRL_EXT_LINK_MODE_MASK;



		if (hw->phy.media_type == e1000_media_type_copper)

			ctrl_ext |= E1000_CTRL_EXT_LINK_MODE_SGMII;

		else

			ctrl_ext |= E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES;



		wr32(E1000_CTRL_EXT, ctrl_ext);



		break;

	default:

		break;

drivers/net/ethernet/intel/igb/e1000_defines.h

+20 −16
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#define E1000_I2CCMD_OPCODE_WRITE	0x00000000

#define E1000_I2CCMD_READY		0x20000000

#define E1000_I2CCMD_ERROR		0x80000000

#define E1000_I2CCMD_SFP_DATA_ADDR(a)	(0x0000 + (a))

#define E1000_I2CCMD_SFP_DIAG_ADDR(a)	(0x0100 + (a))

#define E1000_MAX_SGMII_PHY_REG_ADDR	255

#define E1000_I2CCMD_PHY_TIMEOUT	200

#define E1000_IVAR_VALID		0x80
@@ -272,6 +274,8 @@ 
/* LED Control */

#define E1000_LEDCTL_LED0_MODE_SHIFT	0

#define E1000_LEDCTL_LED0_BLINK		0x00000080

#define E1000_LEDCTL_LED0_MODE_MASK	0x0000000F

#define E1000_LEDCTL_LED0_IVRT		0x00000040



#define E1000_LEDCTL_MODE_LED_ON        0xE

#define E1000_LEDCTL_MODE_LED_OFF       0xF