net/bnxt: remove spurious warning in Rx handler

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

diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 1a6fb79..1f47db9 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -12,7 +12,6 @@
 #include <rte_memory.h>
 
 #include "bnxt.h"
-#include "bnxt_cpr.h"
 #include "bnxt_ring.h"
 #include "bnxt_rxr.h"
 #include "bnxt_rxq.h"
@@ -64,18 +63,22 @@ static inline int bnxt_alloc_ag_data(struct bnxt_rx_queue *rxq,
        struct bnxt_sw_rx_bd *rx_buf = &rxr->ag_buf_ring[prod];
        struct rte_mbuf *mbuf;
 
+       if (rxbd == NULL) {
+               PMD_DRV_LOG(ERR, "Jumbo Frame. rxbd is NULL\n");
+               return -EINVAL;
+       }
+
+       if (rx_buf == NULL) {
+               PMD_DRV_LOG(ERR, "Jumbo Frame. rx_buf is NULL\n");
+               return -EINVAL;
+       }
+
        mbuf = __bnxt_alloc_rx_data(rxq->mb_pool);
        if (!mbuf) {
                rte_atomic64_inc(&rxq->rx_mbuf_alloc_fail);
                return -ENOMEM;
        }
 
-       if (rxbd == NULL)
-               PMD_DRV_LOG(ERR, "Jumbo Frame. rxbd is NULL\n");
-       if (rx_buf == NULL)
-               PMD_DRV_LOG(ERR, "Jumbo Frame. rx_buf is NULL\n");
-
-
        rx_buf->mbuf = mbuf;
        mbuf->data_off = RTE_PKTMBUF_HEADROOM;
 
@@ -485,10 +488,10 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
        if (flags_type & RX_PKT_CMPL_FLAGS_RSS_VALID) {
                mbuf->hash.rss = rxcmp->rss_hash;
                mbuf->ol_flags |= PKT_RX_RSS_HASH;
-       } else {
-               mbuf->hash.fdir.id = rxcmp1->cfa_code;
-               mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
        }
+
+       bnxt_set_mark_in_mbuf(rxq->bp, rxcmp1, mbuf);
+
 #ifdef RTE_LIBRTE_IEEE1588
        if (unlikely((flags_type & RX_PKT_CMPL_FLAGS_MASK) ==
                     RX_PKT_CMPL_FLAGS_ITYPE_PTP_W_TIMESTAMP)) {
@@ -509,15 +512,21 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
 
        flags2_f = flags2_0xf(rxcmp1);
        /* IP Checksum */
-       if (unlikely(((IS_IP_NONTUNNEL_PKT(flags2_f)) &&
-                     (RX_CMP_IP_CS_ERROR(rxcmp1))) ||
-                    (IS_IP_TUNNEL_PKT(flags2_f) &&
-                     (RX_CMP_IP_OUTER_CS_ERROR(rxcmp1))))) {
-               mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
-       } else if (unlikely(RX_CMP_IP_CS_UNKNOWN(rxcmp1))) {
-               mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
-       } else {
-               mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+       if (likely(IS_IP_NONTUNNEL_PKT(flags2_f))) {
+               if (unlikely(RX_CMP_IP_CS_ERROR(rxcmp1)))
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+               else if (unlikely(RX_CMP_IP_CS_UNKNOWN(rxcmp1)))
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
+               else
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+       } else if (IS_IP_TUNNEL_PKT(flags2_f)) {
+               if (unlikely(RX_CMP_IP_OUTER_CS_ERROR(rxcmp1) ||
+                            RX_CMP_IP_CS_ERROR(rxcmp1)))
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+               else if (unlikely(RX_CMP_IP_CS_UNKNOWN(rxcmp1)))
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
+               else
+                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
        }
 
        /* L4 Checksum */
@@ -636,6 +645,9 @@ uint16_t bnxt_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                        evt =
                        bnxt_event_hwrm_resp_handler(rxq->bp,
                                                     (struct cmpl_base *)rxcmp);
+                       /* If the async event is Fatal error, return */
+                       if (unlikely(is_bnxt_in_error(rxq->bp)))
+                               goto done;
                }
 
                raw_cons = NEXT_RAW_CMP(raw_cons);
@@ -742,7 +754,6 @@ void bnxt_free_rx_rings(struct bnxt *bp)
 int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)
 {
        struct bnxt_cp_ring_info *cpr;
-       struct bnxt_cp_ring_info *nqr;
        struct bnxt_rx_ring_info *rxr;
        struct bnxt_ring *ring;
 
@@ -789,32 +800,6 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id)
        ring->vmem_size = 0;
        ring->vmem = NULL;
 
-       if (BNXT_HAS_NQ(rxq->bp)) {
-               nqr = rte_zmalloc_socket("bnxt_rx_ring_cq",
-                                        sizeof(struct bnxt_cp_ring_info),
-                                        RTE_CACHE_LINE_SIZE, socket_id);
-               if (nqr == NULL)
-                       return -ENOMEM;
-
-               rxq->nq_ring = nqr;
-
-               ring = rte_zmalloc_socket("bnxt_rx_ring_struct",
-                                         sizeof(struct bnxt_ring),
-                                         RTE_CACHE_LINE_SIZE, socket_id);
-               if (ring == NULL)
-                       return -ENOMEM;
-
-               nqr->cp_ring_struct = ring;
-               ring->ring_size =
-                       rte_align32pow2(rxr->rx_ring_struct->ring_size *
-                                       (2 + AGG_RING_SIZE_FACTOR));
-               ring->ring_mask = ring->ring_size - 1;
-               ring->bd = (void *)nqr->cp_desc_ring;
-               ring->bd_dma = nqr->cp_desc_mapping;
-               ring->vmem_size = 0;
-               ring->vmem = NULL;
-       }
-
        /* Allocate Aggregator rings */
        ring = rte_zmalloc_socket("bnxt_rx_ring_struct",
                                   sizeof(struct bnxt_ring),
@@ -910,3 +895,44 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
 
        return 0;
 }
+
+void bnxt_set_mark_in_mbuf(struct bnxt *bp,
+                          struct rx_pkt_cmpl_hi *rxcmp1,
+                          struct rte_mbuf *mbuf)
+{
+       uint32_t cfa_code = 0;
+       uint8_t meta_fmt =  0;
+       uint16_t flags2 = 0;
+       uint32_t meta =  0;
+
+       cfa_code = rte_le_to_cpu_16(rxcmp1->cfa_code);
+       if (!cfa_code)
+               return;
+
+       if (cfa_code && !bp->mark_table[cfa_code].valid)
+               return;
+
+       flags2 = rte_le_to_cpu_16(rxcmp1->flags2);
+       meta = rte_le_to_cpu_32(rxcmp1->metadata);
+       if (meta) {
+               meta >>= BNXT_RX_META_CFA_CODE_SHIFT;
+
+               /*
+                * The flags field holds extra bits of info from [6:4]
+                * which indicate if the flow is in TCAM or EM or EEM
+                */
+               meta_fmt = (flags2 & BNXT_CFA_META_FMT_MASK) >>
+                          BNXT_CFA_META_FMT_SHFT;
+
+               /*
+                * meta_fmt == 4 => 'b100 => 'b10x => EM.
+                * meta_fmt == 5 => 'b101 => 'b10x => EM + VLAN
+                * meta_fmt == 6 => 'b110 => 'b11x => EEM
+                * meta_fmt == 7 => 'b111 => 'b11x => EEM + VLAN.
+                */
+               meta_fmt >>= BNXT_CFA_META_FMT_EM_EEM_SHFT;
+       }
+
+       mbuf->hash.fdir.hi = bp->mark_table[cfa_code].mark_id;
+       mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
+}