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

Commit 56a9a9e7 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-05-17

This series contains updates to ixgbe, ixgbevf and ice drivers.

Cathy Zhou resolves sparse warnings by using the force attribute.

Mauro S M Rodrigues fixes a bug where IRQs were not freed if a PCI error
recovery system opts to remove the device which causes
ixgbe_io_error_detected() to return PCI_ERS_RESULT_DISCONNECT before
calling ixgbe_close_suspend() which results in IRQs not freed and
crashing when the remove handler calls pci_disable_device().  Resolved
this by calling ixgbe_close_suspend() before evaluating the PCI channel
state.

Pavel Tatashin releases the rtnl_lock during the call to
ixgbe_close_suspend() to allow scaling if device_shutdown() is
multi-threaded.

Emil modifies ixgbe to not validate the MAC address during a reset,
unless the MAC was set on the host so that the VF will get a new MAC
address every time it reloads.  Also updates ixgbevf to set
hw->mac.perm_addr in order to retain the custom MAC on a reset.

Anirudh updates the ice NVM read/erase/update AQ commands to align with
the latest specification.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7c5995b3 43c89b16

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+7 −6
Original line number Diff line number Diff line
@@ -1049,6 +1049,8 @@ struct ice_aqc_set_event_mask { 
 * NVM Update commands (indirect 0x0703)

 */

struct ice_aqc_nvm {

	__le16 offset_low;

	u8 offset_high;

	u8 cmd_flags;

#define ICE_AQC_NVM_LAST_CMD		BIT(0)

#define ICE_AQC_NVM_PCIR_REQ		BIT(0)	/* Used by NVM Update reply */
@@ -1058,10 +1060,9 @@ struct ice_aqc_nvm { 
#define ICE_AQC_NVM_PRESERVE_ALL	BIT(1)

#define ICE_AQC_NVM_PRESERVE_SELECTED	(3 << CSR_AQ_NVM_PRESERVATION_S)

#define ICE_AQC_NVM_FLASH_ONLY		BIT(7)

	u8	module_typeid;

	__le16 module_typeid;

	__le16 length;

#define ICE_AQC_NVM_ERASE_LEN	0xFFFF

	__le32	offset;

	__le32 addr_high;

	__le32 addr_low;

};

drivers/net/ethernet/intel/ice/ice_nvm.c

+4 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 * Read the NVM using the admin queue commands (0x0701)

 */

static enum ice_status

ice_aq_read_nvm(struct ice_hw *hw, u8 module_typeid, u32 offset, u16 length,

ice_aq_read_nvm(struct ice_hw *hw, u16 module_typeid, u32 offset, u16 length,

		void *data, bool last_command, struct ice_sq_cd *cd)

{

	struct ice_aq_desc desc;
@@ -33,8 +33,9 @@ ice_aq_read_nvm(struct ice_hw *hw, u8 module_typeid, u32 offset, u16 length, 
	/* If this is the last command in a series, set the proper flag. */

	if (last_command)

		cmd->cmd_flags |= ICE_AQC_NVM_LAST_CMD;

	cmd->module_typeid = module_typeid;

	cmd->offset = cpu_to_le32(offset);

	cmd->module_typeid = cpu_to_le16(module_typeid);

	cmd->offset_low = cpu_to_le16(offset & 0xFFFF);

	cmd->offset_high = (offset >> 16) & 0xFF;

	cmd->length = cpu_to_le16(length);



	return ice_aq_send_cmd(hw, &desc, data, length, cd);

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

+7 −6
Original line number Diff line number Diff line
@@ -1436,7 +1436,8 @@ void ixgbe_atr_compute_perfect_hash_82599(union ixgbe_atr_input *input, 
{



	u32 hi_hash_dword, lo_hash_dword, flow_vm_vlan;

	u32 bucket_hash = 0, hi_dword = 0;

	u32 bucket_hash = 0;

	__be32 hi_dword = 0;

	int i;



	/* Apply masks to input data */
@@ -1475,7 +1476,7 @@ void ixgbe_atr_compute_perfect_hash_82599(union ixgbe_atr_input *input, 
	 * Limit hash to 13 bits since max bucket count is 8K.

	 * Store result at the end of the input stream.

	 */

	input->formatted.bkt_hash = bucket_hash & 0x1FFF;

	input->formatted.bkt_hash = (__force __be16)(bucket_hash & 0x1FFF);

}



/**
@@ -1584,7 +1585,7 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw, 
		return IXGBE_ERR_CONFIG;

	}



	switch (input_mask->formatted.flex_bytes & 0xFFFF) {

	switch ((__force u16)input_mask->formatted.flex_bytes & 0xFFFF) {

	case 0x0000:

		/* Mask Flex Bytes */

		fdirm |= IXGBE_FDIRM_FLEX;
@@ -1654,13 +1655,13 @@ s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw, 
	IXGBE_WRITE_REG(hw, IXGBE_FDIRPORT, fdirport);



	/* record vlan (little-endian) and flex_bytes(big-endian) */

	fdirvlan = IXGBE_STORE_AS_BE16(input->formatted.flex_bytes);

	fdirvlan = IXGBE_STORE_AS_BE16((__force u16)input->formatted.flex_bytes);

	fdirvlan <<= IXGBE_FDIRVLAN_FLEX_SHIFT;

	fdirvlan |= ntohs(input->formatted.vlan_id);

	IXGBE_WRITE_REG(hw, IXGBE_FDIRVLAN, fdirvlan);



	/* configure FDIRHASH register */

	fdirhash = input->formatted.bkt_hash;

	fdirhash = (__force u32)input->formatted.bkt_hash;

	fdirhash |= soft_id << IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT;

	IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);
@@ -1698,7 +1699,7 @@ s32 ixgbe_fdir_erase_perfect_filter_82599(struct ixgbe_hw *hw, 
	s32 err;



	/* configure FDIRHASH register */

	fdirhash = input->formatted.bkt_hash;

	fdirhash = (__force u32)input->formatted.bkt_hash;

	fdirhash |= soft_id << IXGBE_FDIRHASH_SIG_SW_INDEX_SHIFT;

	IXGBE_WRITE_REG(hw, IXGBE_FDIRHASH, fdirhash);

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

+1 −1
Original line number Diff line number Diff line
@@ -3626,7 +3626,7 @@ s32 ixgbe_hic_unlocked(struct ixgbe_hw *hw, u32 *buffer, u32 length, 
	 */

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

		IXGBE_WRITE_REG_ARRAY(hw, IXGBE_FLEX_MNG,

				      i, cpu_to_le32(buffer[i]));

				      i, (__force u32)cpu_to_le32(buffer[i]));



	/* Setting this bit tells the ARC that a new command is pending. */

	IXGBE_WRITE_REG(hw, IXGBE_HICR, hicr | IXGBE_HICR_C);

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

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter, 
	case cpu_to_le32(IXGBE_RXDADV_STAT_FCSTAT_FCPRSP):

		dma_unmap_sg(&adapter->pdev->dev, ddp->sgl,

			     ddp->sgc, DMA_FROM_DEVICE);

		ddp->err = ddp_err;

		ddp->err = (__force u32)ddp_err;

		ddp->sgl = NULL;

		ddp->sgc = 0;

		/* fall through */