net/ngbe: support MAC filters
[dpdk.git] / drivers / net / cnxk / cn10k_tx.h
index c6f349b..873e187 100644 (file)
@@ -458,12 +458,12 @@ cn10k_nix_xmit_prepare_tso(struct rte_mbuf *m, const uint64_t flags)
 {
        uint64_t mask, ol_flags = m->ol_flags;
 
-       if (flags & NIX_TX_OFFLOAD_TSO_F && (ol_flags & PKT_TX_TCP_SEG)) {
+       if (flags & NIX_TX_OFFLOAD_TSO_F && (ol_flags & RTE_MBUF_F_TX_TCP_SEG)) {
                uintptr_t mdata = rte_pktmbuf_mtod(m, uintptr_t);
                uint16_t *iplen, *oiplen, *oudplen;
                uint16_t lso_sb, paylen;
 
-               mask = -!!(ol_flags & (PKT_TX_OUTER_IPV4 | PKT_TX_OUTER_IPV6));
+               mask = -!!(ol_flags & (RTE_MBUF_F_TX_OUTER_IPV4 | RTE_MBUF_F_TX_OUTER_IPV6));
                lso_sb = (mask & (m->outer_l2_len + m->outer_l3_len)) +
                         m->l2_len + m->l3_len + m->l4_len;
 
@@ -472,18 +472,18 @@ cn10k_nix_xmit_prepare_tso(struct rte_mbuf *m, const uint64_t flags)
 
                /* Get iplen position assuming no tunnel hdr */
                iplen = (uint16_t *)(mdata + m->l2_len +
-                                    (2 << !!(ol_flags & PKT_TX_IPV6)));
+                                    (2 << !!(ol_flags & RTE_MBUF_F_TX_IPV6)));
                /* Handle tunnel tso */
                if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
-                   (ol_flags & PKT_TX_TUNNEL_MASK)) {
+                   (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) {
                        const uint8_t is_udp_tun =
                                (CNXK_NIX_UDP_TUN_BITMASK >>
-                                ((ol_flags & PKT_TX_TUNNEL_MASK) >> 45)) &
+                                ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) >> 45)) &
                                0x1;
 
                        oiplen = (uint16_t *)(mdata + m->outer_l2_len +
                                              (2 << !!(ol_flags &
-                                                      PKT_TX_OUTER_IPV6)));
+                                                      RTE_MBUF_F_TX_OUTER_IPV6)));
                        *oiplen = rte_cpu_to_be_16(rte_be_to_cpu_16(*oiplen) -
                                                   paylen);
 
@@ -498,7 +498,7 @@ cn10k_nix_xmit_prepare_tso(struct rte_mbuf *m, const uint64_t flags)
                        /* Update iplen position to inner ip hdr */
                        iplen = (uint16_t *)(mdata + lso_sb - m->l3_len -
                                             m->l4_len +
-                                            (2 << !!(ol_flags & PKT_TX_IPV6)));
+                                            (2 << !!(ol_flags & RTE_MBUF_F_TX_IPV6)));
                }
 
                *iplen = rte_cpu_to_be_16(rte_be_to_cpu_16(*iplen) - paylen);
@@ -548,11 +548,11 @@ cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
 
        if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
            (flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) {
-               const uint8_t csum = !!(ol_flags & PKT_TX_OUTER_UDP_CKSUM);
+               const uint8_t csum = !!(ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM);
                const uint8_t ol3type =
-                       ((!!(ol_flags & PKT_TX_OUTER_IPV4)) << 1) +
-                       ((!!(ol_flags & PKT_TX_OUTER_IPV6)) << 2) +
-                       !!(ol_flags & PKT_TX_OUTER_IP_CKSUM);
+                       ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV4)) << 1) +
+                       ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6)) << 2) +
+                       !!(ol_flags & RTE_MBUF_F_TX_OUTER_IP_CKSUM);
 
                /* Outer L3 */
                w1.ol3type = ol3type;
@@ -564,15 +564,15 @@ cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                w1.ol4type = csum + (csum << 1);
 
                /* Inner L3 */
-               w1.il3type = ((!!(ol_flags & PKT_TX_IPV4)) << 1) +
-                            ((!!(ol_flags & PKT_TX_IPV6)) << 2);
+               w1.il3type = ((!!(ol_flags & RTE_MBUF_F_TX_IPV4)) << 1) +
+                            ((!!(ol_flags & RTE_MBUF_F_TX_IPV6)) << 2);
                w1.il3ptr = w1.ol4ptr + m->l2_len;
                w1.il4ptr = w1.il3ptr + m->l3_len;
                /* Increment it by 1 if it is IPV4 as 3 is with csum */
-               w1.il3type = w1.il3type + !!(ol_flags & PKT_TX_IP_CKSUM);
+               w1.il3type = w1.il3type + !!(ol_flags & RTE_MBUF_F_TX_IP_CKSUM);
 
                /* Inner L4 */
-               w1.il4type = (ol_flags & PKT_TX_L4_MASK) >> 52;
+               w1.il4type = (ol_flags & RTE_MBUF_F_TX_L4_MASK) >> 52;
 
                /* In case of no tunnel header use only
                 * shift IL3/IL4 fields a bit to use
@@ -583,16 +583,16 @@ cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                       ((w1.u & 0X00000000FFFFFFFF) >> (mask << 4));
 
        } else if (flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) {
-               const uint8_t csum = !!(ol_flags & PKT_TX_OUTER_UDP_CKSUM);
+               const uint8_t csum = !!(ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM);
                const uint8_t outer_l2_len = m->outer_l2_len;
 
                /* Outer L3 */
                w1.ol3ptr = outer_l2_len;
                w1.ol4ptr = outer_l2_len + m->outer_l3_len;
                /* Increment it by 1 if it is IPV4 as 3 is with csum */
-               w1.ol3type = ((!!(ol_flags & PKT_TX_OUTER_IPV4)) << 1) +
-                            ((!!(ol_flags & PKT_TX_OUTER_IPV6)) << 2) +
-                            !!(ol_flags & PKT_TX_OUTER_IP_CKSUM);
+               w1.ol3type = ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV4)) << 1) +
+                            ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6)) << 2) +
+                            !!(ol_flags & RTE_MBUF_F_TX_OUTER_IP_CKSUM);
 
                /* Outer L4 */
                w1.ol4type = csum + (csum << 1);
@@ -608,27 +608,27 @@ cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                w1.ol3ptr = l2_len;
                w1.ol4ptr = l2_len + m->l3_len;
                /* Increment it by 1 if it is IPV4 as 3 is with csum */
-               w1.ol3type = ((!!(ol_flags & PKT_TX_IPV4)) << 1) +
-                            ((!!(ol_flags & PKT_TX_IPV6)) << 2) +
-                            !!(ol_flags & PKT_TX_IP_CKSUM);
+               w1.ol3type = ((!!(ol_flags & RTE_MBUF_F_TX_IPV4)) << 1) +
+                            ((!!(ol_flags & RTE_MBUF_F_TX_IPV6)) << 2) +
+                            !!(ol_flags & RTE_MBUF_F_TX_IP_CKSUM);
 
                /* Inner L4 */
-               w1.ol4type = (ol_flags & PKT_TX_L4_MASK) >> 52;
+               w1.ol4type = (ol_flags & RTE_MBUF_F_TX_L4_MASK) >> 52;
        }
 
        if (flags & NIX_TX_NEED_EXT_HDR && flags & NIX_TX_OFFLOAD_VLAN_QINQ_F) {
-               send_hdr_ext->w1.vlan1_ins_ena = !!(ol_flags & PKT_TX_VLAN);
+               send_hdr_ext->w1.vlan1_ins_ena = !!(ol_flags & RTE_MBUF_F_TX_VLAN);
                /* HW will update ptr after vlan0 update */
                send_hdr_ext->w1.vlan1_ins_ptr = 12;
                send_hdr_ext->w1.vlan1_ins_tci = m->vlan_tci;
 
-               send_hdr_ext->w1.vlan0_ins_ena = !!(ol_flags & PKT_TX_QINQ);
+               send_hdr_ext->w1.vlan0_ins_ena = !!(ol_flags & RTE_MBUF_F_TX_QINQ);
                /* 2B before end of l2 header */
                send_hdr_ext->w1.vlan0_ins_ptr = 12;
                send_hdr_ext->w1.vlan0_ins_tci = m->vlan_tci_outer;
        }
 
-       if (flags & NIX_TX_OFFLOAD_TSO_F && (ol_flags & PKT_TX_TCP_SEG)) {
+       if (flags & NIX_TX_OFFLOAD_TSO_F && (ol_flags & RTE_MBUF_F_TX_TCP_SEG)) {
                uint16_t lso_sb;
                uint64_t mask;
 
@@ -639,20 +639,20 @@ cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                send_hdr_ext->w0.lso = 1;
                send_hdr_ext->w0.lso_mps = m->tso_segsz;
                send_hdr_ext->w0.lso_format =
-                       NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags & PKT_TX_IPV6);
+                       NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags & RTE_MBUF_F_TX_IPV6);
                w1.ol4type = NIX_SENDL4TYPE_TCP_CKSUM;
 
                /* Handle tunnel tso */
                if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
-                   (ol_flags & PKT_TX_TUNNEL_MASK)) {
+                   (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) {
                        const uint8_t is_udp_tun =
                                (CNXK_NIX_UDP_TUN_BITMASK >>
-                                ((ol_flags & PKT_TX_TUNNEL_MASK) >> 45)) &
+                                ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) >> 45)) &
                                0x1;
                        uint8_t shift = is_udp_tun ? 32 : 0;
 
-                       shift += (!!(ol_flags & PKT_TX_OUTER_IPV6) << 4);
-                       shift += (!!(ol_flags & PKT_TX_IPV6) << 3);
+                       shift += (!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6) << 4);
+                       shift += (!!(ol_flags & RTE_MBUF_F_TX_IPV6) << 3);
 
                        w1.il4type = NIX_SENDL4TYPE_TCP_CKSUM;
                        w1.ol4type = is_udp_tun ? NIX_SENDL4TYPE_UDP_CKSUM : 0;
@@ -677,7 +677,7 @@ cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                }
                /* Mark mempool object as "put" since it is freed by NIX */
                if (!send_hdr->w0.df)
-                       __mempool_check_cookies(m->pool, (void **)&m, 1, 0);
+                       RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
        } else {
                sg->seg1_size = m->data_len;
                *(rte_iova_t *)(sg + 1) = rte_mbuf_data_iova(m);
@@ -686,7 +686,7 @@ cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
        }
 
        if (flags & NIX_TX_OFFLOAD_SECURITY_F)
-               *sec = !!(ol_flags & PKT_TX_SEC_OFFLOAD);
+               *sec = !!(ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD);
 }
 
 static __rte_always_inline void
@@ -722,7 +722,7 @@ cn10k_nix_xmit_prepare_tstamp(uintptr_t lmt_addr, const uint64_t *cmd,
                              const uint16_t flags)
 {
        if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
-               const uint8_t is_ol_tstamp = !(ol_flags & PKT_TX_IEEE1588_TMST);
+               const uint8_t is_ol_tstamp = !(ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST);
                struct nix_send_ext_s *send_hdr_ext =
                        (struct nix_send_ext_s *)lmt_addr + 16;
                uint64_t *lmt = (uint64_t *)lmt_addr;
@@ -742,7 +742,7 @@ cn10k_nix_xmit_prepare_tstamp(uintptr_t lmt_addr, const uint64_t *cmd,
                        rte_compiler_barrier();
                }
 
-               /* Packets for which PKT_TX_IEEE1588_TMST is not set, tx tstamp
+               /* Packets for which RTE_MBUF_F_TX_IEEE1588_TMST is not set, tx tstamp
                 * should not be recorded, hence changing the alg type to
                 * NIX_SENDMEMALG_SET and also changing send mem addr field to
                 * next 8 bytes as it corrpt the actual tx tstamp registered
@@ -789,7 +789,7 @@ cn10k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
                /* Mark mempool object as "put" since it is freed by NIX */
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
        if (!(sg_u & (1ULL << 55)))
-               __mempool_check_cookies(m->pool, (void **)&m, 1, 0);
+               RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
        rte_io_wmb();
 #endif
        m = m_next;
@@ -808,7 +808,7 @@ cn10k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
                         */
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
                if (!(sg_u & (1ULL << (i + 55))))
-                       __mempool_check_cookies(m->pool, (void **)&m, 1, 0);
+                       RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
 #endif
                slist++;
                i++;
@@ -1118,7 +1118,7 @@ cn10k_nix_prepare_tso(struct rte_mbuf *m, union nix_send_hdr_w1_u *w1,
        uint16_t lso_sb;
        uint64_t mask;
 
-       if (!(ol_flags & PKT_TX_TCP_SEG))
+       if (!(ol_flags & RTE_MBUF_F_TX_TCP_SEG))
                return;
 
        mask = -(!w1->il3type);
@@ -1127,20 +1127,20 @@ cn10k_nix_prepare_tso(struct rte_mbuf *m, union nix_send_hdr_w1_u *w1,
        w0->u |= BIT(14);
        w0->lso_sb = lso_sb;
        w0->lso_mps = m->tso_segsz;
-       w0->lso_format = NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags & PKT_TX_IPV6);
+       w0->lso_format = NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags & RTE_MBUF_F_TX_IPV6);
        w1->ol4type = NIX_SENDL4TYPE_TCP_CKSUM;
 
        /* Handle tunnel tso */
        if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
-           (ol_flags & PKT_TX_TUNNEL_MASK)) {
+           (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) {
                const uint8_t is_udp_tun =
                        (CNXK_NIX_UDP_TUN_BITMASK >>
-                        ((ol_flags & PKT_TX_TUNNEL_MASK) >> 45)) &
+                        ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) >> 45)) &
                        0x1;
                uint8_t shift = is_udp_tun ? 32 : 0;
 
-               shift += (!!(ol_flags & PKT_TX_OUTER_IPV6) << 4);
-               shift += (!!(ol_flags & PKT_TX_IPV6) << 3);
+               shift += (!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6) << 4);
+               shift += (!!(ol_flags & RTE_MBUF_F_TX_IPV6) << 3);
 
                w1->il4type = NIX_SENDL4TYPE_TCP_CKSUM;
                w1->ol4type = is_udp_tun ? NIX_SENDL4TYPE_UDP_CKSUM : 0;
@@ -1177,7 +1177,7 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd,
                /* Mark mempool object as "put" since it is freed by NIX */
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
        if (!(sg_u & (1ULL << 55)))
-               __mempool_check_cookies(m->pool, (void **)&m, 1, 0);
+               RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
        rte_io_wmb();
 #endif
 
@@ -1194,7 +1194,7 @@ cn10k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd,
                         */
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
                if (!(sg_u & (1ULL << (i + 55))))
-                       __mempool_check_cookies(m->pool, (void **)&m, 1, 0);
+                       RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
                rte_io_wmb();
 #endif
                slist++;
@@ -1235,7 +1235,7 @@ cn10k_nix_prepare_mseg_vec(struct rte_mbuf *m, uint64_t *cmd, uint64x2_t *cmd0,
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
                sg.u = vgetq_lane_u64(cmd1[0], 0);
                if (!(sg.u & (1ULL << 55)))
-                       __mempool_check_cookies(m->pool, (void **)&m, 1, 0);
+                       RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
                rte_io_wmb();
 #endif
                return;
@@ -1425,7 +1425,7 @@ cn10k_nix_xmit_store(struct rte_mbuf *mbuf, uint8_t segdw, uintptr_t laddr,
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
                sg.u = vgetq_lane_u64(cmd1, 0);
                if (!(sg.u & (1ULL << 55)))
-                       __mempool_check_cookies(mbuf->pool, (void **)&mbuf, 1,
+                       RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1,
                                                0);
                rte_io_wmb();
 #endif
@@ -1784,26 +1784,26 @@ again:
                        const uint8x16_t tbl = {
                                /* [0-15] = il4type:il3type */
                                0x04, /* none (IPv6 assumed) */
-                               0x14, /* PKT_TX_TCP_CKSUM (IPv6 assumed) */
-                               0x24, /* PKT_TX_SCTP_CKSUM (IPv6 assumed) */
-                               0x34, /* PKT_TX_UDP_CKSUM (IPv6 assumed) */
-                               0x03, /* PKT_TX_IP_CKSUM */
-                               0x13, /* PKT_TX_IP_CKSUM | PKT_TX_TCP_CKSUM */
-                               0x23, /* PKT_TX_IP_CKSUM | PKT_TX_SCTP_CKSUM */
-                               0x33, /* PKT_TX_IP_CKSUM | PKT_TX_UDP_CKSUM */
-                               0x02, /* PKT_TX_IPV4  */
-                               0x12, /* PKT_TX_IPV4 | PKT_TX_TCP_CKSUM */
-                               0x22, /* PKT_TX_IPV4 | PKT_TX_SCTP_CKSUM */
-                               0x32, /* PKT_TX_IPV4 | PKT_TX_UDP_CKSUM */
-                               0x03, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM */
-                               0x13, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                      * PKT_TX_TCP_CKSUM
+                               0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6 assumed) */
+                               0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM (IPv6 assumed) */
+                               0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6 assumed) */
+                               0x03, /* RTE_MBUF_F_TX_IP_CKSUM */
+                               0x13, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_TCP_CKSUM */
+                               0x23, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_SCTP_CKSUM */
+                               0x33, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_UDP_CKSUM */
+                               0x02, /* RTE_MBUF_F_TX_IPV4  */
+                               0x12, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_TCP_CKSUM */
+                               0x22, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_SCTP_CKSUM */
+                               0x32, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_UDP_CKSUM */
+                               0x03, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM */
+                               0x13, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                      * RTE_MBUF_F_TX_TCP_CKSUM
                                       */
-                               0x23, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                      * PKT_TX_SCTP_CKSUM
+                               0x23, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                      * RTE_MBUF_F_TX_SCTP_CKSUM
                                       */
-                               0x33, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                      * PKT_TX_UDP_CKSUM
+                               0x33, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                      * RTE_MBUF_F_TX_UDP_CKSUM
                                       */
                        };
 
@@ -1988,40 +1988,40 @@ again:
                                {
                                        /* [0-15] = il4type:il3type */
                                        0x04, /* none (IPv6) */
-                                       0x14, /* PKT_TX_TCP_CKSUM (IPv6) */
-                                       0x24, /* PKT_TX_SCTP_CKSUM (IPv6) */
-                                       0x34, /* PKT_TX_UDP_CKSUM (IPv6) */
-                                       0x03, /* PKT_TX_IP_CKSUM */
-                                       0x13, /* PKT_TX_IP_CKSUM |
-                                              * PKT_TX_TCP_CKSUM
+                                       0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6) */
+                                       0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM (IPv6) */
+                                       0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6) */
+                                       0x03, /* RTE_MBUF_F_TX_IP_CKSUM */
+                                       0x13, /* RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_TCP_CKSUM
                                               */
-                                       0x23, /* PKT_TX_IP_CKSUM |
-                                              * PKT_TX_SCTP_CKSUM
+                                       0x23, /* RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_SCTP_CKSUM
                                               */
-                                       0x33, /* PKT_TX_IP_CKSUM |
-                                              * PKT_TX_UDP_CKSUM
+                                       0x33, /* RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_UDP_CKSUM
                                               */
-                                       0x02, /* PKT_TX_IPV4 */
-                                       0x12, /* PKT_TX_IPV4 |
-                                              * PKT_TX_TCP_CKSUM
+                                       0x02, /* RTE_MBUF_F_TX_IPV4 */
+                                       0x12, /* RTE_MBUF_F_TX_IPV4 |
+                                              * RTE_MBUF_F_TX_TCP_CKSUM
                                               */
-                                       0x22, /* PKT_TX_IPV4 |
-                                              * PKT_TX_SCTP_CKSUM
+                                       0x22, /* RTE_MBUF_F_TX_IPV4 |
+                                              * RTE_MBUF_F_TX_SCTP_CKSUM
                                               */
-                                       0x32, /* PKT_TX_IPV4 |
-                                              * PKT_TX_UDP_CKSUM
+                                       0x32, /* RTE_MBUF_F_TX_IPV4 |
+                                              * RTE_MBUF_F_TX_UDP_CKSUM
                                               */
-                                       0x03, /* PKT_TX_IPV4 |
-                                              * PKT_TX_IP_CKSUM
+                                       0x03, /* RTE_MBUF_F_TX_IPV4 |
+                                              * RTE_MBUF_F_TX_IP_CKSUM
                                               */
-                                       0x13, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                              * PKT_TX_TCP_CKSUM
+                                       0x13, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_TCP_CKSUM
                                               */
-                                       0x23, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                              * PKT_TX_SCTP_CKSUM
+                                       0x23, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_SCTP_CKSUM
                                               */
-                                       0x33, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                              * PKT_TX_UDP_CKSUM
+                                       0x33, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_UDP_CKSUM
                                               */
                                },
 
@@ -2209,11 +2209,11 @@ again:
 
                if (flags & NIX_TX_OFFLOAD_VLAN_QINQ_F) {
                        /* Tx ol_flag for vlan. */
-                       const uint64x2_t olv = {PKT_TX_VLAN, PKT_TX_VLAN};
+                       const uint64x2_t olv = {RTE_MBUF_F_TX_VLAN, RTE_MBUF_F_TX_VLAN};
                        /* Bit enable for VLAN1 */
                        const uint64x2_t mlv = {BIT_ULL(49), BIT_ULL(49)};
                        /* Tx ol_flag for QnQ. */
-                       const uint64x2_t olq = {PKT_TX_QINQ, PKT_TX_QINQ};
+                       const uint64x2_t olq = {RTE_MBUF_F_TX_QINQ, RTE_MBUF_F_TX_QINQ};
                        /* Bit enable for VLAN0 */
                        const uint64x2_t mlq = {BIT_ULL(48), BIT_ULL(48)};
                        /* Load vlan values from packet. outer is VLAN 0 */
@@ -2255,8 +2255,8 @@ again:
 
                if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
                        /* Tx ol_flag for timestam. */
-                       const uint64x2_t olf = {PKT_TX_IEEE1588_TMST,
-                                               PKT_TX_IEEE1588_TMST};
+                       const uint64x2_t olf = {RTE_MBUF_F_TX_IEEE1588_TMST,
+                                               RTE_MBUF_F_TX_IEEE1588_TMST};
                        /* Set send mem alg to SUB. */
                        const uint64x2_t alg = {BIT_ULL(59), BIT_ULL(59)};
                        /* Increment send mem address by 8. */
@@ -2352,28 +2352,28 @@ again:
                        if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf0))
                                vsetq_lane_u64(0x80000, xmask01, 0);
                        else
-                               __mempool_check_cookies(
+                               RTE_MEMPOOL_CHECK_COOKIES(
                                        ((struct rte_mbuf *)mbuf0)->pool,
                                        (void **)&mbuf0, 1, 0);
 
                        if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf1))
                                vsetq_lane_u64(0x80000, xmask01, 1);
                        else
-                               __mempool_check_cookies(
+                               RTE_MEMPOOL_CHECK_COOKIES(
                                        ((struct rte_mbuf *)mbuf1)->pool,
                                        (void **)&mbuf1, 1, 0);
 
                        if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf2))
                                vsetq_lane_u64(0x80000, xmask23, 0);
                        else
-                               __mempool_check_cookies(
+                               RTE_MEMPOOL_CHECK_COOKIES(
                                        ((struct rte_mbuf *)mbuf2)->pool,
                                        (void **)&mbuf2, 1, 0);
 
                        if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf3))
                                vsetq_lane_u64(0x80000, xmask23, 1);
                        else
-                               __mempool_check_cookies(
+                               RTE_MEMPOOL_CHECK_COOKIES(
                                        ((struct rte_mbuf *)mbuf3)->pool,
                                        (void **)&mbuf3, 1, 0);
                        senddesc01_w0 = vorrq_u64(senddesc01_w0, xmask01);
@@ -2389,19 +2389,19 @@ again:
                        /* Mark mempool object as "put" since
                         * it is freed by NIX
                         */
-                       __mempool_check_cookies(
+                       RTE_MEMPOOL_CHECK_COOKIES(
                                ((struct rte_mbuf *)mbuf0)->pool,
                                (void **)&mbuf0, 1, 0);
 
-                       __mempool_check_cookies(
+                       RTE_MEMPOOL_CHECK_COOKIES(
                                ((struct rte_mbuf *)mbuf1)->pool,
                                (void **)&mbuf1, 1, 0);
 
-                       __mempool_check_cookies(
+                       RTE_MEMPOOL_CHECK_COOKIES(
                                ((struct rte_mbuf *)mbuf2)->pool,
                                (void **)&mbuf2, 1, 0);
 
-                       __mempool_check_cookies(
+                       RTE_MEMPOOL_CHECK_COOKIES(
                                ((struct rte_mbuf *)mbuf3)->pool,
                                (void **)&mbuf3, 1, 0);
                }
@@ -2425,8 +2425,8 @@ again:
                }
 
                if (flags & NIX_TX_OFFLOAD_SECURITY_F) {
-                       const uint64x2_t olf = {PKT_TX_SEC_OFFLOAD,
-                                               PKT_TX_SEC_OFFLOAD};
+                       const uint64x2_t olf = {RTE_MBUF_F_TX_SEC_OFFLOAD,
+                                               RTE_MBUF_F_TX_SEC_OFFLOAD};
                        uintptr_t next;
                        uint8_t dw;