ice: Update rings based on TC information

This patch adds a new function ice_vsi_cfg_dcb_rings which updates a
VSI's rings based on DCB traffic class information.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
index 6bbca2c99dbdf6251e9935d9286f97d1b8098d92..aabba91189bd7a886fbbd243e8315de3d89b059f 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c
@@ -57,6 +57,44 @@ u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg *dcbcfg)
        return ret;
 }
 
+/**
+ * ice_vsi_cfg_dcb_rings - Update rings to reflect DCB TC
+ * @vsi: VSI owner of rings being updated
+ */
+void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi)
+{
+       struct ice_ring *tx_ring, *rx_ring;
+       u16 qoffset, qcount;
+       int i, n;
+
+       if (!test_bit(ICE_FLAG_DCB_ENA, vsi->back->flags)) {
+               /* Reset the TC information */
+               for (i = 0; i < vsi->num_txq; i++) {
+                       tx_ring = vsi->tx_rings[i];
+                       tx_ring->dcb_tc = 0;
+               }
+               for (i = 0; i < vsi->num_rxq; i++) {
+                       rx_ring = vsi->rx_rings[i];
+                       rx_ring->dcb_tc = 0;
+               }
+               return;
+       }
+
+       ice_for_each_traffic_class(n) {
+               if (!(vsi->tc_cfg.ena_tc & BIT(n)))
+                       break;
+
+               qoffset = vsi->tc_cfg.tc_info[n].qoffset;
+               qcount = vsi->tc_cfg.tc_info[n].qcount_tx;
+               for (i = qoffset; i < (qoffset + qcount); i++) {
+                       tx_ring = vsi->tx_rings[i];
+                       rx_ring = vsi->rx_rings[i];
+                       tx_ring->dcb_tc = n;
+                       rx_ring->dcb_tc = n;
+               }
+       }
+}
+
 /**
  * ice_pf_dcb_recfg - Reconfigure all VEBs and VSIs
  * @pf: pointer to the PF struct

diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.h b/drivers/net/ethernet/intel/ice/ice_dcb_lib.h
index 3a2ffc98f292dd47ec19b23c290df6189f3917a9..8932702b0b6640bfe665b5ef8bea3c07c796e190 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.h
@@ -10,10 +10,16 @@
 #ifdef CONFIG_DCB
 u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg *dcbcfg);
 u8 ice_dcb_get_num_tc(struct ice_dcbx_cfg *dcbcfg);
+void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi);
 int ice_init_pf_dcb(struct ice_pf *pf);
 void
 ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,
                                    struct ice_rq_event_info *event);
+static inline void
+ice_set_cgd_num(struct ice_tlan_ctx *tlan_ctx, struct ice_ring *ring)
+{
+       tlan_ctx->cgd_num = ring->dcb_tc;
+}
 #else
 static inline u8 ice_dcb_get_ena_tc(struct ice_dcbx_cfg __always_unused *dcbcfg)
 {
@@ -31,6 +37,8 @@ static inline int ice_init_pf_dcb(struct ice_pf *pf)
        return -EOPNOTSUPP;
 }
 
+#define ice_vsi_cfg_dcb_rings(vsi) do {} while (0)
 #define ice_dcb_process_lldp_set_mib_change(pf, event) do {} while (0)
+#define ice_set_cgd_num(tlan_ctx, ring) do {} while (0)
 #endif /* CONFIG_DCB */
 #endif /* _ICE_DCB_LIB_H_ */

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index f3574daa147cf9b67a8854485d0d6d16ce977d45..f31129e4e9cfd4b03f3968a3dc632008ef3ca786 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -125,6 +125,8 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)
        /* Transmit Queue Length */
        tlan_ctx->qlen = ring->count;
 
+       ice_set_cgd_num(tlan_ctx, ring);
+
        /* PF number */
        tlan_ctx->pf_num = hw->pf_id;
 

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index ac560862f56036f32935e6de327a5fc79d4a5f68..fa8160656b00877256e91b8023782f7135486880 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2940,6 +2940,7 @@ static int ice_vsi_cfg(struct ice_vsi *vsi)
                if (err)
                        return err;
        }
+       ice_vsi_cfg_dcb_rings(vsi);
 
        err = ice_vsi_cfg_lan_txqs(vsi);
        if (!err)

diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h
index 60131b84b0215d6371cf32beb5138563952657f7..53903f846834294caf3995651ff02b247ef53ea0 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_txrx.h
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h
@@ -160,6 +160,9 @@ struct ice_ring {
        };
        u16 q_index;                    /* Queue number of ring */
        u32 txq_teid;                   /* Added Tx queue TEID */
+#ifdef CONFIG_DCB
+       u8 dcb_tc;              /* Traffic class of ring */
+#endif /* CONFIG_DCB */
 
        u16 count;                      /* Number of descriptors */
        u16 reg_idx;                    /* HW register index of the ring */