net/bnxt: support clear on read

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

diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h
index 79f1458..a84f016 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.h
+++ b/drivers/net/bnxt/bnxt_rxr.h
@@ -42,7 +42,12 @@ static inline uint16_t bnxt_tpa_start_agg_id(struct bnxt *bp,
                RX_PKT_CMPL_AGG_BUFS_SFT)
 
 /* Number of descriptors to process per inner loop in vector mode. */
-#define RTE_BNXT_DESCS_PER_LOOP                4U
+#define BNXT_RX_DESCS_PER_LOOP_VEC128  4U /* SSE, Neon */
+#define BNXT_RX_DESCS_PER_LOOP_VEC256  8U /* AVX2 */
+
+/* Number of extra Rx mbuf ring entries to allocate for vector mode. */
+#define BNXT_RX_EXTRA_MBUF_ENTRIES \
+       RTE_MAX(BNXT_RX_DESCS_PER_LOOP_VEC128, BNXT_RX_DESCS_PER_LOOP_VEC256)
 
 #define BNXT_OL_FLAGS_TBL_DIM  64
 #define BNXT_OL_FLAGS_ERR_TBL_DIM 32
@@ -66,6 +71,7 @@ struct bnxt_rx_ring_info {
        uint16_t                rx_raw_prod;
        uint16_t                ag_raw_prod;
        uint16_t                rx_cons; /* Needed for representor */
+       uint16_t                rx_next_cons;
        struct bnxt_db_info     rx_db;
        struct bnxt_db_info     ag_db;
 
@@ -106,6 +112,10 @@ uint16_t bnxt_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,
 int bnxt_rxq_vec_setup(struct bnxt_rx_queue *rxq);
 #endif
 
+#if defined(RTE_ARCH_X86) && defined(CC_AVX2_SUPPORT)
+uint16_t bnxt_recv_pkts_vec_avx2(void *rx_queue, struct rte_mbuf **rx_pkts,
+                                uint16_t nb_pkts);
+#endif
 void bnxt_set_mark_in_mbuf(struct bnxt *bp,
                           struct rx_pkt_cmpl_hi *rxcmp1,
                           struct rte_mbuf *mbuf);
@@ -175,6 +185,16 @@ bnxt_check_ptype_constants(void)
 
 extern uint32_t bnxt_ptype_table[BNXT_PTYPE_TBL_DIM];
 
+static inline void bnxt_set_vlan(struct rx_pkt_cmpl_hi *rxcmp1,
+                                struct rte_mbuf *mbuf)
+{
+       uint32_t metadata = rte_le_to_cpu_32(rxcmp1->metadata);
+
+       mbuf->vlan_tci = metadata & (RX_PKT_CMPL_METADATA_VID_MASK |
+                                    RX_PKT_CMPL_METADATA_DE |
+                                    RX_PKT_CMPL_METADATA_PRI_MASK);
+}
+
 /* Stingray2 specific code for RX completion parsing */
 #define RX_CMP_VLAN_VALID(rxcmp)        \
        (((struct rx_pkt_v2_cmpl *)rxcmp)->metadata1_payload_offset &   \
@@ -192,7 +212,7 @@ static inline void bnxt_rx_vlan_v2(struct rte_mbuf *mbuf,
 {
        if (RX_CMP_VLAN_VALID(rxcmp)) {
                mbuf->vlan_tci = RX_CMP_METADATA0_VID(rxcmp1);
-               mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+               mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
        }
 }
 
@@ -256,47 +276,47 @@ static inline void bnxt_parse_csum_v2(struct rte_mbuf *mbuf,
                        t_pkt = 1;
 
                if (unlikely(RX_CMP_V2_L4_CS_ERR(error_v2)))
-                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
                else if (flags2 & RX_CMP_FLAGS2_L4_CSUM_ALL_OK_MASK)
-                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
                else
-                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
 
                if (unlikely(RX_CMP_V2_L3_CS_ERR(error_v2)))
-                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
                else if (flags2 & RX_CMP_FLAGS2_IP_CSUM_ALL_OK_MASK)
-                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
                else
-                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_UNKNOWN;
        } else {
                hdr_cnt = RX_CMP_V2_L4_CS_OK(flags2);
                if (hdr_cnt > 1)
                        t_pkt = 1;
 
                if (RX_CMP_V2_L4_CS_OK(flags2))
-                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
                else if (RX_CMP_V2_L4_CS_ERR(error_v2))
-                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
                else
-                       mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
 
                if (RX_CMP_V2_L3_CS_OK(flags2))
-                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
                else if (RX_CMP_V2_L3_CS_ERR(error_v2))
-                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
                else
-                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_UNKNOWN;
        }
 
        if (t_pkt) {
                if (unlikely(RX_CMP_V2_OT_L4_CS_ERR(error_v2) ||
                                        RX_CMP_V2_T_L4_CS_ERR(error_v2)))
-                       mbuf->ol_flags |= PKT_RX_OUTER_L4_CKSUM_BAD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_OUTER_L4_CKSUM_BAD;
                else
-                       mbuf->ol_flags |= PKT_RX_OUTER_L4_CKSUM_GOOD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD;
 
                if (unlikely(RX_CMP_V2_T_IP_CS_ERR(error_v2)))
-                       mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
        }
 }