Commit a41cf09b 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 



Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2020-07-29

This series contains updates to the ice driver only.

Dave works around LFC settings not being preserved through link events.
Fixes link issues with GLOBR reset and handling of multiple link events.

Nick restores VF MSI-X after PCI reset.

Kiran corrects the error code returned in ice_aq_sw_rules if the rule
does not exist.

Paul prevents overwriting of user set descriptors.

Tarun adds masking before accessing rate limiting profile types and
corrects queue bandwidth configuration.

Victor modifies Tx queue scheduler distribution to spread more evenly
across queue group nodes.

Krzysztof sets need_wakeup flag for Tx AF_XDP.

Brett allows VLANs in safe mode.

Marcin cleans up VSIs on probe failure.

Bruce reduces the scope of a variable.

Ben removes a FW workaround.

Tony fixes an unused parameter warning.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5ba2254b 6221595f

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

+45 −3
Original line number Diff line number Diff line
@@ -611,8 +611,6 @@ static enum ice_status ice_get_fw_log_cfg(struct ice_hw *hw) 


	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_fw_logging_info);



	desc.flags |= cpu_to_le16(ICE_AQ_FLAG_RD);



	status = ice_aq_send_cmd(hw, &desc, config, size, NULL);

	if (!status) {

		u16 i;
@@ -3907,7 +3905,18 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle, 
	 * Without setting the generic section as valid in valid_sections, the

	 * Admin queue command will fail with error code ICE_AQ_RC_EINVAL.

	 */

	buf->txqs[0].info.valid_sections = ICE_AQC_ELEM_VALID_GENERIC;

	buf->txqs[0].info.valid_sections =

		ICE_AQC_ELEM_VALID_GENERIC | ICE_AQC_ELEM_VALID_CIR |

		ICE_AQC_ELEM_VALID_EIR;

	buf->txqs[0].info.generic = 0;

	buf->txqs[0].info.cir_bw.bw_profile_idx =

		cpu_to_le16(ICE_SCHED_DFLT_RL_PROF_ID);

	buf->txqs[0].info.cir_bw.bw_alloc =

		cpu_to_le16(ICE_SCHED_DFLT_BW_WT);

	buf->txqs[0].info.eir_bw.bw_profile_idx =

		cpu_to_le16(ICE_SCHED_DFLT_RL_PROF_ID);

	buf->txqs[0].info.eir_bw.bw_alloc =

		cpu_to_le16(ICE_SCHED_DFLT_BW_WT);



	/* add the LAN queue */

	status = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd);
@@ -4357,3 +4366,36 @@ bool ice_is_phy_caps_an_enabled(struct ice_aqc_get_phy_caps_data *caps) 


	return false;

}



/**

 * ice_aq_set_lldp_mib - Set the LLDP MIB

 * @hw: pointer to the HW struct

 * @mib_type: Local, Remote or both Local and Remote MIBs

 * @buf: pointer to the caller-supplied buffer to store the MIB block

 * @buf_size: size of the buffer (in bytes)

 * @cd: pointer to command details structure or NULL

 *

 * Set the LLDP MIB. (0x0A08)

 */

enum ice_status

ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size,

		    struct ice_sq_cd *cd)

{

	struct ice_aqc_lldp_set_local_mib *cmd;

	struct ice_aq_desc desc;



	cmd = &desc.params.lldp_set_mib;



	if (buf_size == 0 || !buf)

		return ICE_ERR_PARAM;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_lldp_set_local_mib);



	desc.flags |= cpu_to_le16((u16)ICE_AQ_FLAG_RD);

	desc.datalen = cpu_to_le16(buf_size);



	cmd->type = mib_type;

	cmd->length = cpu_to_le16(buf_size);



	return ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);

}

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

+3 −0
Original line number Diff line number Diff line
@@ -172,4 +172,7 @@ ice_stat_update32(struct ice_hw *hw, u32 reg, bool prev_stat_loaded, 
enum ice_status

ice_sched_query_elem(struct ice_hw *hw, u32 node_teid,

		     struct ice_aqc_txsched_elem_data *buf);

enum ice_status

ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size,

		    struct ice_sq_cd *cd);

#endif /* _ICE_COMMON_H_ */

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

+4 −2
Original line number Diff line number Diff line
@@ -312,9 +312,10 @@ ice_cfg_rq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq) 


#define ICE_FREE_CQ_BUFS(hw, qi, ring)					\

do {									\

	int i;								\

	/* free descriptors */						\

	if ((qi)->ring.r.ring##_bi)					\

	if ((qi)->ring.r.ring##_bi) {					\

		int i;							\

									\

		for (i = 0; i < (qi)->num_##ring##_entries; i++)	\

			if ((qi)->ring.r.ring##_bi[i].pa) {		\

				dmam_free_coherent(ice_hw_to_dev(hw),	\
@@ -325,6 +326,7 @@ do { \ 
					(qi)->ring.r.ring##_bi[i].pa = 0;\

					(qi)->ring.r.ring##_bi[i].size = 0;\

		}							\

	}								\

	/* free the buffer info list */					\

	if ((qi)->ring.cmd_buf)						\

		devm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf);	\

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

+0 −33
Original line number Diff line number Diff line
@@ -134,39 +134,6 @@ ice_aq_start_lldp(struct ice_hw *hw, bool persist, struct ice_sq_cd *cd) 
	return ice_aq_send_cmd(hw, &desc, NULL, 0, cd);

}



/**

 * ice_aq_set_lldp_mib - Set the LLDP MIB

 * @hw: pointer to the HW struct

 * @mib_type: Local, Remote or both Local and Remote MIBs

 * @buf: pointer to the caller-supplied buffer to store the MIB block

 * @buf_size: size of the buffer (in bytes)

 * @cd: pointer to command details structure or NULL

 *

 * Set the LLDP MIB. (0x0A08)

 */

static enum ice_status

ice_aq_set_lldp_mib(struct ice_hw *hw, u8 mib_type, void *buf, u16 buf_size,

		    struct ice_sq_cd *cd)

{

	struct ice_aqc_lldp_set_local_mib *cmd;

	struct ice_aq_desc desc;



	cmd = &desc.params.lldp_set_mib;



	if (buf_size == 0 || !buf)

		return ICE_ERR_PARAM;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_lldp_set_local_mib);



	desc.flags |= cpu_to_le16((u16)ICE_AQ_FLAG_RD);

	desc.datalen = cpu_to_le16(buf_size);



	cmd->type = mib_type;

	cmd->length = cpu_to_le16(buf_size);



	return ice_aq_send_cmd(hw, &desc, buf, buf_size, cd);

}



/**

 * ice_get_dcbx_status

 * @hw: pointer to the HW struct

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

+1 −5
Original line number Diff line number Diff line
@@ -444,10 +444,6 @@ void ice_dcb_rebuild(struct ice_pf *pf) 
		goto dcb_error;

	}



	/* If DCB was not enabled previously, we are done */

	if (!test_bit(ICE_FLAG_DCB_ENA, pf->flags))

		return;



	mutex_lock(&pf->tc_mutex);



	if (!pf->hw.port_info->is_sw_lldp)
@@ -467,7 +463,7 @@ void ice_dcb_rebuild(struct ice_pf *pf) 
		}

	}



	dev_info(dev, "DCB restored after reset\n");

	dev_info(dev, "DCB info restored\n");

	ret = ice_query_port_ets(pf->hw.port_info, &buf, sizeof(buf), NULL);

	if (ret) {

		dev_err(dev, "Query Port ETS failed\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE