Commit 7d9c9b79 authored by Dave Ertman's avatar Dave Ertman Committed by Tony Nguyen
Browse files

ice: Implement LFC workaround 



There is a bug where the LFC settings are not being preserved
through a link event.  The registers in question are the ones
that are touched (and restored) when a set_local_mib AQ command
is performed.

On a link-up event, make sure that a set_local_mib is being
performed.

Move the function ice_aq_set_lldp_mib() from the DCB specific
ice_dcb.c to ice_common.c so that the driver always has access
to this AQ command.

Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 490ed0b9

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

+33 −0
Original line number Diff line number Diff line
@@ -4357,3 +4357,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_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

+0 −4
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)

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

+11 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ ice_set_cgd_num(struct ice_tlan_ctx *tlan_ctx, struct ice_ring *ring) 
{

	tlan_ctx->cgd_num = ring->dcb_tc;

}



static inline bool ice_is_dcb_active(struct ice_pf *pf)

{

	return (test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags) ||

		test_bit(ICE_FLAG_DCB_ENA, pf->flags));

}

#else

#define ice_dcb_rebuild(pf) do {} while (0)
@@ -95,6 +101,11 @@ ice_tx_prepare_vlan_flags_dcb(struct ice_ring __always_unused *tx_ring, 
	return 0;

}



static inline bool ice_is_dcb_active(struct ice_pf __always_unused *pf)

{

	return false;

}



static inline bool

ice_is_pfc_causing_hung_q(struct ice_pf __always_unused *pf,

			  unsigned int __always_unused txqueue)