net/bnxt: remove unnecessary variable assignment

[dpdk.git] / drivers / net / bnxt / bnxt_rxtx_vec_sse.c

diff --git a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
index adc5020..22d9f9e 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
+++ b/drivers/net/bnxt/bnxt_rxtx_vec_sse.c
@@ -157,6 +157,52 @@ bnxt_parse_pkt_type(struct rx_pkt_cmpl *rxcmp, struct rx_pkt_cmpl_hi *rxcmp1)
        return pkt_type;
 }
 
+static void
+bnxt_parse_csum(struct rte_mbuf *mbuf, struct rx_pkt_cmpl_hi *rxcmp1)
+{
+       uint32_t flags;
+
+       flags = flags2_0xf(rxcmp1);
+       /* IP Checksum */
+       if (likely(IS_IP_NONTUNNEL_PKT(flags))) {
+               if (unlikely(RX_CMP_IP_CS_ERROR(rxcmp1)))
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+               else
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+       } else if (IS_IP_TUNNEL_PKT(flags)) {
+               if (unlikely(RX_CMP_IP_OUTER_CS_ERROR(rxcmp1) ||
+                            RX_CMP_IP_CS_ERROR(rxcmp1)))
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+               else
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+       } else if (unlikely(RX_CMP_IP_CS_UNKNOWN(rxcmp1))) {
+               mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
+       }
+
+       /* L4 Checksum */
+       if (likely(IS_L4_NONTUNNEL_PKT(flags))) {
+               if (unlikely(RX_CMP_L4_INNER_CS_ERR2(rxcmp1)))
+                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+               else
+                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+       } else if (IS_L4_TUNNEL_PKT(flags)) {
+               if (unlikely(RX_CMP_L4_INNER_CS_ERR2(rxcmp1)))
+                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+               else
+                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+               if (unlikely(RX_CMP_L4_OUTER_CS_ERR2(rxcmp1))) {
+                       mbuf->ol_flags |= PKT_RX_OUTER_L4_CKSUM_BAD;
+               } else if (unlikely(IS_L4_TUNNEL_PKT_ONLY_INNER_L4_CS
+                                   (flags))) {
+                       mbuf->ol_flags |= PKT_RX_OUTER_L4_CKSUM_UNKNOWN;
+               } else {
+                       mbuf->ol_flags |= PKT_RX_OUTER_L4_CKSUM_GOOD;
+               }
+       } else if (unlikely(RX_CMP_L4_CS_UNKNOWN(rxcmp1))) {
+               mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
+       }
+}
+
 uint16_t
 bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
                   uint16_t nb_pkts)
@@ -178,7 +224,7 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
                             0xFF, 0xFF, 0xFF, 0xFF); /* pkt_type (zeroes) */
 
        /* If Rx Q was stopped return */
-       if (rxq->rx_deferred_start)
+       if (unlikely(!rxq->rx_started))
                return 0;
 
        if (rxq->rxrearm_nb >= RTE_BNXT_RXQ_REARM_THRESH)
@@ -199,10 +245,6 @@ bnxt_recv_pkts_vec(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 (likely(CMP_TYPE(rxcmp) == RX_PKT_CMPL_TYPE_RX_L2)) {
                        struct rx_pkt_cmpl_hi *rxcmp1;
                        uint32_t tmp_raw_cons;
@@ -226,10 +268,6 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
                        rte_prefetch0(mbuf);
                        rxr->rx_buf_ring[cons].mbuf = NULL;
 
-                       cpr->valid = FLIP_VALID(cp_cons,
-                                               cpr->cp_ring_struct->ring_mask,
-                                               cpr->valid);
-
                        /* Set constant fields from mbuf initializer. */
                        _mm_store_si128((__m128i *)&mbuf->rearm_data,
                                        mbuf_init);
@@ -254,6 +292,7 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
                                mbuf->ol_flags |= PKT_RX_VLAN;
                        }
 
+                       bnxt_parse_csum(mbuf, rxcmp1);
                        mbuf->packet_type = bnxt_parse_pkt_type(rxcmp, rxcmp1);
 
                        rx_pkts[nb_rx_pkts++] = mbuf;
@@ -271,22 +310,13 @@ bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 
        rxq->rxrearm_nb += nb_rx_pkts;
        cpr->cp_raw_cons = raw_cons;
+       cpr->valid = !!(cpr->cp_raw_cons & cpr->cp_ring_struct->ring_size);
        if (nb_rx_pkts || evt)
                bnxt_db_cq(cpr);
 
        return nb_rx_pkts;
 }
 
-static inline void bnxt_next_cmpl(struct bnxt_cp_ring_info *cpr, uint32_t *idx,
-                                 bool *v, uint32_t inc)
-{
-       *idx += inc;
-       if (unlikely(*idx == cpr->cp_ring_struct->ring_size)) {
-               *v = !*v;
-               *idx = 0;
-       }
-}
-
 static void
 bnxt_tx_cmp_vec(struct bnxt_tx_queue *txq, int nr_pkts)
 {
@@ -332,10 +362,8 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)
                cons = RING_CMPL(ring_mask, raw_cons);
                txcmp = (struct tx_cmpl *)&cp_desc_ring[cons];
 
-               if (!CMPL_VALID(txcmp, cpr->valid))
+               if (!CMP_VALID(txcmp, raw_cons, cp_ring_struct))
                        break;
-               bnxt_next_cmpl(cpr, &cons, &cpr->valid, 1);
-               rte_prefetch0(&cp_desc_ring[cons]);
 
                if (likely(CMP_TYPE(txcmp) == TX_CMPL_TYPE_TX_L2))
                        nb_tx_pkts += txcmp->opaque;
@@ -343,9 +371,10 @@ bnxt_handle_tx_cp_vec(struct bnxt_tx_queue *txq)
                        RTE_LOG_DP(ERR, PMD,
                                   "Unhandled CMP type %02x\n",
                                   CMP_TYPE(txcmp));
-               raw_cons = cons;
+               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) {
                bnxt_tx_cmp_vec(txq, nb_tx_pkts);
                cpr->cp_raw_cons = raw_cons;
@@ -435,7 +464,7 @@ bnxt_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts,
        struct bnxt_tx_queue *txq = tx_queue;
 
        /* Tx queue was stopped; wait for it to be restarted */
-       if (unlikely(txq->tx_deferred_start)) {
+       if (unlikely(!txq->tx_started)) {
                PMD_DRV_LOG(DEBUG, "Tx q stopped;return\n");
                return 0;
        }