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

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



Jeff Kirsher says:

====================
100GbE Intel Wired LAN Driver Updates 2019-03-26

This series contains more updates to the ice driver only.

Jeremiah provides his first patch to the Linux kernel to clean up
un-necessary newlines in driver log messages.

Mitch updates the ice driver to use existing status codes in the iavf
driver so that when errors occur, it will not report nonsensical
results.  Adds support for VF admin queue interrupts by programming the
VPINT_MBX_CTL register array.

Brett adds a check for a bit that we set while preparing for a reset, to
ensure we are prepared to do a proper reset.  Also implemented PCI error
handling operations.  Went through and audited the hot path with pahole
and made modifications based on the results since 2 structures were
taking up more space than necessary due to cache alignment issues.
Fixed an issue where when flow control was disabled, the state of flow
control was being displayed as "Unknown".

Anirudh fixes adaptive interrupt moderation changes by adding code that
was missed, that should have been added in the initial patch to add that
support.  Cleaned up a function prototype that was never implemented.
Did additional code cleanup by removing unneeded braces and redundant
code comments.

Akeem fixes an issue that occurs when the VF is attempting to remove the
default LAN/MAC address, which is programmed by the administrator by
updating the error message to explicitly say that the VF cannot change
the MAC programmed by the PF.

Preethi fixes the driver to not fall into the error path when a added
filter already exists, but instead continue to process the rest of the
function and add appropriate checks after adding MAC filters.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b0be25c5 64f4b943

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

+13 −7
Original line number Diff line number Diff line
@@ -294,19 +294,25 @@ struct ice_vsi { 
/* struct that defines an interrupt vector */

struct ice_q_vector {

	struct ice_vsi *vsi;

	cpumask_t affinity_mask;

	struct napi_struct napi;

	struct ice_ring_container rx;

	struct ice_ring_container tx;

	struct irq_affinity_notify affinity_notify;



	u16 v_idx;			/* index in the vsi->q_vector array. */

	u8 num_ring_tx;			/* total number of Tx rings in vector */

	u8 num_ring_rx;			/* total number of Rx rings in vector */

	char name[ICE_INT_NAME_STR_LEN];

	u8 num_ring_tx;			/* total number of Tx rings in vector */

	u8 itr_countdown;		/* when 0 should adjust adaptive ITR */

	/* in usecs, need to use ice_intrl_to_usecs_reg() before writing this

	 * value to the device

	 */

	u8 intrl;



	struct napi_struct napi;



	struct ice_ring_container rx;

	struct ice_ring_container tx;



	cpumask_t affinity_mask;

	struct irq_affinity_notify affinity_notify;



	char name[ICE_INT_NAME_STR_LEN];

} ____cacheline_internodealigned_in_smp;



enum ice_pf_flags {

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

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ 
#define VPINT_ALLOC_PCI_LAST_S			12

#define VPINT_ALLOC_PCI_LAST_M			ICE_M(0x7FF, 12)

#define VPINT_ALLOC_PCI_VALID_M			BIT(31)

#define VPINT_MBX_CTL(_VSI)			(0x0016A000 + ((_VSI) * 4))

#define VPINT_MBX_CTL_CAUSE_ENA_M		BIT(30)

#define GLLAN_RCTL_0				0x002941F8

#define QRX_CONTEXT(_i, _QRX)			(0x00280000 + ((_i) * 8192 + (_QRX) * 4))

#define QRX_CTRL(_QRX)				(0x00120000 + ((_QRX) * 4))

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

+6 −6
Original line number Diff line number Diff line
@@ -342,12 +342,12 @@ enum ice_tx_desc_cmd_bits { 
	ICE_TX_DESC_CMD_EOP			= 0x0001,

	ICE_TX_DESC_CMD_RS			= 0x0002,

	ICE_TX_DESC_CMD_IL2TAG1			= 0x0008,

	ICE_TX_DESC_CMD_IIPT_IPV6		= 0x0020, /* 2 BITS */

	ICE_TX_DESC_CMD_IIPT_IPV4		= 0x0040, /* 2 BITS */

	ICE_TX_DESC_CMD_IIPT_IPV4_CSUM		= 0x0060, /* 2 BITS */

	ICE_TX_DESC_CMD_L4T_EOFT_TCP		= 0x0100, /* 2 BITS */

	ICE_TX_DESC_CMD_L4T_EOFT_SCTP		= 0x0200, /* 2 BITS */

	ICE_TX_DESC_CMD_L4T_EOFT_UDP		= 0x0300, /* 2 BITS */

	ICE_TX_DESC_CMD_IIPT_IPV6		= 0x0020,

	ICE_TX_DESC_CMD_IIPT_IPV4		= 0x0040,

	ICE_TX_DESC_CMD_IIPT_IPV4_CSUM		= 0x0060,

	ICE_TX_DESC_CMD_L4T_EOFT_TCP		= 0x0100,

	ICE_TX_DESC_CMD_L4T_EOFT_SCTP		= 0x0200,

	ICE_TX_DESC_CMD_L4T_EOFT_UDP		= 0x0300,

};



#define ICE_TXD_QW1_OFFSET_S	16

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

+3 −6
Original line number Diff line number Diff line
@@ -608,11 +608,10 @@ err_scatter: 


/**

 * __ice_vsi_get_qs - helper function for assigning queues from PF to VSI

 * @qs_cfg: gathered variables needed for PF->VSI queues assignment

 * @qs_cfg: gathered variables needed for pf->vsi queues assignment

 *

 * This is an internal function for assigning queues from the PF to VSI and

 * initially tries to find contiguous space.  If it is not successful to find

 * contiguous space, then it tries with the scatter approach.

 * This function first tries to find contiguous space. If it is not successful,

 * it tries with the scatter approach.

 *

 * Return 0 on success and -ENOMEM in case of no left space in PF queue bitmap

 */
@@ -1820,7 +1819,6 @@ ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector, u16 vector) 
		rc->target_itr = ITR_TO_REG(rc->itr_setting);

		rc->next_update = jiffies + 1;

		rc->current_itr = rc->target_itr;

		rc->latency_range = ICE_LOW_LATENCY;

		wr32(hw, GLINT_ITR(rc->itr_idx, vector),

		     ITR_REG_ALIGN(rc->current_itr) >> ICE_ITR_GRAN_S);

	}
@@ -1835,7 +1833,6 @@ ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector, u16 vector) 
		rc->target_itr = ITR_TO_REG(rc->itr_setting);

		rc->next_update = jiffies + 1;

		rc->current_itr = rc->target_itr;

		rc->latency_range = ICE_LOW_LATENCY;

		wr32(hw, GLINT_ITR(rc->itr_idx, vector),

		     ITR_REG_ALIGN(rc->current_itr) >> ICE_ITR_GRAN_S);

	}

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

+0 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ void ice_vsi_free_rx_rings(struct ice_vsi *vsi); 


void ice_vsi_free_tx_rings(struct ice_vsi *vsi);



int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc);



int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena);



#endif /* !_ICE_LIB_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE