Commit 40b24760 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Tony Nguyen
Browse files

ice: Add feature bitmap, helpers and a check for DSCP 



DSCP a.k.a L3 QoS is only supported on certain devices. To enforce this,
this patch introduces a bitmap of features and helper functions.

The feature bitmap is set based on device IDs on driver init. Currently,
DSCP is the only feature in this bitmap, but there will be more in the
future. In the DCB netlink flow, check if the feature bit is set before
exercising DSCP.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarGurucharan G <gurucharanx.g@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 2a87bd73

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_dcb_nl.c

+6 −2
Original line number Diff line number Diff line
@@ -710,6 +710,9 @@ static int ice_dcbnl_setapp(struct net_device *netdev, struct dcb_app *app) 
	if (!(pf->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))

		return -EINVAL;



	if (!ice_is_feature_supported(pf, ICE_F_DSCP))

		return -EOPNOTSUPP;



	if (app->protocol >= ICE_DSCP_NUM_VAL) {

		netdev_err(netdev, "DSCP value 0x%04X out of range\n",

			   app->protocol);
@@ -861,8 +864,9 @@ static int ice_dcbnl_delapp(struct net_device *netdev, struct dcb_app *app) 
		new_cfg->app[j].priority = old_cfg->app[j + 1].priority;

	}



	/* if not a DSCP APP TLV, then we are done */

	if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP) {

	/* if not a DSCP APP TLV or DSCP is not supported, we are done */

	if (app->selector != IEEE_8021QAZ_APP_SEL_DSCP ||

	    !ice_is_feature_supported(pf, ICE_F_DSCP)) {

		ret = ICE_DCB_HW_CHG;

		goto delapp_out;

	}

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

+47 −0
Original line number Diff line number Diff line
@@ -3573,3 +3573,50 @@ int ice_set_link(struct ice_vsi *vsi, bool ena) 


	return 0;

}



/**

 * ice_is_feature_supported

 * @pf: pointer to the struct ice_pf instance

 * @f: feature enum to be checked

 *

 * returns true if feature is supported, false otherwise

 */

bool ice_is_feature_supported(struct ice_pf *pf, enum ice_feature f)

{

	if (f < 0 || f >= ICE_F_MAX)

		return false;



	return test_bit(f, pf->features);

}



/**

 * ice_set_feature_support

 * @pf: pointer to the struct ice_pf instance

 * @f: feature enum to set

 */

static void ice_set_feature_support(struct ice_pf *pf, enum ice_feature f)

{

	if (f < 0 || f >= ICE_F_MAX)

		return;



	set_bit(f, pf->features);

}



/**

 * ice_init_feature_support

 * @pf: pointer to the struct ice_pf instance

 *

 * called during init to setup supported feature

 */

void ice_init_feature_support(struct ice_pf *pf)

{

	switch (pf->hw.device_id) {

	case ICE_DEV_ID_E810C_BACKPLANE:

	case ICE_DEV_ID_E810C_QSFP:

	case ICE_DEV_ID_E810C_SFP:

		ice_set_feature_support(pf, ICE_F_DSCP);

		break;

	default:

		break;

	}

}

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

+2 −0
Original line number Diff line number Diff line
@@ -116,4 +116,6 @@ bool ice_is_vsi_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi); 
int ice_set_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi);



int ice_clear_dflt_vsi(struct ice_sw *sw);

bool ice_is_feature_supported(struct ice_pf *pf, enum ice_feature f);

void ice_init_feature_support(struct ice_pf *pf);

#endif /* !_ICE_LIB_H_ */

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

+2 −0
Original line number Diff line number Diff line
@@ -4270,6 +4270,8 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) 
		goto err_exit_unroll;

	}



	ice_init_feature_support(pf);



	ice_request_fw(pf);



	/* if ice_request_fw fails, ICE_FLAG_ADV_FEATURES bit won't be