net/bnxt: fix Rx configuration

[dpdk.git] / drivers / net / dpaa2 / dpaa2_rxtx.c

diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index b8844fb..c17f6eb 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -179,6 +179,9 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
                if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_OPT_PRESENT |
                        L3_IP_N_OPT_PRESENT))
                        pkt_type |= RTE_PTYPE_L3_IPV4_EXT;
+               if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_IPSEC_ESP_PRESENT |
+                                       L3_PROTO_ESP_PRESENT))
+                       pkt_type |= RTE_PTYPE_TUNNEL_ESP;
 
        } else if (BIT_ISSET_AT_POS(annotation->word4, L3_IPV6_1_PRESENT |
                  L3_IPV6_N_PRESENT)) {
@@ -186,6 +189,9 @@ dpaa2_dev_rx_parse_slow(struct rte_mbuf *mbuf,
                if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_OPT_PRESENT |
                    L3_IP_N_OPT_PRESENT))
                        pkt_type |= RTE_PTYPE_L3_IPV6_EXT;
+               if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_IPSEC_ESP_PRESENT |
+                                       L3_PROTO_ESP_PRESENT))
+                       pkt_type |= RTE_PTYPE_TUNNEL_ESP;
        } else {
                goto parse_done;
        }
@@ -312,6 +318,10 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd,
                        dpaa2_dev_rx_parse(first_seg, hw_annot_addr);
 
        rte_mbuf_refcnt_set(first_seg, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+       rte_mempool_check_cookies(rte_mempool_from_obj((void *)first_seg),
+                       (void **)&first_seg, 1, 1);
+#endif
        cur_seg = first_seg;
        while (!DPAA2_SG_IS_FINAL(sge)) {
                sge = &sgt[i++];
@@ -324,6 +334,10 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd,
                next_seg->data_len  = sge->length  & 0x1FFFF;
                first_seg->nb_segs += 1;
                rte_mbuf_refcnt_set(next_seg, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+               rte_mempool_check_cookies(rte_mempool_from_obj((void *)next_seg),
+                               (void **)&next_seg, 1, 1);
+#endif
                cur_seg->next = next_seg;
                next_seg->next = NULL;
                cur_seg = next_seg;
@@ -331,6 +345,10 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd,
        temp = DPAA2_INLINE_MBUF_FROM_BUF(fd_addr,
                rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size);
        rte_mbuf_refcnt_set(temp, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+               rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp),
+                               (void **)&temp, 1, 1);
+#endif
        rte_pktmbuf_free_seg(temp);
 
        return (void *)first_seg;
@@ -356,6 +374,10 @@ eth_fd_to_mbuf(const struct qbman_fd *fd,
        mbuf->port = port_id;
        mbuf->next = NULL;
        rte_mbuf_refcnt_set(mbuf, 1);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+       rte_mempool_check_cookies(rte_mempool_from_obj((void *)mbuf),
+                       (void **)&mbuf, 1, 1);
+#endif
 
        /* Parse the packet */
        /* parse results for LX2 are there in FRC field of FD.
@@ -404,6 +426,10 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
                        rte_mbuf_refcnt_update(temp, -1);
                } else {
                        DPAA2_SET_ONLY_FD_BPID(fd, bpid);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+                       rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp),
+                                       (void **)&temp, 1, 0);
+#endif
                }
                DPAA2_SET_FD_OFFSET(fd, offset);
        } else {
@@ -414,6 +440,10 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
                }
                DPAA2_SET_ONLY_FD_BPID(fd, bpid);
                DPAA2_SET_FD_OFFSET(fd, temp->data_off);
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+               rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp),
+                       (void **)&temp, 1, 0);
+#endif
        }
        DPAA2_SET_FD_ADDR(fd, DPAA2_MBUF_VADDR_TO_IOVA(temp));
        DPAA2_SET_FD_LEN(fd, mbuf->pkt_len);
@@ -450,6 +480,10 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf,
                                } else {
                                        DPAA2_SET_FLE_BPID(sge,
                                                mempool_to_bpid(cur_seg->pool));
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+                               rte_mempool_check_cookies(rte_mempool_from_obj((void *)cur_seg),
+                                       (void **)&cur_seg, 1, 0);
+#endif
                                }
                        }
                        cur_seg = cur_seg->next;
@@ -500,6 +534,11 @@ eth_mbuf_to_fd(struct rte_mbuf *mbuf,
                        DPAA2_SET_FD_IVP(fd);
                        rte_mbuf_refcnt_update(mbuf, -1);
                }
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+               else
+                       rte_mempool_check_cookies(rte_mempool_from_obj((void *)mbuf),
+                               (void **)&mbuf, 1, 0);
+#endif
        } else if (RTE_MBUF_HAS_EXTBUF(mbuf)) {
                DPAA2_SET_FD_IVP(fd);
        } else {
@@ -539,6 +578,10 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
 
        DPAA2_MBUF_TO_CONTIG_FD(m, fd, bpid);
 
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+       rte_mempool_check_cookies(rte_mempool_from_obj((void *)m),
+               (void **)&m, 1, 0);
+#endif
        DPAA2_PMD_DP_DEBUG(
                "mbuf: %p, BMAN buf addr: %p, fdaddr: %" PRIx64 ", bpid: %d,"
                " meta: %d, off: %d, len: %d\n",
@@ -1260,6 +1303,11 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                                        }
                                        DPAA2_MBUF_TO_CONTIG_FD((*bufs),
                                        &fd_arr[loop], mempool_to_bpid(mp));
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+                                       rte_mempool_check_cookies
+                                               (rte_mempool_from_obj((void *)*bufs),
+                                               (void **)bufs, 1, 0);
+#endif
                                        bufs++;
 #ifdef RTE_LIBRTE_IEEE1588
                                        enable_tx_tstamp(&fd_arr[loop]);
@@ -1408,7 +1456,8 @@ skip_tx:
 }
 
 void
-dpaa2_dev_free_eqresp_buf(uint16_t eqresp_ci)
+dpaa2_dev_free_eqresp_buf(uint16_t eqresp_ci,
+                         __rte_unused struct dpaa2_queue *dpaa2_q)
 {
        struct dpaa2_dpio_dev *dpio_dev = DPAA2_PER_LCORE_DPIO;
        struct qbman_fd *fd;