Commit 49f01349 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/tnguy/nex 


t-queue

Tony Nguyen says:

====================
100GbE Intel Wired LAN Driver Updates 2021-09-28

This series contains updates to ice driver only.

Dave adds support for QoS DSCP allowing for DSCP to TC mapping via APP
TLVs.

Ani adds enforcement of DSCP to only supported devices with the
introduction of a feature bitmap and corrects messaging of unsupported
modules based on link mode.

Jake refactors devlink info functions to be void as the functions no
longer return errors.

Jeff fixes a macro name to properly reflect the value.

Len Baker converts a kzalloc allocation to, the preferred, kcalloc.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 096d19f3 30cba287

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

+6 −0
Original line number Diff line number Diff line
@@ -158,6 +158,11 @@ 


#define ice_pf_to_dev(pf) (&((pf)->pdev->dev))



enum ice_feature {

	ICE_F_DSCP,

	ICE_F_MAX

};



struct ice_txq_meta {

	u32 q_teid;	/* Tx-scheduler element identifier */

	u16 q_id;	/* Entry in VSI's txq_map bitmap */
@@ -443,6 +448,7 @@ struct ice_pf { 
	/* used to ratelimit the MDD event logging */

	unsigned long last_printed_mdd_jiffies;

	DECLARE_BITMAP(malvfs, ICE_MAX_VF_COUNT);

	DECLARE_BITMAP(features, ICE_F_MAX);

	DECLARE_BITMAP(state, ICE_STATE_NBITS);

	DECLARE_BITMAP(flags, ICE_PF_FLAGS_NBITS);

	unsigned long *avail_txqs;	/* bitmap to track PF Tx queue usage */

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

+15 −0
Original line number Diff line number Diff line
@@ -671,6 +671,16 @@ struct ice_aqc_sw_rules_elem { 
	} __packed pdata;

};



/* Query PFC Mode (direct 0x0302)

 * Set PFC Mode (direct 0x0303)

 */

struct ice_aqc_set_query_pfc_mode {

	u8	pfc_mode;

/* For Query Command response, reserved in all other cases */

#define ICE_AQC_PFC_VLAN_BASED_PFC	1

#define ICE_AQC_PFC_DSCP_BASED_PFC	2

	u8	rsvd[15];

};

/* Get Default Topology (indirect 0x0400) */

struct ice_aqc_get_topo {

	u8 port_num;
@@ -1936,6 +1946,7 @@ struct ice_aq_desc { 
		struct ice_aqc_nvm_pkg_data pkg_data;

		struct ice_aqc_nvm_pass_comp_tbl pass_comp_tbl;

		struct ice_aqc_pf_vf_msg virt;

		struct ice_aqc_set_query_pfc_mode set_query_pfc_mode;

		struct ice_aqc_lldp_get_mib lldp_get_mib;

		struct ice_aqc_lldp_set_mib_change lldp_set_event;

		struct ice_aqc_lldp_stop lldp_stop;
@@ -2040,6 +2051,10 @@ enum ice_adminq_opc { 


	ice_aqc_opc_clear_pf_cfg			= 0x02A4,



	/* DCB commands */

	ice_aqc_opc_query_pfc_mode			= 0x0302,

	ice_aqc_opc_set_pfc_mode			= 0x0303,



	/* transmit scheduler commands */

	ice_aqc_opc_get_dflt_topo			= 0x0400,

	ice_aqc_opc_add_sched_elems			= 0x0401,

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

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ void ice_init_arfs(struct ice_vsi *vsi) 
	if (!vsi || vsi->type != ICE_VSI_PF)

		return;



	arfs_fltr_list = kzalloc(sizeof(*arfs_fltr_list) * ICE_MAX_ARFS_LIST,

	arfs_fltr_list = kcalloc(ICE_MAX_ARFS_LIST, sizeof(*arfs_fltr_list),

				 GFP_KERNEL);

	if (!arfs_fltr_list)

		return;

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

+209 −16
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright (c) 2019, Intel Corporation. */



#include "ice_common.h"

#include "ice_lib.h"

#include "ice_sched.h"

#include "ice_dcb.h"
@@ -735,6 +736,45 @@ ice_aq_get_cee_dcb_cfg(struct ice_hw *hw, 
	return ice_aq_send_cmd(hw, &desc, (void *)buff, sizeof(*buff), cd);

}



/**

 * ice_aq_set_pfc_mode - Set PFC mode

 * @hw: pointer to the HW struct

 * @pfc_mode: value of PFC mode to set

 * @cd: pointer to command details structure or NULL

 *

 * This AQ call configures the PFC mode to DSCP-based PFC mode or

 * VLAN-based PFC (0x0303)

 */

int ice_aq_set_pfc_mode(struct ice_hw *hw, u8 pfc_mode, struct ice_sq_cd *cd)

{

	struct ice_aqc_set_query_pfc_mode *cmd;

	struct ice_aq_desc desc;

	enum ice_status status;



	if (pfc_mode > ICE_AQC_PFC_DSCP_BASED_PFC)

		return -EINVAL;



	cmd = &desc.params.set_query_pfc_mode;



	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_set_pfc_mode);



	cmd->pfc_mode = pfc_mode;



	status = ice_aq_send_cmd(hw, &desc, NULL, 0, cd);

	if (status)

		return ice_status_to_errno(status);



	/* FW will write the PFC mode set back into cmd->pfc_mode, but if DCB is

	 * disabled, FW will write back 0 to cmd->pfc_mode. After the AQ has

	 * been executed, check if cmd->pfc_mode is what was requested. If not,

	 * return an error.

	 */

	if (cmd->pfc_mode != pfc_mode)

		return -EOPNOTSUPP;



	return 0;

}



/**

 * ice_cee_to_dcb_cfg

 * @cee_cfg: pointer to CEE configuration struct
@@ -1207,7 +1247,140 @@ ice_add_ieee_app_pri_tlv(struct ice_lldp_org_tlv *tlv, 
}



/**

 * ice_add_dcb_tlv - Add all IEEE TLVs

 * ice_add_dscp_up_tlv - Prepare DSCP to UP TLV

 * @tlv: location to build the TLV data

 * @dcbcfg: location of data to convert to TLV

 */

static void

ice_add_dscp_up_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)

{

	u8 *buf = tlv->tlvinfo;

	u32 ouisubtype;

	u16 typelen;

	int i;



	typelen = ((ICE_TLV_TYPE_ORG << ICE_LLDP_TLV_TYPE_S) |

		   ICE_DSCP_UP_TLV_LEN);

	tlv->typelen = htons(typelen);



	ouisubtype = (u32)((ICE_DSCP_OUI << ICE_LLDP_TLV_OUI_S) |

			   ICE_DSCP_SUBTYPE_DSCP2UP);

	tlv->ouisubtype = htonl(ouisubtype);



	/* bytes 0 - 63 - IPv4 DSCP2UP LUT */

	for (i = 0; i < ICE_DSCP_NUM_VAL; i++) {

		/* IPv4 mapping */

		buf[i] = dcbcfg->dscp_map[i];

		/* IPv6 mapping */

		buf[i + ICE_DSCP_IPV6_OFFSET] = dcbcfg->dscp_map[i];

	}



	/* byte 64 - IPv4 untagged traffic */

	buf[i] = 0;



	/* byte 144 - IPv6 untagged traffic */

	buf[i + ICE_DSCP_IPV6_OFFSET] = 0;

}



#define ICE_BYTES_PER_TC	8

/**

 * ice_add_dscp_enf_tlv - Prepare DSCP Enforcement TLV

 * @tlv: location to build the TLV data

 */

static void

ice_add_dscp_enf_tlv(struct ice_lldp_org_tlv *tlv)

{

	u8 *buf = tlv->tlvinfo;

	u32 ouisubtype;

	u16 typelen;



	typelen = ((ICE_TLV_TYPE_ORG << ICE_LLDP_TLV_TYPE_S) |

		   ICE_DSCP_ENF_TLV_LEN);

	tlv->typelen = htons(typelen);



	ouisubtype = (u32)((ICE_DSCP_OUI << ICE_LLDP_TLV_OUI_S) |

			   ICE_DSCP_SUBTYPE_ENFORCE);

	tlv->ouisubtype = htonl(ouisubtype);



	/* Allow all DSCP values to be valid for all TC's (IPv4 and IPv6) */

	memset(buf, 0, 2 * (ICE_MAX_TRAFFIC_CLASS * ICE_BYTES_PER_TC));

}



/**

 * ice_add_dscp_tc_bw_tlv - Prepare DSCP BW for TC TLV

 * @tlv: location to build the TLV data

 * @dcbcfg: location of the data to convert to TLV

 */

static void

ice_add_dscp_tc_bw_tlv(struct ice_lldp_org_tlv *tlv,

		       struct ice_dcbx_cfg *dcbcfg)

{

	struct ice_dcb_ets_cfg *etscfg;

	u8 *buf = tlv->tlvinfo;

	u32 ouisubtype;

	u8 offset = 0;

	u16 typelen;

	int i;



	typelen = ((ICE_TLV_TYPE_ORG << ICE_LLDP_TLV_TYPE_S) |

		   ICE_DSCP_TC_BW_TLV_LEN);

	tlv->typelen = htons(typelen);



	ouisubtype = (u32)((ICE_DSCP_OUI << ICE_LLDP_TLV_OUI_S) |

			   ICE_DSCP_SUBTYPE_TCBW);

	tlv->ouisubtype = htonl(ouisubtype);



	/* First Octect after subtype

	 * ----------------------------

	 * | RSV | CBS | RSV | Max TCs |

	 * | 1b  | 1b  | 3b  | 3b      |

	 * ----------------------------

	 */

	etscfg = &dcbcfg->etscfg;

	buf[0] = etscfg->maxtcs & ICE_IEEE_ETS_MAXTC_M;



	/* bytes 1 - 4 reserved */

	offset = 5;



	/* TC BW table

	 * bytes 0 - 7 for TC 0 - 7

	 *

	 * TSA Assignment table

	 * bytes 8 - 15 for TC 0 - 7

	 */

	for (i = 0; i < ICE_MAX_TRAFFIC_CLASS; i++) {

		buf[offset] = etscfg->tcbwtable[i];

		buf[offset + ICE_MAX_TRAFFIC_CLASS] = etscfg->tsatable[i];

		offset++;

	}

}



/**

 * ice_add_dscp_pfc_tlv - Prepare DSCP PFC TLV

 * @tlv: Fill PFC TLV in IEEE format

 * @dcbcfg: Local store which holds the PFC CFG data

 */

static void

ice_add_dscp_pfc_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg)

{

	u8 *buf = tlv->tlvinfo;

	u32 ouisubtype;

	u16 typelen;



	typelen = ((ICE_TLV_TYPE_ORG << ICE_LLDP_TLV_TYPE_S) |

		   ICE_DSCP_PFC_TLV_LEN);

	tlv->typelen = htons(typelen);



	ouisubtype = (u32)((ICE_DSCP_OUI << ICE_LLDP_TLV_OUI_S) |

			   ICE_DSCP_SUBTYPE_PFC);

	tlv->ouisubtype = htonl(ouisubtype);



	buf[0] = dcbcfg->pfc.pfccap & 0xF;

	buf[1] = dcbcfg->pfc.pfcena & 0xF;

}



/**

 * ice_add_dcb_tlv - Add all IEEE or DSCP TLVs

 * @tlv: Fill TLV data in IEEE format

 * @dcbcfg: Local store which holds the DCB Config

 * @tlvid: Type of IEEE TLV
@@ -1218,6 +1391,7 @@ static void 
ice_add_dcb_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg,

		u16 tlvid)

{

	if (dcbcfg->pfc_mode == ICE_QOS_MODE_VLAN) {

		switch (tlvid) {

		case ICE_IEEE_TLV_ID_ETS_CFG:

			ice_add_ieee_ets_tlv(tlv, dcbcfg);
@@ -1234,6 +1408,25 @@ ice_add_dcb_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg, 
		default:

			break;

		}

	} else {

		/* pfc_mode == ICE_QOS_MODE_DSCP */

		switch (tlvid) {

		case ICE_TLV_ID_DSCP_UP:

			ice_add_dscp_up_tlv(tlv, dcbcfg);

			break;

		case ICE_TLV_ID_DSCP_ENF:

			ice_add_dscp_enf_tlv(tlv);

			break;

		case ICE_TLV_ID_DSCP_TC_BW:

			ice_add_dscp_tc_bw_tlv(tlv, dcbcfg);

			break;

		case ICE_TLV_ID_DSCP_TO_PFC:

			ice_add_dscp_pfc_tlv(tlv, dcbcfg);

			break;

		default:

			break;

		}

	}

}



/**

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

+18 −0
Original line number Diff line number Diff line
@@ -22,6 +22,14 @@ 


#define ICE_CEE_DCBX_OUI		0x001B21

#define ICE_CEE_DCBX_TYPE		2



#define ICE_DSCP_OUI			0xFFFFFF

#define ICE_DSCP_SUBTYPE_DSCP2UP	0x41

#define ICE_DSCP_SUBTYPE_ENFORCE	0x42

#define ICE_DSCP_SUBTYPE_TCBW		0x43

#define ICE_DSCP_SUBTYPE_PFC		0x44

#define ICE_DSCP_IPV6_OFFSET		80



#define ICE_CEE_SUBTYPE_PG_CFG		2

#define ICE_CEE_SUBTYPE_PFC_CFG		3

#define ICE_CEE_SUBTYPE_APP_PRI		4
@@ -78,11 +86,20 @@ 
#define ICE_IEEE_TLV_ID_APP_PRI		6

#define ICE_TLV_ID_END_OF_LLDPPDU	7

#define ICE_TLV_ID_START		ICE_IEEE_TLV_ID_ETS_CFG

#define ICE_TLV_ID_DSCP_UP		3

#define ICE_TLV_ID_DSCP_ENF		4

#define ICE_TLV_ID_DSCP_TC_BW		5

#define ICE_TLV_ID_DSCP_TO_PFC		6



#define ICE_IEEE_ETS_TLV_LEN		25

#define ICE_IEEE_PFC_TLV_LEN		6

#define ICE_IEEE_APP_TLV_LEN		11



#define ICE_DSCP_UP_TLV_LEN		148

#define ICE_DSCP_ENF_TLV_LEN		132

#define ICE_DSCP_TC_BW_TLV_LEN		25

#define ICE_DSCP_PFC_TLV_LEN		6



/* IEEE 802.1AB LLDP Organization specific TLV */

struct ice_lldp_org_tlv {

	__be16 typelen;
@@ -120,6 +137,7 @@ struct ice_cee_app_prio { 
	u8 prio_map;

} __packed;



int ice_aq_set_pfc_mode(struct ice_hw *hw, u8 pfc_mode, struct ice_sq_cd *cd);

enum ice_status

ice_aq_get_dcb_cfg(struct ice_hw *hw, u8 mib_type, u8 bridgetype,

		   struct ice_dcbx_cfg *dcbcfg);