Commit 8239b771 authored by Tatyana Nikolova's avatar Tatyana Nikolova Committed by Tony Nguyen
Browse files

ice: Replace ice specific DSCP mapping num with a kernel define 



Replace ice driver specific DSCP mapping number defines
ICE_DSCP_NUM_VAL and IIDC_MAX_DSCP_MAPPING with
an equivalent kernel define DSCP_MAX.

Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarTatyana Nikolova <tatyana.e.nikolova@intel.com>
Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent d9251a56

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

+1 −1
Original line number Diff line number Diff line
@@ -1288,7 +1288,7 @@ ice_add_dscp_up_tlv(struct ice_lldp_org_tlv *tlv, struct ice_dcbx_cfg *dcbcfg) 
	tlv->ouisubtype = htonl(ouisubtype);



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

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

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

		/* IPv4 mapping */

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

		/* IPv6 mapping */

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

+2 −2
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ static int ice_dcbnl_setapp(struct net_device *netdev, struct dcb_app *app) 
	if (!ice_is_feature_supported(pf, ICE_F_DSCP))

		return -EOPNOTSUPP;



	if (app->protocol >= ICE_DSCP_NUM_VAL) {

	if (app->protocol >= DSCP_MAX) {

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

			   app->protocol);

		return -EINVAL;
@@ -931,7 +931,7 @@ static int ice_dcbnl_delapp(struct net_device *netdev, struct dcb_app *app) 
	/* if the last DSCP mapping just got deleted, need to switch

	 * to L2 VLAN QoS mode

	 */

	if (bitmap_empty(new_cfg->dscp_mapped, ICE_DSCP_NUM_VAL) &&

	if (bitmap_empty(new_cfg->dscp_mapped, DSCP_MAX) &&

	    new_cfg->pfc_mode == ICE_QOS_MODE_DSCP) {

		ret = ice_aq_set_pfc_mode(&pf->hw,

					  ICE_AQC_PFC_VLAN_BASED_PFC,

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

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ void ice_get_qos_params(struct ice_pf *pf, struct iidc_rdma_qos_params *qos) 


	qos->pfc_mode = dcbx_cfg->pfc_mode;

	if (qos->pfc_mode == IIDC_DSCP_PFC_MODE)

		for (i = 0; i < IIDC_MAX_DSCP_MAPPING; i++)

		for (i = 0; i < DSCP_MAX; i++)

			qos->dscp_map[i] = dcbx_cfg->dscp_map[i];

}

EXPORT_SYMBOL_GPL(ice_get_qos_params);

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

+3 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "ice_vlan_mode.h"

#include "ice_fwlog.h"

#include <linux/wait.h>

#include <net/dscp.h>



static inline bool ice_is_tc_ena(unsigned long bitmap, u8 tc)

{
@@ -695,7 +696,6 @@ struct ice_dcb_app_priority_table { 


#define ICE_MAX_USER_PRIORITY	8

#define ICE_DCBX_MAX_APPS	64

#define ICE_DSCP_NUM_VAL	64

#define ICE_LLDPDU_SIZE		1500

#define ICE_TLV_STATUS_OPER	0x1

#define ICE_TLV_STATUS_SYNC	0x2
@@ -718,9 +718,9 @@ struct ice_dcbx_cfg { 
	u8 pfc_mode;

	struct ice_dcb_app_priority_table app[ICE_DCBX_MAX_APPS];

	/* when DSCP mapping defined by user set its bit to 1 */

	DECLARE_BITMAP(dscp_mapped, ICE_DSCP_NUM_VAL);

	DECLARE_BITMAP(dscp_mapped, DSCP_MAX);

	/* array holding DSCP -> UP/TC values for DSCP L3 QoS mode */

	u8 dscp_map[ICE_DSCP_NUM_VAL];

	u8 dscp_map[DSCP_MAX];

	u8 dcbx_mode;

#define ICE_DCBX_MODE_CEE	0x1

#define ICE_DCBX_MODE_IEEE	0x2

include/linux/net/intel/iidc_rdma.h

+2 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/if_ether.h>

#include <linux/kernel.h>

#include <linux/netdevice.h>

#include <net/dscp.h>



enum iidc_rdma_event_type {

	IIDC_RDMA_EVENT_BEFORE_MTU_CHANGE,
@@ -32,7 +33,6 @@ enum iidc_rdma_protocol { 
};



#define IIDC_MAX_USER_PRIORITY		8

#define IIDC_MAX_DSCP_MAPPING		64

#define IIDC_DSCP_PFC_MODE		0x1



/* Struct to hold per RDMA Qset info */
@@ -63,7 +63,7 @@ struct iidc_rdma_qos_params { 
	u8 vport_priority_type;

	u8 num_tc;

	u8 pfc_mode;

	u8 dscp_map[IIDC_MAX_DSCP_MAPPING];

	u8 dscp_map[DSCP_MAX];

};



struct iidc_rdma_event {