net/cnxk: add cn9k template Tx functions to build
[dpdk.git] / drivers / net / cnxk / cn9k_tx.h
index ed65cd3..8564dd8 100644 (file)
@@ -13,6 +13,8 @@
 #define NIX_TX_OFFLOAD_MBUF_NOFF_F    BIT(3)
 #define NIX_TX_OFFLOAD_TSO_F         BIT(4)
 #define NIX_TX_OFFLOAD_TSTAMP_F              BIT(5)
+#define NIX_TX_OFFLOAD_SECURITY_F     BIT(6)
+#define NIX_TX_OFFLOAD_MAX           (NIX_TX_OFFLOAD_SECURITY_F << 1)
 
 /* Flags to control xmit_prepare function.
  * Defining it from backwards to denote its been
@@ -61,12 +63,12 @@ cn9k_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;
 
@@ -75,18 +77,18 @@ cn9k_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);
 
@@ -101,7 +103,7 @@ cn9k_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);
@@ -151,11 +153,11 @@ cn9k_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;
@@ -167,15 +169,15 @@ cn9k_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
@@ -186,16 +188,16 @@ cn9k_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);
@@ -211,27 +213,27 @@ cn9k_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;
 
@@ -242,20 +244,20 @@ cn9k_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;
@@ -284,7 +286,7 @@ cn9k_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);
        }
 }
 
@@ -296,23 +298,23 @@ cn9k_nix_xmit_prepare_tstamp(uint64_t *cmd, const uint64_t *send_mem_desc,
        if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
                struct nix_send_mem_s *send_mem;
                uint16_t off = (no_segdw - 1) << 1;
-               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);
 
                send_mem = (struct nix_send_mem_s *)(cmd + off);
                if (flags & NIX_TX_MULTI_SEG_F) {
                        /* Retrieving the default desc values */
                        cmd[off] = send_mem_desc[6];
 
-                       /* Using compiler barier to avoid voilation of C
+                       /* Using compiler barrier to avoid violation of C
                         * aliasing rules.
                         */
                        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
+                * next 8 bytes as it corrupts the actual Tx tstamp registered
                 * address.
                 */
                send_mem->w0.cn9k.alg =
@@ -396,7 +398,7 @@ cn9k_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 << (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++;
@@ -553,7 +555,7 @@ cn9k_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);
@@ -562,15 +564,15 @@ cn9k_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;
 
                w1->il4type = NIX_SENDL4TYPE_TCP_CKSUM;
@@ -578,7 +580,7 @@ cn9k_nix_prepare_tso(struct rte_mbuf *m, union nix_send_hdr_w1_u *w1,
                /* Update format for UDP tunneled packet */
                w0->lso_format += is_udp_tun ? 2 : 6;
 
-               w0->lso_format += !!(ol_flags & PKT_TX_OUTER_IPV6) << 1;
+               w0->lso_format += !!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6) << 1;
        }
 }
 
@@ -610,7 +612,7 @@ cn9k_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
 
@@ -627,7 +629,7 @@ cn9k_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++;
@@ -679,7 +681,7 @@ cn9k_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 2 + !!(flags & NIX_TX_NEED_EXT_HDR) +
@@ -1060,26 +1062,26 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                        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
                                       */
                        };
 
@@ -1264,40 +1266,40 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                                {
                                        /* [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
                                               */
                                },
 
@@ -1485,11 +1487,11 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
 
                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 */
@@ -1530,9 +1532,9 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                }
 
                if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
-                       /* Tx ol_flag for timestam. */
-                       const uint64x2_t olf = {PKT_TX_IEEE1588_TMST,
-                                               PKT_TX_IEEE1588_TMST};
+                       /* Tx ol_flag for timestamp. */
+                       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. */
@@ -1626,28 +1628,28 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                        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);
@@ -1666,19 +1668,19 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                        /* 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);
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
@@ -1818,152 +1820,267 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
 #define NOFF_F      NIX_TX_OFFLOAD_MBUF_NOFF_F
 #define TSO_F       NIX_TX_OFFLOAD_TSO_F
 #define TSP_F       NIX_TX_OFFLOAD_TSTAMP_F
-
-/* [TSP] [TSO] [NOFF] [VLAN] [OL3OL4CSUM] [L3L4CSUM] */
-#define NIX_TX_FASTPATH_MODES                                                 \
-T(no_offload,                          0, 0, 0, 0, 0, 0,       4,             \
-               NIX_TX_OFFLOAD_NONE)                                           \
-T(l3l4csum,                            0, 0, 0, 0, 0, 1,       4,             \
-               L3L4CSUM_F)                                                    \
-T(ol3ol4csum,                          0, 0, 0, 0, 1, 0,       4,             \
-               OL3OL4CSUM_F)                                                  \
-T(ol3ol4csum_l3l4csum,                 0, 0, 0, 0, 1, 1,       4,             \
-               OL3OL4CSUM_F | L3L4CSUM_F)                                     \
-T(vlan,                                        0, 0, 0, 1, 0, 0,       6,             \
-               VLAN_F)                                                        \
-T(vlan_l3l4csum,                       0, 0, 0, 1, 0, 1,       6,             \
-               VLAN_F | L3L4CSUM_F)                                           \
-T(vlan_ol3ol4csum,                     0, 0, 0, 1, 1, 0,       6,             \
-               VLAN_F | OL3OL4CSUM_F)                                         \
-T(vlan_ol3ol4csum_l3l4csum,            0, 0, 0, 1, 1, 1,       6,             \
-               VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                            \
-T(noff,                                        0, 0, 1, 0, 0, 0,       4,             \
-               NOFF_F)                                                        \
-T(noff_l3l4csum,                       0, 0, 1, 0, 0, 1,       4,             \
-               NOFF_F | L3L4CSUM_F)                                           \
-T(noff_ol3ol4csum,                     0, 0, 1, 0, 1, 0,       4,             \
-               NOFF_F | OL3OL4CSUM_F)                                         \
-T(noff_ol3ol4csum_l3l4csum,            0, 0, 1, 0, 1, 1,       4,             \
-               NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                            \
-T(noff_vlan,                           0, 0, 1, 1, 0, 0,       6,             \
-               NOFF_F | VLAN_F)                                               \
-T(noff_vlan_l3l4csum,                  0, 0, 1, 1, 0, 1,       6,             \
-               NOFF_F | VLAN_F | L3L4CSUM_F)                                  \
-T(noff_vlan_ol3ol4csum,                        0, 0, 1, 1, 1, 0,       6,             \
-               NOFF_F | VLAN_F | OL3OL4CSUM_F)                                \
-T(noff_vlan_ol3ol4csum_l3l4csum,       0, 0, 1, 1, 1, 1,       6,             \
-               NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                   \
-T(tso,                                 0, 1, 0, 0, 0, 0,       6,             \
-               TSO_F)                                                         \
-T(tso_l3l4csum,                                0, 1, 0, 0, 0, 1,       6,             \
-               TSO_F | L3L4CSUM_F)                                            \
-T(tso_ol3ol4csum,                      0, 1, 0, 0, 1, 0,       6,             \
-               TSO_F | OL3OL4CSUM_F)                                          \
-T(tso_ol3ol4csum_l3l4csum,             0, 1, 0, 0, 1, 1,       6,             \
-               TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                             \
-T(tso_vlan,                            0, 1, 0, 1, 0, 0,       6,             \
-               TSO_F | VLAN_F)                                                \
-T(tso_vlan_l3l4csum,                   0, 1, 0, 1, 0, 1,       6,             \
-               TSO_F | VLAN_F | L3L4CSUM_F)                                   \
-T(tso_vlan_ol3ol4csum,                 0, 1, 0, 1, 1, 0,       6,             \
-               TSO_F | VLAN_F | OL3OL4CSUM_F)                                 \
-T(tso_vlan_ol3ol4csum_l3l4csum,                0, 1, 0, 1, 1, 1,       6,             \
-               TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(tso_noff,                            0, 1, 1, 0, 0, 0,       6,             \
-               TSO_F | NOFF_F)                                                \
-T(tso_noff_l3l4csum,                   0, 1, 1, 0, 0, 1,       6,             \
-               TSO_F | NOFF_F | L3L4CSUM_F)                                   \
-T(tso_noff_ol3ol4csum,                 0, 1, 1, 0, 1, 0,       6,             \
-               TSO_F | NOFF_F | OL3OL4CSUM_F)                                 \
-T(tso_noff_ol3ol4csum_l3l4csum,                0, 1, 1, 0, 1, 1,       6,             \
-               TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(tso_noff_vlan,                       0, 1, 1, 1, 0, 0,       6,             \
-               TSO_F | NOFF_F | VLAN_F)                                       \
-T(tso_noff_vlan_l3l4csum,              0, 1, 1, 1, 0, 1,       6,             \
-               TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                          \
-T(tso_noff_vlan_ol3ol4csum,            0, 1, 1, 1, 1, 0,       6,             \
-               TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                        \
-T(tso_noff_vlan_ol3ol4csum_l3l4csum,   0, 1, 1, 1, 1, 1,       6,             \
-               TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)           \
-T(ts,                                  1, 0, 0, 0, 0, 0,       8,             \
-               TSP_F)                                                         \
-T(ts_l3l4csum,                         1, 0, 0, 0, 0, 1,       8,             \
-               TSP_F | L3L4CSUM_F)                                            \
-T(ts_ol3ol4csum,                       1, 0, 0, 0, 1, 0,       8,             \
-               TSP_F | OL3OL4CSUM_F)                                          \
-T(ts_ol3ol4csum_l3l4csum,              1, 0, 0, 0, 1, 1,       8,             \
-               TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)                             \
-T(ts_vlan,                             1, 0, 0, 1, 0, 0,       8,             \
-               TSP_F | VLAN_F)                                                \
-T(ts_vlan_l3l4csum,                    1, 0, 0, 1, 0, 1,       8,             \
-               TSP_F | VLAN_F | L3L4CSUM_F)                                   \
-T(ts_vlan_ol3ol4csum,                  1, 0, 0, 1, 1, 0,       8,             \
-               TSP_F | VLAN_F | OL3OL4CSUM_F)                                 \
-T(ts_vlan_ol3ol4csum_l3l4csum,         1, 0, 0, 1, 1, 1,       8,             \
-               TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(ts_noff,                             1, 0, 1, 0, 0, 0,       8,             \
-               TSP_F | NOFF_F)                                                \
-T(ts_noff_l3l4csum,                    1, 0, 1, 0, 0, 1,       8,             \
-               TSP_F | NOFF_F | L3L4CSUM_F)                                   \
-T(ts_noff_ol3ol4csum,                  1, 0, 1, 0, 1, 0,       8,             \
-               TSP_F | NOFF_F | OL3OL4CSUM_F)                                 \
-T(ts_noff_ol3ol4csum_l3l4csum,         1, 0, 1, 0, 1, 1,       8,             \
-               TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(ts_noff_vlan,                                1, 0, 1, 1, 0, 0,       8,             \
-               TSP_F | NOFF_F | VLAN_F)                                       \
-T(ts_noff_vlan_l3l4csum,               1, 0, 1, 1, 0, 1,       8,             \
-               TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)                          \
-T(ts_noff_vlan_ol3ol4csum,             1, 0, 1, 1, 1, 0,       8,             \
-               TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                        \
-T(ts_noff_vlan_ol3ol4csum_l3l4csum,    1, 0, 1, 1, 1, 1,       8,             \
-               TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)           \
-T(ts_tso,                              1, 1, 0, 0, 0, 0,       8,             \
-               TSP_F | TSO_F)                                                 \
-T(ts_tso_l3l4csum,                     1, 1, 0, 0, 0, 1,       8,             \
-               TSP_F | TSO_F | L3L4CSUM_F)                                    \
-T(ts_tso_ol3ol4csum,                   1, 1, 0, 0, 1, 0,       8,             \
-               TSP_F | TSO_F | OL3OL4CSUM_F)                                  \
-T(ts_tso_ol3ol4csum_l3l4csum,          1, 1, 0, 0, 1, 1,       8,             \
-               TSP_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                     \
-T(ts_tso_vlan,                         1, 1, 0, 1, 0, 0,       8,             \
-               TSP_F | TSO_F | VLAN_F)                                        \
-T(ts_tso_vlan_l3l4csum,                        1, 1, 0, 1, 0, 1,       8,             \
-               TSP_F | TSO_F | VLAN_F | L3L4CSUM_F)                           \
-T(ts_tso_vlan_ol3ol4csum,              1, 1, 0, 1, 1, 0,       8,             \
-               TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F)                         \
-T(ts_tso_vlan_ol3ol4csum_l3l4csum,     1, 1, 0, 1, 1, 1,       8,             \
-               TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)            \
-T(ts_tso_noff,                         1, 1, 1, 0, 0, 0,       8,             \
-               TSP_F | TSO_F | NOFF_F)                                        \
-T(ts_tso_noff_l3l4csum,                        1, 1, 1, 0, 0, 1,       8,             \
-               TSP_F | TSO_F | NOFF_F | L3L4CSUM_F)                           \
-T(ts_tso_noff_ol3ol4csum,              1, 1, 1, 0, 1, 0,       8,             \
-               TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F)                         \
-T(ts_tso_noff_ol3ol4csum_l3l4csum,     1, 1, 1, 0, 1, 1,       8,             \
-               TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)            \
-T(ts_tso_noff_vlan,                    1, 1, 1, 1, 0, 0,       8,             \
-               TSP_F | TSO_F | NOFF_F | VLAN_F)                               \
-T(ts_tso_noff_vlan_l3l4csum,           1, 1, 1, 1, 0, 1,       8,             \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                  \
-T(ts_tso_noff_vlan_ol3ol4csum,         1, 1, 1, 1, 1, 0,       8,             \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                \
-T(ts_tso_noff_vlan_ol3ol4csum_l3l4csum,        1, 1, 1, 1, 1, 1,       8,             \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
-
-#define T(name, f5, f4, f3, f2, f1, f0, sz, flags)                            \
+#define T_SEC_F      NIX_TX_OFFLOAD_SECURITY_F
+
+/* [T_SEC_F] [TSP] [TSO] [NOFF] [VLAN] [OL3OL4CSUM] [L3L4CSUM] */
+#define NIX_TX_FASTPATH_MODES_0_15                                             \
+       T(no_offload, 4, NIX_TX_OFFLOAD_NONE)                                  \
+       T(l3l4csum, 4, L3L4CSUM_F)                                             \
+       T(ol3ol4csum, 4, OL3OL4CSUM_F)                                         \
+       T(ol3ol4csum_l3l4csum, 4, OL3OL4CSUM_F | L3L4CSUM_F)                   \
+       T(vlan, 6, VLAN_F)                                                     \
+       T(vlan_l3l4csum, 6, VLAN_F | L3L4CSUM_F)                               \
+       T(vlan_ol3ol4csum, 6, VLAN_F | OL3OL4CSUM_F)                           \
+       T(vlan_ol3ol4csum_l3l4csum, 6, VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)     \
+       T(noff, 4, NOFF_F)                                                     \
+       T(noff_l3l4csum, 4, NOFF_F | L3L4CSUM_F)                               \
+       T(noff_ol3ol4csum, 4, NOFF_F | OL3OL4CSUM_F)                           \
+       T(noff_ol3ol4csum_l3l4csum, 4, NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)     \
+       T(noff_vlan, 6, NOFF_F | VLAN_F)                                       \
+       T(noff_vlan_l3l4csum, 6, NOFF_F | VLAN_F | L3L4CSUM_F)                 \
+       T(noff_vlan_ol3ol4csum, 6, NOFF_F | VLAN_F | OL3OL4CSUM_F)             \
+       T(noff_vlan_ol3ol4csum_l3l4csum, 6,                                    \
+         NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_16_31                                            \
+       T(tso, 6, TSO_F)                                                       \
+       T(tso_l3l4csum, 6, TSO_F | L3L4CSUM_F)                                 \
+       T(tso_ol3ol4csum, 6, TSO_F | OL3OL4CSUM_F)                             \
+       T(tso_ol3ol4csum_l3l4csum, 6, TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)       \
+       T(tso_vlan, 6, TSO_F | VLAN_F)                                         \
+       T(tso_vlan_l3l4csum, 6, TSO_F | VLAN_F | L3L4CSUM_F)                   \
+       T(tso_vlan_ol3ol4csum, 6, TSO_F | VLAN_F | OL3OL4CSUM_F)               \
+       T(tso_vlan_ol3ol4csum_l3l4csum, 6,                                     \
+         TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                          \
+       T(tso_noff, 6, TSO_F | NOFF_F)                                         \
+       T(tso_noff_l3l4csum, 6, TSO_F | NOFF_F | L3L4CSUM_F)                   \
+       T(tso_noff_ol3ol4csum, 6, TSO_F | NOFF_F | OL3OL4CSUM_F)               \
+       T(tso_noff_ol3ol4csum_l3l4csum, 6,                                     \
+         TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                          \
+       T(tso_noff_vlan, 6, TSO_F | NOFF_F | VLAN_F)                           \
+       T(tso_noff_vlan_l3l4csum, 6, TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)     \
+       T(tso_noff_vlan_ol3ol4csum, 6, TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F) \
+       T(tso_noff_vlan_ol3ol4csum_l3l4csum, 6,                                \
+         TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_32_47                                            \
+       T(ts, 8, TSP_F)                                                        \
+       T(ts_l3l4csum, 8, TSP_F | L3L4CSUM_F)                                  \
+       T(ts_ol3ol4csum, 8, TSP_F | OL3OL4CSUM_F)                              \
+       T(ts_ol3ol4csum_l3l4csum, 8, TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)        \
+       T(ts_vlan, 8, TSP_F | VLAN_F)                                          \
+       T(ts_vlan_l3l4csum, 8, TSP_F | VLAN_F | L3L4CSUM_F)                    \
+       T(ts_vlan_ol3ol4csum, 8, TSP_F | VLAN_F | OL3OL4CSUM_F)                \
+       T(ts_vlan_ol3ol4csum_l3l4csum, 8,                                      \
+         TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                          \
+       T(ts_noff, 8, TSP_F | NOFF_F)                                          \
+       T(ts_noff_l3l4csum, 8, TSP_F | NOFF_F | L3L4CSUM_F)                    \
+       T(ts_noff_ol3ol4csum, 8, TSP_F | NOFF_F | OL3OL4CSUM_F)                \
+       T(ts_noff_ol3ol4csum_l3l4csum, 8,                                      \
+         TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                          \
+       T(ts_noff_vlan, 8, TSP_F | NOFF_F | VLAN_F)                            \
+       T(ts_noff_vlan_l3l4csum, 8, TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)      \
+       T(ts_noff_vlan_ol3ol4csum, 8, TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)  \
+       T(ts_noff_vlan_ol3ol4csum_l3l4csum, 8,                                 \
+         TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_48_63                                            \
+       T(ts_tso, 8, TSP_F | TSO_F)                                            \
+       T(ts_tso_l3l4csum, 8, TSP_F | TSO_F | L3L4CSUM_F)                      \
+       T(ts_tso_ol3ol4csum, 8, TSP_F | TSO_F | OL3OL4CSUM_F)                  \
+       T(ts_tso_ol3ol4csum_l3l4csum, 8,                                       \
+         TSP_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                           \
+       T(ts_tso_vlan, 8, TSP_F | TSO_F | VLAN_F)                              \
+       T(ts_tso_vlan_l3l4csum, 8, TSP_F | TSO_F | VLAN_F | L3L4CSUM_F)        \
+       T(ts_tso_vlan_ol3ol4csum, 8, TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F)    \
+       T(ts_tso_vlan_ol3ol4csum_l3l4csum, 8,                                  \
+         TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                  \
+       T(ts_tso_noff, 8, TSP_F | TSO_F | NOFF_F)                              \
+       T(ts_tso_noff_l3l4csum, 8, TSP_F | TSO_F | NOFF_F | L3L4CSUM_F)        \
+       T(ts_tso_noff_ol3ol4csum, 8, TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F)    \
+       T(ts_tso_noff_ol3ol4csum_l3l4csum, 8,                                  \
+         TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                  \
+       T(ts_tso_noff_vlan, 8, TSP_F | TSO_F | NOFF_F | VLAN_F)                \
+       T(ts_tso_noff_vlan_l3l4csum, 8,                                        \
+         TSP_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                        \
+       T(ts_tso_noff_vlan_ol3ol4csum, 8,                                      \
+         TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                      \
+       T(ts_tso_noff_vlan_ol3ol4csum_l3l4csum, 8,                             \
+         TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_64_79                                            \
+       T(sec, 4, T_SEC_F)                                                     \
+       T(sec_l3l4csum, 4, T_SEC_F | L3L4CSUM_F)                               \
+       T(sec_ol3ol4csum, 4, T_SEC_F | OL3OL4CSUM_F)                           \
+       T(sec_ol3ol4csum_l3l4csum, 4, T_SEC_F | OL3OL4CSUM_F | L3L4CSUM_F)     \
+       T(sec_vlan, 6, T_SEC_F | VLAN_F)                                       \
+       T(sec_vlan_l3l4csum, 6, T_SEC_F | VLAN_F | L3L4CSUM_F)                 \
+       T(sec_vlan_ol3ol4csum, 6, T_SEC_F | VLAN_F | OL3OL4CSUM_F)             \
+       T(sec_vlan_ol3ol4csum_l3l4csum, 6,                                     \
+         T_SEC_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                        \
+       T(sec_noff, 4, T_SEC_F | NOFF_F)                                       \
+       T(sec_noff_l3l4csum, 4, T_SEC_F | NOFF_F | L3L4CSUM_F)                 \
+       T(sec_noff_ol3ol4csum, 4, T_SEC_F | NOFF_F | OL3OL4CSUM_F)             \
+       T(sec_noff_ol3ol4csum_l3l4csum, 4,                                     \
+         T_SEC_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                        \
+       T(sec_noff_vlan, 6, T_SEC_F | NOFF_F | VLAN_F)                         \
+       T(sec_noff_vlan_l3l4csum, 6, T_SEC_F | NOFF_F | VLAN_F | L3L4CSUM_F)   \
+       T(sec_noff_vlan_ol3ol4csum, 6,                                         \
+         T_SEC_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                            \
+       T(sec_noff_vlan_ol3ol4csum_l3l4csum, 6,                                \
+         T_SEC_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_80_95                                            \
+       T(sec_tso, 6, T_SEC_F | TSO_F)                                         \
+       T(sec_tso_l3l4csum, 6, T_SEC_F | TSO_F | L3L4CSUM_F)                   \
+       T(sec_tso_ol3ol4csum, 6, T_SEC_F | TSO_F | OL3OL4CSUM_F)               \
+       T(sec_tso_ol3ol4csum_l3l4csum, 6,                                      \
+         T_SEC_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                         \
+       T(sec_tso_vlan, 6, T_SEC_F | TSO_F | VLAN_F)                           \
+       T(sec_tso_vlan_l3l4csum, 6, T_SEC_F | TSO_F | VLAN_F | L3L4CSUM_F)     \
+       T(sec_tso_vlan_ol3ol4csum, 6, T_SEC_F | TSO_F | VLAN_F | OL3OL4CSUM_F) \
+       T(sec_tso_vlan_ol3ol4csum_l3l4csum, 6,                                 \
+         T_SEC_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                \
+       T(sec_tso_noff, 6, T_SEC_F | TSO_F | NOFF_F)                           \
+       T(sec_tso_noff_l3l4csum, 6, T_SEC_F | TSO_F | NOFF_F | L3L4CSUM_F)     \
+       T(sec_tso_noff_ol3ol4csum, 6, T_SEC_F | TSO_F | NOFF_F | OL3OL4CSUM_F) \
+       T(sec_tso_noff_ol3ol4csum_l3l4csum, 6,                                 \
+         T_SEC_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                \
+       T(sec_tso_noff_vlan, 6, T_SEC_F | TSO_F | NOFF_F | VLAN_F)             \
+       T(sec_tso_noff_vlan_l3l4csum, 6,                                       \
+         T_SEC_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                      \
+       T(sec_tso_noff_vlan_ol3ol4csum, 6,                                     \
+         T_SEC_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                    \
+       T(sec_tso_noff_vlan_ol3ol4csum_l3l4csum, 6,                            \
+         T_SEC_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_96_111                                           \
+       T(sec_ts, 8, T_SEC_F | TSP_F)                                          \
+       T(sec_ts_l3l4csum, 8, T_SEC_F | TSP_F | L3L4CSUM_F)                    \
+       T(sec_ts_ol3ol4csum, 8, T_SEC_F | TSP_F | OL3OL4CSUM_F)                \
+       T(sec_ts_ol3ol4csum_l3l4csum, 8,                                       \
+         T_SEC_F | TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)                         \
+       T(sec_ts_vlan, 8, T_SEC_F | TSP_F | VLAN_F)                            \
+       T(sec_ts_vlan_l3l4csum, 8, T_SEC_F | TSP_F | VLAN_F | L3L4CSUM_F)      \
+       T(sec_ts_vlan_ol3ol4csum, 8, T_SEC_F | TSP_F | VLAN_F | OL3OL4CSUM_F)  \
+       T(sec_ts_vlan_ol3ol4csum_l3l4csum, 8,                                  \
+         T_SEC_F | TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                \
+       T(sec_ts_noff, 8, T_SEC_F | TSP_F | NOFF_F)                            \
+       T(sec_ts_noff_l3l4csum, 8, T_SEC_F | TSP_F | NOFF_F | L3L4CSUM_F)      \
+       T(sec_ts_noff_ol3ol4csum, 8, T_SEC_F | TSP_F | NOFF_F | OL3OL4CSUM_F)  \
+       T(sec_ts_noff_ol3ol4csum_l3l4csum, 8,                                  \
+         T_SEC_F | TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                \
+       T(sec_ts_noff_vlan, 8, T_SEC_F | TSP_F | NOFF_F | VLAN_F)              \
+       T(sec_ts_noff_vlan_l3l4csum, 8,                                        \
+         T_SEC_F | TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)                      \
+       T(sec_ts_noff_vlan_ol3ol4csum, 8,                                      \
+         T_SEC_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                    \
+       T(sec_ts_noff_vlan_ol3ol4csum_l3l4csum, 8,                             \
+         T_SEC_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_112_127                                          \
+       T(sec_ts_tso, 8, T_SEC_F | TSP_F | TSO_F)                              \
+       T(sec_ts_tso_l3l4csum, 8, T_SEC_F | TSP_F | TSO_F | L3L4CSUM_F)        \
+       T(sec_ts_tso_ol3ol4csum, 8, T_SEC_F | TSP_F | TSO_F | OL3OL4CSUM_F)    \
+       T(sec_ts_tso_ol3ol4csum_l3l4csum, 8,                                   \
+         T_SEC_F | TSP_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                 \
+       T(sec_ts_tso_vlan, 8, T_SEC_F | TSP_F | TSO_F | VLAN_F)                \
+       T(sec_ts_tso_vlan_l3l4csum, 8,                                         \
+         T_SEC_F | TSP_F | TSO_F | VLAN_F | L3L4CSUM_F)                       \
+       T(sec_ts_tso_vlan_ol3ol4csum, 8,                                       \
+         T_SEC_F | TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F)                     \
+       T(sec_ts_tso_vlan_ol3ol4csum_l3l4csum, 8,                              \
+         T_SEC_F | TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)        \
+       T(sec_ts_tso_noff, 8, T_SEC_F | TSP_F | TSO_F | NOFF_F)                \
+       T(sec_ts_tso_noff_l3l4csum, 8,                                         \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | L3L4CSUM_F)                       \
+       T(sec_ts_tso_noff_ol3ol4csum, 8,                                       \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F)                     \
+       T(sec_ts_tso_noff_ol3ol4csum_l3l4csum, 8,                              \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)        \
+       T(sec_ts_tso_noff_vlan, 8, T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F)  \
+       T(sec_ts_tso_noff_vlan_l3l4csum, 8,                                    \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)              \
+       T(sec_ts_tso_noff_vlan_ol3ol4csum, 8,                                  \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)            \
+       T(sec_ts_tso_noff_vlan_ol3ol4csum_l3l4csum, 8,                         \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F |           \
+                 L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES                                                  \
+       NIX_TX_FASTPATH_MODES_0_15                                             \
+       NIX_TX_FASTPATH_MODES_16_31                                            \
+       NIX_TX_FASTPATH_MODES_32_47                                            \
+       NIX_TX_FASTPATH_MODES_48_63                                            \
+       NIX_TX_FASTPATH_MODES_64_79                                            \
+       NIX_TX_FASTPATH_MODES_80_95                                            \
+       NIX_TX_FASTPATH_MODES_96_111                                           \
+       NIX_TX_FASTPATH_MODES_112_127
+
+#define T(name, sz, flags)                                                     \
        uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_##name(           \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_mseg_##name(      \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_vec_##name(       \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_vec_mseg_##name(  \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);
 
 NIX_TX_FASTPATH_MODES
 #undef T
 
+#define NIX_TX_XMIT(fn, sz, flags)                                             \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               uint64_t cmd[sz];                                              \
+               /* For TSO inner checksum is a must */                         \
+               if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&                        \
+                   !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
+                       return 0;                                              \
+               return cn9k_nix_xmit_pkts(tx_queue, tx_pkts, pkts, cmd,        \
+                                         flags);                              \
+       }
+
+#define NIX_TX_XMIT_MSEG(fn, sz, flags)                                        \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2];           \
+               /* For TSO inner checksum is a must */                         \
+               if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&                        \
+                   !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
+                       return 0;                                              \
+               return cn9k_nix_xmit_pkts_mseg(tx_queue, tx_pkts, pkts, cmd,   \
+                                              (flags) | NIX_TX_MULTI_SEG_F);  \
+       }
+
+#define NIX_TX_XMIT_VEC(fn, sz, flags)                                         \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               uint64_t cmd[sz];                                              \
+               /* For TSO inner checksum is a must */                         \
+               if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&                        \
+                   !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
+                       return 0;                                              \
+               return cn9k_nix_xmit_pkts_vector(tx_queue, tx_pkts, pkts, cmd, \
+                                                (flags));                     \
+       }
+
+#define NIX_TX_XMIT_VEC_MSEG(fn, sz, flags)                                    \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2];           \
+               /* For TSO inner checksum is a must */                         \
+               if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&                        \
+                   !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
+                       return 0;                                              \
+               return cn9k_nix_xmit_pkts_vector(tx_queue, tx_pkts, pkts, cmd, \
+                                                (flags) |                     \
+                                                        NIX_TX_MULTI_SEG_F);  \
+       }
+
 #endif /* __CN9K_TX_H__ */