Commit 4460985f 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 2020-01-03

This series contains updates to the ice driver only.

Brett adds support for UDP segmentation offload (USO) based on the work
Alex Duyck did for other Intel drivers. Refactored how the VF sets
spoof checking to resolve a couple of issues found in
ice_set_vf_spoofchk().  Adds the ability to track of the dflt_vsI
(default VSI), since we cannot have more than one default VSI.  Add a
macro for commonly used "for loop" used repeatedly in the code.  Cleaned
up and made the VF link flows all similar.  Refactor the flows of adding
and deleting MAC addresses in order to simplify the logic for error
conditions and setting/clearing the VF's default MAC address field.

Michal moves the setting of the default ITR value from ice_cfg_itr() to
the function we allocate queue vectors.  Adds support for saving and
restoring the ITR value for each queue.  Adds a check for all invalid
or unused parameters to log the information and return an error.

Vignesh cleans up the driver where we were trying to write to read-only
registers for the receive flex descriptors.

Tony changes a netdev_info() to netdev_dbg() when the MTU value is
changed.

Bruce suppresses a coverity reported error that was not really an error
by adding a code comment.

Mitch adds a check for a NULL receive descriptor to resolve a coverity
reported issue.

Krzysztof prevents a potential general protection fault by adding a
boundary check to see if the queue id is greater than the size of a UMEM
array.  Adds additional code comments to assist coverity in its scans to
prevent false positives.

Jake adds support for E822 devices to the driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3c85efb8 5d9e618c

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

+6 −2
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ struct ice_sw { 
	struct ice_pf *pf;

	u16 sw_id;		/* switch ID for this switch */

	u16 bridge_mode;	/* VEB/VEPA/Port Virtualizer */

	struct ice_vsi *dflt_vsi;	/* default VSI for this switch */

	u8 dflt_vsi_ena:1;	/* true if above dflt_vsi is enabled */

};



enum ice_state {
@@ -275,6 +277,7 @@ struct ice_vsi { 
	u8 current_isup:1;		 /* Sync 'link up' logging */

	u8 stat_offsets_loaded:1;

	u8 vlan_ena:1;

	u16 num_vlan;



	/* queue information */

	u8 tx_mapping_mode;		 /* ICE_MAP_MODE_[CONTIG|SCATTER] */
@@ -462,12 +465,13 @@ static inline void ice_set_ring_xdp(struct ice_ring *ring) 
static inline struct xdp_umem *ice_xsk_umem(struct ice_ring *ring)

{

	struct xdp_umem **umems = ring->vsi->xsk_umems;

	int qid = ring->q_index;

	u16 qid = ring->q_index;



	if (ice_ring_is_xdp(ring))

		qid -= ring->vsi->num_xdp_txq;



	if (!umems || !umems[qid] || !ice_is_xdp_ena_vsi(ring->vsi))

	if (qid >= ring->vsi->num_xsk_umems || !umems || !umems[qid] ||

	    !ice_is_xdp_ena_vsi(ring->vsi))

		return NULL;



	return umems[qid];

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

+7 −9
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ static int ice_pf_rxq_wait(struct ice_pf *pf, int pf_q, bool ena) 
 * @vsi: the VSI being configured

 * @v_idx: index of the vector in the VSI struct

 *

 * We allocate one q_vector. If allocation fails we return -ENOMEM.

 * We allocate one q_vector and set default value for ITR setting associated

 * with this q_vector. If allocation fails we return -ENOMEM.

 */

static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, int v_idx)

{
@@ -108,6 +109,8 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, int v_idx) 


	q_vector->vsi = vsi;

	q_vector->v_idx = v_idx;

	q_vector->tx.itr_setting = ICE_DFLT_TX_ITR;

	q_vector->rx.itr_setting = ICE_DFLT_RX_ITR;

	if (vsi->type == ICE_VSI_VF)

		goto out;

	/* only set affinity_mask if the CPU is online */
@@ -299,6 +302,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 


	if (ring->vsi->type == ICE_VSI_PF) {

		if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))

			/* coverity[check_return] */

			xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,

					 ring->q_index);
@@ -323,7 +327,9 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
			dev_info(&vsi->back->pdev->dev, "Registered XDP mem model MEM_TYPE_ZERO_COPY on Rx ring %d\n",

				 ring->q_index);

		} else {

			ring->zca.free = NULL;

			if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))

				/* coverity[check_return] */

				xdp_rxq_info_reg(&ring->xdp_rxq,

						 ring->netdev,

						 ring->q_index);
@@ -674,10 +680,6 @@ void ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector) 
	if (q_vector->num_ring_rx) {

		struct ice_ring_container *rc = &q_vector->rx;



		/* if this value is set then don't overwrite with default */

		if (!rc->itr_setting)

			rc->itr_setting = ICE_DFLT_RX_ITR;



		rc->target_itr = ITR_TO_REG(rc->itr_setting);

		rc->next_update = jiffies + 1;

		rc->current_itr = rc->target_itr;
@@ -688,10 +690,6 @@ void ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector) 
	if (q_vector->num_ring_tx) {

		struct ice_ring_container *rc = &q_vector->tx;



		/* if this value is set then don't overwrite with default */

		if (!rc->itr_setting)

			rc->itr_setting = ICE_DFLT_TX_ITR;



		rc->target_itr = ITR_TO_REG(rc->itr_setting);

		rc->next_update = jiffies + 1;

		rc->current_itr = rc->target_itr;

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

+0 −104
Original line number Diff line number Diff line
@@ -7,25 +7,6 @@ 


#define ICE_PF_RESET_WAIT_COUNT	200



#define ICE_PROG_FLEX_ENTRY(hw, rxdid, mdid, idx) \

	wr32((hw), GLFLXP_RXDID_FLX_WRD_##idx(rxdid), \

	     ((ICE_RX_OPC_MDID << \

	       GLFLXP_RXDID_FLX_WRD_##idx##_RXDID_OPCODE_S) & \

	      GLFLXP_RXDID_FLX_WRD_##idx##_RXDID_OPCODE_M) | \

	     (((mdid) << GLFLXP_RXDID_FLX_WRD_##idx##_PROT_MDID_S) & \

	      GLFLXP_RXDID_FLX_WRD_##idx##_PROT_MDID_M))



#define ICE_PROG_FLG_ENTRY(hw, rxdid, flg_0, flg_1, flg_2, flg_3, idx) \

	wr32((hw), GLFLXP_RXDID_FLAGS(rxdid, idx), \

	     (((flg_0) << GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_S) & \

	      GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_M) | \

	     (((flg_1) << GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_1_S) & \

	      GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_1_M) | \

	     (((flg_2) << GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_2_S) & \

	      GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_2_M) | \

	     (((flg_3) << GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_3_S) & \

	      GLFLXP_RXDID_FLAGS_FLEXIFLAG_4N_3_M))



/**

 * ice_set_mac_type - Sets MAC type

 * @hw: pointer to the HW structure
@@ -347,88 +328,6 @@ ice_aq_get_link_info(struct ice_port_info *pi, bool ena_lse, 
	return 0;

}



/**

 * ice_init_flex_flags

 * @hw: pointer to the hardware structure

 * @prof_id: Rx Descriptor Builder profile ID

 *

 * Function to initialize Rx flex flags

 */

static void ice_init_flex_flags(struct ice_hw *hw, enum ice_rxdid prof_id)

{

	u8 idx = 0;



	/* Flex-flag fields (0-2) are programmed with FLG64 bits with layout:

	 * flexiflags0[5:0] - TCP flags, is_packet_fragmented, is_packet_UDP_GRE

	 * flexiflags1[3:0] - Not used for flag programming

	 * flexiflags2[7:0] - Tunnel and VLAN types

	 * 2 invalid fields in last index

	 */

	switch (prof_id) {

	/* Rx flex flags are currently programmed for the NIC profiles only.

	 * Different flag bit programming configurations can be added per

	 * profile as needed.

	 */

	case ICE_RXDID_FLEX_NIC:

	case ICE_RXDID_FLEX_NIC_2:

		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_PKT_FRG,

				   ICE_FLG_UDP_GRE, ICE_FLG_PKT_DSI,

				   ICE_FLG_FIN, idx++);

		/* flex flag 1 is not used for flexi-flag programming, skipping

		 * these four FLG64 bits.

		 */

		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_SYN, ICE_FLG_RST,

				   ICE_FLG_PKT_DSI, ICE_FLG_PKT_DSI, idx++);

		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_PKT_DSI,

				   ICE_FLG_PKT_DSI, ICE_FLG_EVLAN_x8100,

				   ICE_FLG_EVLAN_x9100, idx++);

		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_VLAN_x8100,

				   ICE_FLG_TNL_VLAN, ICE_FLG_TNL_MAC,

				   ICE_FLG_TNL0, idx++);

		ICE_PROG_FLG_ENTRY(hw, prof_id, ICE_FLG_TNL1, ICE_FLG_TNL2,

				   ICE_FLG_PKT_DSI, ICE_FLG_PKT_DSI, idx);

		break;



	default:

		ice_debug(hw, ICE_DBG_INIT,

			  "Flag programming for profile ID %d not supported\n",

			  prof_id);

	}

}



/**

 * ice_init_flex_flds

 * @hw: pointer to the hardware structure

 * @prof_id: Rx Descriptor Builder profile ID

 *

 * Function to initialize flex descriptors

 */

static void ice_init_flex_flds(struct ice_hw *hw, enum ice_rxdid prof_id)

{

	enum ice_flex_rx_mdid mdid;



	switch (prof_id) {

	case ICE_RXDID_FLEX_NIC:

	case ICE_RXDID_FLEX_NIC_2:

		ICE_PROG_FLEX_ENTRY(hw, prof_id, ICE_RX_MDID_HASH_LOW, 0);

		ICE_PROG_FLEX_ENTRY(hw, prof_id, ICE_RX_MDID_HASH_HIGH, 1);

		ICE_PROG_FLEX_ENTRY(hw, prof_id, ICE_RX_MDID_FLOW_ID_LOWER, 2);



		mdid = (prof_id == ICE_RXDID_FLEX_NIC_2) ?

			ICE_RX_MDID_SRC_VSI : ICE_RX_MDID_FLOW_ID_HIGH;



		ICE_PROG_FLEX_ENTRY(hw, prof_id, mdid, 3);



		ice_init_flex_flags(hw, prof_id);

		break;



	default:

		ice_debug(hw, ICE_DBG_INIT,

			  "Field init for profile ID %d not supported\n",

			  prof_id);

	}

}



/**

 * ice_init_fltr_mgmt_struct - initializes filter management list and locks

 * @hw: pointer to the HW struct
@@ -882,9 +781,6 @@ enum ice_status ice_init_hw(struct ice_hw *hw) 


	if (status)

		goto err_unroll_fltr_mgmt_struct;



	ice_init_flex_flds(hw, ICE_RXDID_FLEX_NIC);

	ice_init_flex_flds(hw, ICE_RXDID_FLEX_NIC_2);

	status = ice_init_hw_tbls(hw);

	if (status)

		goto err_unroll_fltr_mgmt_struct;

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

+6 −0
Original line number Diff line number Diff line
@@ -396,6 +396,12 @@ dcb_error: 
	prev_cfg->etscfg.tcbwtable[0] = ICE_TC_MAX_BW;

	prev_cfg->etscfg.tsatable[0] = ICE_IEEE_TSA_ETS;

	memcpy(&prev_cfg->etsrec, &prev_cfg->etscfg, sizeof(prev_cfg->etsrec));

	/* Coverity warns the return code of ice_pf_dcb_cfg() is not checked

	 * here as is done for other calls to that function. That check is

	 * not necessary since this is in this function's error cleanup path.

	 * Suppress the Coverity warning with the following comment...

	 */

	/* coverity[check_return] */

	ice_pf_dcb_cfg(pf, prev_cfg, false);

	kfree(prev_cfg);

}

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

+18 −0
Original line number Diff line number Diff line
@@ -11,5 +11,23 @@ 
#define ICE_DEV_ID_E810C_QSFP		0x1592

/* Intel(R) Ethernet Controller E810-C for SFP */

#define ICE_DEV_ID_E810C_SFP		0x1593

/* Intel(R) Ethernet Connection E822-C for backplane */

#define ICE_DEV_ID_E822C_BACKPLANE	0x1890

/* Intel(R) Ethernet Connection E822-C for QSFP */

#define ICE_DEV_ID_E822C_QSFP		0x1891

/* Intel(R) Ethernet Connection E822-C for SFP */

#define ICE_DEV_ID_E822C_SFP		0x1892

/* Intel(R) Ethernet Connection E822-C/X557-AT 10GBASE-T */

#define ICE_DEV_ID_E822C_10G_BASE_T	0x1893

/* Intel(R) Ethernet Connection E822-C 1GbE */

#define ICE_DEV_ID_E822C_SGMII		0x1894

/* Intel(R) Ethernet Connection E822-X for backplane */

#define ICE_DEV_ID_E822X_BACKPLANE	0x1897

/* Intel(R) Ethernet Connection E822-L for SFP */

#define ICE_DEV_ID_E822L_SFP		0x1898

/* Intel(R) Ethernet Connection E822-L/X557-AT 10GBASE-T */

#define ICE_DEV_ID_E822L_10G_BASE_T	0x1899

/* Intel(R) Ethernet Connection E822-L 1GbE */

#define ICE_DEV_ID_E822L_SGMII		0x189A



#endif /* _ICE_DEVIDS_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE