net/bnxt: remove dead code

Code related to maintaining completion ring "valid" state is
no longer needed, remove it.

Signed-off-by: Lance Richardson <lance.richardson@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>

diff --git a/drivers/net/bnxt/bnxt_cpr.h b/drivers/net/bnxt/bnxt_cpr.h
index 28c0a90..2a56ec5 100644 (file)
--- a/drivers/net/bnxt/bnxt_cpr.h
+++ b/drivers/net/bnxt/bnxt_cpr.h
@@ -15,14 +15,6 @@ struct bnxt_db_info;
        (!!(rte_le_to_cpu_32(((struct cmpl_base *)(cmp))->info3_v) &    \
            CMPL_BASE_V) == !((raw_cons) & ((ring)->ring_size)))
 
-#define CMPL_VALID(cmp, v)                                             \
-       (!!(rte_le_to_cpu_32(((struct cmpl_base *)(cmp))->info3_v) &    \
-           CMPL_BASE_V) == !(v))
-
-#define NQ_CMP_VALID(nqcmp, raw_cons, ring)            \
-       (!!((nqcmp)->v & rte_cpu_to_le_32(NQ_CN_V)) ==  \
-        !((raw_cons) & ((ring)->ring_size)))
-
 #define CMP_TYPE(cmp)                                          \
        (((struct cmpl_base *)cmp)->type & CMPL_BASE_TYPE_MASK)
 
@@ -35,18 +27,10 @@ struct bnxt_db_info;
 #define RING_CMP(ring, idx)    ((idx) & (ring)->ring_mask)
 #define RING_CMPL(ring_mask, idx)      ((idx) & (ring_mask))
 #define NEXT_CMP(idx)          RING_CMP(ADV_RAW_CMP(idx, 1))
-#define FLIP_VALID(cons, mask, val)    ((cons) >= (mask) ? !(val) : (val))
 
 #define DB_CP_REARM_FLAGS      (DB_KEY_CP | DB_IDX_VALID)
 #define DB_CP_FLAGS            (DB_KEY_CP | DB_IDX_VALID | DB_IRQ_DIS)
 
-#define NEXT_CMPL(cpr, idx, v, inc)    do { \
-       (idx) += (inc); \
-       if (unlikely((idx) >= (cpr)->cp_ring_struct->ring_size)) { \
-               (v) = !(v); \
-               (idx) = 0; \
-       } \
-} while (0)
 #define B_CP_DB_REARM(cpr, raw_cons)                                   \
        rte_write32((DB_CP_REARM_FLAGS |                                \
                    DB_RING_IDX(&((cpr)->cp_db), raw_cons)),            \
@@ -107,7 +91,6 @@ struct bnxt_cp_ring_info {
        uint32_t                hw_stats_ctx_id;
 
        struct bnxt_ring        *cp_ring_struct;
-       bool                    valid;
 };
 
 #define RX_CMP_L2_ERRORS                                               \

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index a251d39..6c4f83e 100644 (file)
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -2678,7 +2678,6 @@ void bnxt_free_nq_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)
        memset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size *
                                     sizeof(*cpr->cp_desc_ring));
        cpr->cp_raw_cons = 0;
-       cpr->valid = 0;
 }
 
 void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)
@@ -2692,7 +2691,6 @@ void bnxt_free_cp_ring(struct bnxt *bp, struct bnxt_cp_ring_info *cpr)
        memset(cpr->cp_desc_ring, 0, cpr->cp_ring_struct->ring_size *
                        sizeof(*cpr->cp_desc_ring));
        cpr->cp_raw_cons = 0;
-       cpr->valid = 0;
 }
 
 void bnxt_free_hwrm_rx_ring(struct bnxt *bp, int queue_index)

diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c
index 4a90ac2..cb18dfb 100644 (file)
--- a/drivers/net/bnxt/bnxt_ring.c
+++ b/drivers/net/bnxt/bnxt_ring.c
@@ -769,7 +769,6 @@ int bnxt_alloc_async_cp_ring(struct bnxt *bp)
                return rc;
 
        cpr->cp_raw_cons = 0;
-       cpr->valid = 0;
        bnxt_set_db(bp, &cpr->cp_db, ring_type, 0,
                    cp_ring->fw_ring_id, cp_ring->ring_mask);
 

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 756a45b..0dee73a 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -297,9 +297,6 @@ static int bnxt_agg_bufs_valid(struct bnxt_cp_ring_info *cpr,
        raw_cp_cons = ADV_RAW_CMP(raw_cp_cons, agg_bufs);
        last_cp_cons = RING_CMP(cpr->cp_ring_struct, raw_cp_cons);
        agg_cmpl = (struct rx_pkt_cmpl *)&cpr->cp_desc_ring[last_cp_cons];
-       cpr->valid = FLIP_VALID(raw_cp_cons,
-                               cpr->cp_ring_struct->ring_mask,
-                               cpr->valid);
        return CMP_VALID(agg_cmpl, raw_cp_cons, cpr->cp_ring_struct);
 }
 
@@ -898,10 +895,6 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
        if (!CMP_VALID(rxcmp1, tmp_raw_cons, cpr->cp_ring_struct))
                return -EBUSY;
 
-       cpr->valid = FLIP_VALID(cp_cons,
-                               cpr->cp_ring_struct->ring_mask,
-                               cpr->valid);
-
        if (cmp_type == RX_TPA_START_CMPL_TYPE_RX_TPA_START ||
            cmp_type == RX_TPA_START_V2_CMPL_TYPE_RX_TPA_START_V2) {
                bnxt_tpa_start(rxq, (struct rx_tpa_start_cmpl *)rxcmp,
@@ -1086,10 +1079,6 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 
                if (!CMP_VALID(rxcmp, raw_cons, cpr->cp_ring_struct))
                        break;
-               cpr->valid = FLIP_VALID(cons,
-                                       cpr->cp_ring_struct->ring_mask,
-                                       cpr->valid);
-
                if (CMP_TYPE(rxcmp) == CMPL_BASE_TYPE_HWRM_DONE) {
                        PMD_DRV_LOG(ERR, "Rx flush done\n");
                } else if ((CMP_TYPE(rxcmp) >= CMPL_BASE_TYPE_RX_TPA_START_V2) &&

diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
index b4e9202..263e6ec 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_neon.c
@@ -296,8 +296,6 @@ recv_burst_vec_neon(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 
                rxq->rxrearm_nb += nb_rx_pkts;
                cpr->cp_raw_cons += 2 * nb_rx_pkts;
-               cpr->valid =
-                       !!(cpr->cp_raw_cons & cpr->cp_ring_struct->ring_size);
                bnxt_db_cq(cpr);
        }
 
@@ -353,7 +351,6 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)
                raw_cons = NEXT_RAW_CMP(raw_cons);
        } while (nb_tx_pkts < ring_mask);
 
-       cpr->valid = !!(raw_cons & cp_ring_struct->ring_size);
        if (nb_tx_pkts) {
                if (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                        bnxt_tx_cmp_vec_fast(txq, nb_tx_pkts);

diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
index c479697..9a53d1f 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
@@ -277,8 +277,6 @@ recv_burst_vec_sse(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 
                rxq->rxrearm_nb += nb_rx_pkts;
                cpr->cp_raw_cons += 2 * nb_rx_pkts;
-               cpr->valid =
-                       !!(cpr->cp_raw_cons & cpr->cp_ring_struct->ring_size);
                bnxt_db_cq(cpr);
        }
 
@@ -334,7 +332,6 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)
                raw_cons = NEXT_RAW_CMP(raw_cons);
        } while (nb_tx_pkts < ring_mask);
 
-       cpr->valid = !!(raw_cons & cp_ring_struct->ring_size);
        if (nb_tx_pkts) {
                if (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                        bnxt_tx_cmp_vec_fast(txq, nb_tx_pkts);

diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 54eaab3..8eb9493 100644 (file)
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -474,8 +474,6 @@ static int bnxt_handle_tx_cp(struct bnxt_tx_queue *txq)
                raw_cons = NEXT_RAW_CMP(raw_cons);
        } while (nb_tx_pkts < ring_mask);
 
-       cpr->valid = !!(raw_cons & cp_ring_struct->ring_size);
-
        if (nb_tx_pkts) {
                if (txq->offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE)
                        bnxt_tx_cmp_fast(txq, nb_tx_pkts);