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: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Tatyana Nikolova <tatyana.e.nikolova@intel.com>
Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_dcb.c b/drivers/net/ethernet/intel/ice/ice_dcb.c
index 74418c445cc435a99b425b6375f043cc1edde1d8..64737fc6230657bc558dc46c90cbbb7a4b54265c 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_dcb.c
+++ b/drivers/net/ethernet/intel/ice/ice_dcb.c
@@ -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 */

diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_nl.c b/drivers/net/ethernet/intel/ice/ice_dcb_nl.c
index 6d50b90a7359c6211f5dbf720066802490068a39..a10c1c8d86977952f3fc338b31a4e951ceca65de 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_dcb_nl.c
+++ b/drivers/net/ethernet/intel/ice/ice_dcb_nl.c
@@ -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,

diff --git a/drivers/net/ethernet/intel/ice/ice_idc.c b/drivers/net/ethernet/intel/ice/ice_idc.c
index d55107077d8ce8ec08d4251b2c2038c4b0031eef..4421ba024396069da14f69b73fc24e715f804d65 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_idc.c
+++ b/drivers/net/ethernet/intel/ice/ice_idc.c
@@ -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);

diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h
index 0aab21113cc4357ca2a5ddf938124f9a11a168a4..529f978ea45a0f4a46acf579f4dfd53e266c28b4 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_type.h
@@ -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

diff --git a/include/linux/net/intel/iidc_rdma.h b/include/linux/net/intel/iidc_rdma.h
index 1e8136395154629cb3496992baa7bb195ccdc2f0..7f191028953468bba93e0eedcac1657f2008ddbd 100644 (file)
--- a/include/linux/net/intel/iidc_rdma.h
+++ b/include/linux/net/intel/iidc_rdma.h
@@ -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 {