Commit b5b6b6ba authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-12-08

Yahui adds re-initialization of Flow Director for VF reset.

Paul restores interrupts when enabling VFs.

Dave re-adds bandwidth check for DCBNL and moves DSCP mode check
earlier in the function.

Jesse prevents reporting of dropped packets that occur during
initialization and fixes reporting of statistics which could occur with
frequent reads.

Michal corrects setting of protocol type for UDP header and fixes lack
of differentiation when adding filters for tunnels.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  ice: safer stats processing
  ice: fix adding different tunnels
  ice: fix choosing UDP header type
  ice: ignore dropped packets during init
  ice: Fix problems with DSCP QoS implementation
  ice: rearm other interrupt cause register after enabling VFs
  ice: fix FDIR init missing when reset VF
====================

Link: https://lore.kernel.org/r/20211208211144.2629867-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6efcdadc 1a0f25a5

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

+12 −6
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ static int ice_dcbnl_setets(struct net_device *netdev, struct ieee_ets *ets) 


	new_cfg->etscfg.maxtcs = pf->hw.func_caps.common_cap.maxtc;



	if (!bwcfg)

		new_cfg->etscfg.tcbwtable[0] = 100;



	if (!bwrec)

		new_cfg->etsrec.tcbwtable[0] = 100;
@@ -167,15 +170,18 @@ static u8 ice_dcbnl_setdcbx(struct net_device *netdev, u8 mode) 
	if (mode == pf->dcbx_cap)

		return ICE_DCB_NO_HW_CHG;



	pf->dcbx_cap = mode;

	qos_cfg = &pf->hw.port_info->qos_cfg;

	if (mode & DCB_CAP_DCBX_VER_CEE) {



	/* DSCP configuration is not DCBx negotiated */

	if (qos_cfg->local_dcbx_cfg.pfc_mode == ICE_QOS_MODE_DSCP)

		return ICE_DCB_NO_HW_CHG;



	pf->dcbx_cap = mode;



	if (mode & DCB_CAP_DCBX_VER_CEE)

		qos_cfg->local_dcbx_cfg.dcbx_mode = ICE_DCBX_MODE_CEE;

	} else {

	else

		qos_cfg->local_dcbx_cfg.dcbx_mode = ICE_DCBX_MODE_IEEE;

	}



	dev_info(ice_pf_to_dev(pf), "DCBx mode = 0x%x\n", mode);

	return ICE_DCB_HW_CHG_RST;

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

+2 −2
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ ice_fdir_write_all_fltr(struct ice_pf *pf, struct ice_fdir_fltr *input, 
		bool is_tun = tun == ICE_FD_HW_SEG_TUN;

		int err;



		if (is_tun && !ice_get_open_tunnel_port(&pf->hw, &port_num))

		if (is_tun && !ice_get_open_tunnel_port(&pf->hw, &port_num, TNL_ALL))

			continue;

		err = ice_fdir_write_fltr(pf, input, add, is_tun);

		if (err)
@@ -1652,7 +1652,7 @@ int ice_add_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd) 
	}



	/* return error if not an update and no available filters */

	fltrs_needed = ice_get_open_tunnel_port(hw, &tunnel_port) ? 2 : 1;

	fltrs_needed = ice_get_open_tunnel_port(hw, &tunnel_port, TNL_ALL) ? 2 : 1;

	if (!ice_fdir_find_fltr_by_idx(hw, fsp->location) &&

	    ice_fdir_num_avail_fltr(hw, pf->vsi[vsi->idx]) < fltrs_needed) {

		dev_err(dev, "Failed to add filter.  The maximum number of flow director filters has been reached.\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input, 
		memcpy(pkt, ice_fdir_pkt[idx].pkt, ice_fdir_pkt[idx].pkt_len);

		loc = pkt;

	} else {

		if (!ice_get_open_tunnel_port(hw, &tnl_port))

		if (!ice_get_open_tunnel_port(hw, &tnl_port, TNL_ALL))

			return ICE_ERR_DOES_NOT_EXIST;

		if (!ice_fdir_pkt[idx].tun_pkt)

			return ICE_ERR_PARAM;

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

+5 −2
Original line number Diff line number Diff line
@@ -1899,9 +1899,11 @@ static struct ice_buf *ice_pkg_buf(struct ice_buf_build *bld) 
 * ice_get_open_tunnel_port - retrieve an open tunnel port

 * @hw: pointer to the HW structure

 * @port: returns open port

 * @type: type of tunnel, can be TNL_LAST if it doesn't matter

 */

bool

ice_get_open_tunnel_port(struct ice_hw *hw, u16 *port)

ice_get_open_tunnel_port(struct ice_hw *hw, u16 *port,

			 enum ice_tunnel_type type)

{

	bool res = false;

	u16 i;
@@ -1909,7 +1911,8 @@ ice_get_open_tunnel_port(struct ice_hw *hw, u16 *port) 
	mutex_lock(&hw->tnl_lock);



	for (i = 0; i < hw->tnl.count && i < ICE_TUNNEL_MAX_ENTRIES; i++)

		if (hw->tnl.tbl[i].valid && hw->tnl.tbl[i].port) {

		if (hw->tnl.tbl[i].valid && hw->tnl.tbl[i].port &&

		    (type == TNL_LAST || type == hw->tnl.tbl[i].type)) {

			*port = hw->tnl.tbl[i].port;

			res = true;

			break;

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

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ enum ice_status 
ice_get_sw_fv_list(struct ice_hw *hw, u8 *prot_ids, u16 ids_cnt,

		   unsigned long *bm, struct list_head *fv_list);

bool

ice_get_open_tunnel_port(struct ice_hw *hw, u16 *port);

ice_get_open_tunnel_port(struct ice_hw *hw, u16 *port,

			 enum ice_tunnel_type type);

int ice_udp_tunnel_set_port(struct net_device *netdev, unsigned int table,

			    unsigned int idx, struct udp_tunnel_info *ti);

int ice_udp_tunnel_unset_port(struct net_device *netdev, unsigned int table,