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

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

Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2018-01-09

This series contains updates to ixgbe and ixgbevf only.

Emil fixes an issue with "wake on LAN"(WoL) where we need to ensure we
enable the reception of multicast packets so that WoL works for IPv6
magic packets.  Cleaned up code no longer needed with the update to
adaptive ITR.

Paul update the driver to advertise the highest capable link speed
when a module gets inserted.  Also extended the displaying of firmware
version to include the iSCSI and OEM block in the EEPROM to better
identify firmware versions/images.

Tonghao Zhang cleans up a code comment that no longer applies since
InterruptThrottleRate has been removed from the driver.

Alex fixes SR-IOV and MACVLAN offload interaction, where the MACVLAN
offload was incorrectly configuring several filters with the wrong
pool value which resulted in MACLVAN interfaces not being able to
receive traffic that had to pass over the physical interface.  Fixed
transmit hangs and dropped receive frames when the number of VFs
changed.  Added support for RSS on MACVLAN pools for X550 devices.
Fixed up the MACVLAN limitations so we can now support 63 offloaded
devices.  Cleaned up MACVLAN code that is no longer needed with the
recent changes and fixes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61ad6408 68ae7424

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+4 −6
Original line number Diff line number Diff line
@@ -333,7 +333,6 @@ struct ixgbe_ring { 
	struct net_device *netdev;	/* netdev ring belongs to */

	struct bpf_prog *xdp_prog;

	struct device *dev;		/* device for DMA mapping */

	struct ixgbe_fwd_adapter *l2_accel_priv;

	void *desc;			/* descriptor ring memory */

	union {

		struct ixgbe_tx_buffer *tx_buffer_info;
@@ -397,8 +396,7 @@ enum ixgbe_ring_f_enum { 
#define MAX_XDP_QUEUES			(IXGBE_MAX_FDIR_INDICES + 1)

#define IXGBE_MAX_L2A_QUEUES		4

#define IXGBE_BAD_L2A_QUEUE		3

#define IXGBE_MAX_MACVLANS		31

#define IXGBE_MAX_DCBMACVLANS		8

#define IXGBE_MAX_MACVLANS		63



struct ixgbe_ring_feature {

	u16 limit;	/* upper limit on feature indices */
@@ -723,8 +721,7 @@ struct ixgbe_adapter { 


	u16 bridge_mode;



	u16 eeprom_verh;

	u16 eeprom_verl;

	char eeprom_id[NVM_VER_SIZE];

	u16 eeprom_cap;



	u32 interrupt_event;
@@ -768,7 +765,8 @@ struct ixgbe_adapter { 
#endif /*CONFIG_DEBUG_FS*/



	u8 default_up;

	unsigned long fwd_bitmask; /* Bitmask indicating in use pools */

	/* Bitmask indicating in use pools */

	DECLARE_BITMAP(fwd_bitmask, IXGBE_MAX_MACVLANS + 1);



#define IXGBE_MAX_LINK_HANDLE 10

	struct ixgbe_jump_table *jump_tables[IXGBE_MAX_LINK_HANDLE];

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+112 −0
Original line number Diff line number Diff line
@@ -4028,6 +4028,118 @@ s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw) 
	return 0;

}



/**

 *  ixgbe_get_orom_version - Return option ROM from EEPROM

 *

 *  @hw: pointer to hardware structure

 *  @nvm_ver: pointer to output structure

 *

 *  if valid option ROM version, nvm_ver->or_valid set to true

 *  else nvm_ver->or_valid is false.

 **/

void ixgbe_get_orom_version(struct ixgbe_hw *hw,

			    struct ixgbe_nvm_version *nvm_ver)

{

	u16 offset, eeprom_cfg_blkh, eeprom_cfg_blkl;



	nvm_ver->or_valid = false;

	/* Option Rom may or may not be present.  Start with pointer */

	hw->eeprom.ops.read(hw, NVM_OROM_OFFSET, &offset);



	/* make sure offset is valid */

	if (offset == 0x0 || offset == NVM_INVALID_PTR)

		return;



	hw->eeprom.ops.read(hw, offset + NVM_OROM_BLK_HI, &eeprom_cfg_blkh);

	hw->eeprom.ops.read(hw, offset + NVM_OROM_BLK_LOW, &eeprom_cfg_blkl);



	/* option rom exists and is valid */

	if ((eeprom_cfg_blkl | eeprom_cfg_blkh) == 0x0 ||

	    eeprom_cfg_blkl == NVM_VER_INVALID ||

	    eeprom_cfg_blkh == NVM_VER_INVALID)

		return;



	nvm_ver->or_valid = true;

	nvm_ver->or_major = eeprom_cfg_blkl >> NVM_OROM_SHIFT;

	nvm_ver->or_build = (eeprom_cfg_blkl << NVM_OROM_SHIFT) |

			    (eeprom_cfg_blkh >> NVM_OROM_SHIFT);

	nvm_ver->or_patch = eeprom_cfg_blkh & NVM_OROM_PATCH_MASK;

}



/**

 *  ixgbe_get_oem_prod_version Etrack ID from EEPROM

 *

 *  @hw: pointer to hardware structure

 *  @nvm_ver: pointer to output structure

 *

 *  if valid OEM product version, nvm_ver->oem_valid set to true

 *  else nvm_ver->oem_valid is false.

 **/

void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw,

				struct ixgbe_nvm_version *nvm_ver)

{

	u16 rel_num, prod_ver, mod_len, cap, offset;



	nvm_ver->oem_valid = false;

	hw->eeprom.ops.read(hw, NVM_OEM_PROD_VER_PTR, &offset);



	/* Return is offset to OEM Product Version block is invalid */

	if (offset == 0x0 && offset == NVM_INVALID_PTR)

		return;



	/* Read product version block */

	hw->eeprom.ops.read(hw, offset, &mod_len);

	hw->eeprom.ops.read(hw, offset + NVM_OEM_PROD_VER_CAP_OFF, &cap);



	/* Return if OEM product version block is invalid */

	if (mod_len != NVM_OEM_PROD_VER_MOD_LEN ||

	    (cap & NVM_OEM_PROD_VER_CAP_MASK) != 0x0)

		return;



	hw->eeprom.ops.read(hw, offset + NVM_OEM_PROD_VER_OFF_L, &prod_ver);

	hw->eeprom.ops.read(hw, offset + NVM_OEM_PROD_VER_OFF_H, &rel_num);



	/* Return if version is invalid */

	if ((rel_num | prod_ver) == 0x0 ||

	    rel_num == NVM_VER_INVALID || prod_ver == NVM_VER_INVALID)

		return;



	nvm_ver->oem_major = prod_ver >> NVM_VER_SHIFT;

	nvm_ver->oem_minor = prod_ver & NVM_VER_MASK;

	nvm_ver->oem_release = rel_num;

	nvm_ver->oem_valid = true;

}



/**

 *  ixgbe_get_etk_id - Return Etrack ID from EEPROM

 *

 *  @hw: pointer to hardware structure

 *  @nvm_ver: pointer to output structure

 *

 *  word read errors will return 0xFFFF

 **/

void ixgbe_get_etk_id(struct ixgbe_hw *hw,

		      struct ixgbe_nvm_version *nvm_ver)

{

	u16 etk_id_l, etk_id_h;



	if (hw->eeprom.ops.read(hw, NVM_ETK_OFF_LOW, &etk_id_l))

		etk_id_l = NVM_VER_INVALID;

	if (hw->eeprom.ops.read(hw, NVM_ETK_OFF_HI, &etk_id_h))

		etk_id_h = NVM_VER_INVALID;



	/* The word order for the version format is determined by high order

	 * word bit 15.

	 */

	if ((etk_id_h & NVM_ETK_VALID) == 0) {

		nvm_ver->etk_id = etk_id_h;

		nvm_ver->etk_id |= (etk_id_l << NVM_ETK_SHIFT);

	} else {

		nvm_ver->etk_id = etk_id_l;

		nvm_ver->etk_id |= (etk_id_h << NVM_ETK_SHIFT);

	}

}



void ixgbe_disable_rx_generic(struct ixgbe_hw *hw)

{

	u32 rxctrl;

drivers/net/ethernet/intel/ixgbe/ixgbe_common.h

+6 −0
Original line number Diff line number Diff line
@@ -139,6 +139,12 @@ extern const u32 ixgbe_mvals_8259X[IXGBE_MVALS_IDX_LIMIT]; 


s32 ixgbe_get_thermal_sensor_data_generic(struct ixgbe_hw *hw);

s32 ixgbe_init_thermal_sensor_thresh_generic(struct ixgbe_hw *hw);

void ixgbe_get_etk_id(struct ixgbe_hw *hw,

		      struct ixgbe_nvm_version *nvm_ver);

void ixgbe_get_oem_prod_version(struct ixgbe_hw *hw,

				struct ixgbe_nvm_version *nvm_ver);

void ixgbe_get_orom_version(struct ixgbe_hw *hw,

			    struct ixgbe_nvm_version *nvm_ver);

void ixgbe_disable_rx_generic(struct ixgbe_hw *hw);

void ixgbe_enable_rx_generic(struct ixgbe_hw *hw);

s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+2 −5
Original line number Diff line number Diff line
@@ -1014,16 +1014,13 @@ static void ixgbe_get_drvinfo(struct net_device *netdev, 
			      struct ethtool_drvinfo *drvinfo)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	u32 nvm_track_id;



	strlcpy(drvinfo->driver, ixgbe_driver_name, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, ixgbe_driver_version,

		sizeof(drvinfo->version));



	nvm_track_id = (adapter->eeprom_verh << 16) |

			adapter->eeprom_verl;

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "0x%08x",

		 nvm_track_id);

	strlcpy(drvinfo->fw_version, adapter->eeprom_id,

		sizeof(drvinfo->fw_version));



	strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),

		sizeof(drvinfo->bus_info));

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+2 −5
Original line number Diff line number Diff line
@@ -1034,11 +1034,8 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev, 
		 ixgbe_driver_name,

		 ixgbe_driver_version);

	/* Firmware Version */

	snprintf(info->firmware_version,

		 sizeof(info->firmware_version),

		 "0x%08x",

		 (adapter->eeprom_verh << 16) |

		  adapter->eeprom_verl);

	strlcpy(info->firmware_version, adapter->eeprom_id,

		sizeof(info->firmware_version));



	/* Model */

	if (hw->mac.type == ixgbe_mac_82599EB) {