net/mlx5: fix RSS expansion for patterns with ICMP item
[dpdk.git] / drivers / net / cnxk / cn10k_tx.h
index c6f349b..ea13866 100644 (file)
@@ -16,6 +16,7 @@
 #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
@@ -185,23 +186,57 @@ cn10k_cpt_tx_steor_data(void)
 }
 
 static __rte_always_inline void
-cn10k_nix_tx_skeleton(const struct cn10k_eth_txq *txq, uint64_t *cmd,
-                     const uint16_t flags)
+cn10k_nix_tx_skeleton(struct cn10k_eth_txq *txq, uint64_t *cmd,
+                     const uint16_t flags, const uint16_t static_sz)
 {
-       /* Send hdr */
-       cmd[0] = txq->send_hdr_w0;
+       if (static_sz)
+               cmd[0] = txq->send_hdr_w0;
+       else
+               cmd[0] = (txq->send_hdr_w0 & 0xFFFFF00000000000) |
+                        ((uint64_t)(cn10k_nix_tx_ext_subs(flags) + 1) << 40);
        cmd[1] = 0;
-       cmd += 2;
 
-       /* Send ext if present */
        if (flags & NIX_TX_NEED_EXT_HDR) {
-               *(__uint128_t *)cmd = *(const __uint128_t *)txq->cmd;
-               cmd += 2;
+               if (flags & NIX_TX_OFFLOAD_TSTAMP_F)
+                       cmd[2] = (NIX_SUBDC_EXT << 60) | BIT_ULL(15);
+               else
+                       cmd[2] = NIX_SUBDC_EXT << 60;
+               cmd[3] = 0;
+               cmd[4] = (NIX_SUBDC_SG << 60) | BIT_ULL(48);
+       } else {
+               cmd[2] = (NIX_SUBDC_SG << 60) | BIT_ULL(48);
        }
+}
 
-       /* Send sg */
-       cmd[0] = txq->sg_w0;
-       cmd[1] = 0;
+static __rte_always_inline void
+cn10k_nix_sec_fc_wait(struct cn10k_eth_txq *txq, uint16_t nb_pkts)
+{
+       int32_t nb_desc, val, newval;
+       int32_t *fc_sw;
+       volatile uint64_t *fc;
+
+       /* Check if there is any CPT instruction to submit */
+       if (!nb_pkts)
+               return;
+
+again:
+       fc_sw = txq->cpt_fc_sw;
+       val = __atomic_sub_fetch(fc_sw, nb_pkts, __ATOMIC_RELAXED);
+       if (likely(val >= 0))
+               return;
+
+       nb_desc = txq->cpt_desc;
+       fc = txq->cpt_fc;
+       while (true) {
+               newval = nb_desc - __atomic_load_n(fc, __ATOMIC_RELAXED);
+               newval -= nb_pkts;
+               if (newval >= 0)
+                       break;
+       }
+
+       if (!__atomic_compare_exchange_n(fc_sw, &val, newval, false,
+                                        __ATOMIC_RELAXED, __ATOMIC_RELAXED))
+               goto again;
 }
 
 static __rte_always_inline void
@@ -242,20 +277,41 @@ cn10k_nix_prep_sec_vec(struct rte_mbuf *m, uint64x2_t *cmd0, uint64x2_t *cmd1,
 {
        struct cn10k_sec_sess_priv sess_priv;
        uint32_t pkt_len, dlen_adj, rlen;
+       uint8_t l3l4type, chksum;
        uint64x2_t cmd01, cmd23;
+       uint8_t l2_len, l3_len;
        uintptr_t dptr, nixtx;
        uint64_t ucode_cmd[4];
        uint64_t *laddr;
-       uint8_t l2_len;
        uint16_t tag;
        uint64_t sa;
 
        sess_priv.u64 = *rte_security_dynfield(m);
 
-       if (flags & NIX_TX_NEED_SEND_HDR_W1)
-               l2_len = vgetq_lane_u8(*cmd0, 8);
-       else
+       if (flags & NIX_TX_NEED_SEND_HDR_W1) {
+               /* Extract l3l4type either from il3il4type or ol3ol4type */
+               if (flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F &&
+                   flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) {
+                       l2_len = vgetq_lane_u8(*cmd0, 10);
+                       /* L4 ptr from send hdr includes l2 and l3 len */
+                       l3_len = vgetq_lane_u8(*cmd0, 11) - l2_len;
+                       l3l4type = vgetq_lane_u8(*cmd0, 13);
+               } else {
+                       l2_len = vgetq_lane_u8(*cmd0, 8);
+                       /* L4 ptr from send hdr includes l2 and l3 len */
+                       l3_len = vgetq_lane_u8(*cmd0, 9) - l2_len;
+                       l3l4type = vgetq_lane_u8(*cmd0, 12);
+               }
+
+               chksum = (l3l4type & 0x1) << 1 | !!(l3l4type & 0x30);
+               chksum = ~chksum;
+               sess_priv.chksum = sess_priv.chksum & chksum;
+               /* Clear SEND header flags */
+               *cmd0 = vsetq_lane_u16(0, *cmd0, 6);
+       } else {
                l2_len = m->l2_len;
+               l3_len = m->l3_len;
+       }
 
        /* Retrieve DPTR */
        dptr = vgetq_lane_u64(*cmd1, 1);
@@ -263,6 +319,8 @@ cn10k_nix_prep_sec_vec(struct rte_mbuf *m, uint64x2_t *cmd0, uint64x2_t *cmd1,
 
        /* Calculate dlen adj */
        dlen_adj = pkt_len - l2_len;
+       /* Exclude l3 len from roundup for transport mode */
+       dlen_adj -= sess_priv.mode ? 0 : l3_len;
        rlen = (dlen_adj + sess_priv.roundup_len) +
               (sess_priv.roundup_byte - 1);
        rlen &= ~(uint64_t)(sess_priv.roundup_byte - 1);
@@ -287,8 +345,9 @@ cn10k_nix_prep_sec_vec(struct rte_mbuf *m, uint64x2_t *cmd0, uint64x2_t *cmd1,
        sa_base &= ~0xFFFFUL;
        sa = (uintptr_t)roc_nix_inl_ot_ipsec_outb_sa(sa_base, sess_priv.sa_idx);
        ucode_cmd[3] = (ROC_CPT_DFLT_ENG_GRP_SE_IE << 61 | 1UL << 60 | sa);
-       ucode_cmd[0] =
-               (ROC_IE_OT_MAJOR_OP_PROCESS_OUTBOUND_IPSEC << 48 | pkt_len);
+       ucode_cmd[0] = (ROC_IE_OT_MAJOR_OP_PROCESS_OUTBOUND_IPSEC << 48 |
+                       ((uint64_t)sess_priv.chksum) << 32 |
+                       ((uint64_t)sess_priv.dec_ttl) << 34 | pkt_len);
 
        /* CPT Word 0 and Word 1 */
        cmd01 = vdupq_n_u64((nixtx + 16) | (cn10k_nix_tx_ext_subs(flags) + 1));
@@ -339,12 +398,13 @@ cn10k_nix_prep_sec(struct rte_mbuf *m, uint64_t *cmd, uintptr_t *nixtx_addr,
        struct cn10k_sec_sess_priv sess_priv;
        uint32_t pkt_len, dlen_adj, rlen;
        struct nix_send_hdr_s *send_hdr;
+       uint8_t l3l4type, chksum;
        uint64x2_t cmd01, cmd23;
        union nix_send_sg_s *sg;
+       uint8_t l2_len, l3_len;
        uintptr_t dptr, nixtx;
        uint64_t ucode_cmd[4];
        uint64_t *laddr;
-       uint8_t l2_len;
        uint16_t tag;
        uint64_t sa;
 
@@ -356,10 +416,30 @@ cn10k_nix_prep_sec(struct rte_mbuf *m, uint64_t *cmd, uintptr_t *nixtx_addr,
        else
                sg = (union nix_send_sg_s *)&cmd[2];
 
-       if (flags & NIX_TX_NEED_SEND_HDR_W1)
-               l2_len = cmd[1] & 0xFF;
-       else
+       if (flags & NIX_TX_NEED_SEND_HDR_W1) {
+               /* Extract l3l4type either from il3il4type or ol3ol4type */
+               if (flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F &&
+                   flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) {
+                       l2_len = (cmd[1] >> 16) & 0xFF;
+                       /* L4 ptr from send hdr includes l2 and l3 len */
+                       l3_len = ((cmd[1] >> 24) & 0xFF) - l2_len;
+                       l3l4type = (cmd[1] >> 40) & 0xFF;
+               } else {
+                       l2_len = cmd[1] & 0xFF;
+                       /* L4 ptr from send hdr includes l2 and l3 len */
+                       l3_len = ((cmd[1] >> 8) & 0xFF) - l2_len;
+                       l3l4type = (cmd[1] >> 32) & 0xFF;
+               }
+
+               chksum = (l3l4type & 0x1) << 1 | !!(l3l4type & 0x30);
+               chksum = ~chksum;
+               sess_priv.chksum = sess_priv.chksum & chksum;
+               /* Clear SEND header flags */
+               cmd[1] &= ~(0xFFFFUL << 32);
+       } else {
                l2_len = m->l2_len;
+               l3_len = m->l3_len;
+       }
 
        /* Retrieve DPTR */
        dptr = *(uint64_t *)(sg + 1);
@@ -367,6 +447,8 @@ cn10k_nix_prep_sec(struct rte_mbuf *m, uint64_t *cmd, uintptr_t *nixtx_addr,
 
        /* Calculate dlen adj */
        dlen_adj = pkt_len - l2_len;
+       /* Exclude l3 len from roundup for transport mode */
+       dlen_adj -= sess_priv.mode ? 0 : l3_len;
        rlen = (dlen_adj + sess_priv.roundup_len) +
               (sess_priv.roundup_byte - 1);
        rlen &= ~(uint64_t)(sess_priv.roundup_byte - 1);
@@ -391,8 +473,9 @@ cn10k_nix_prep_sec(struct rte_mbuf *m, uint64_t *cmd, uintptr_t *nixtx_addr,
        sa_base &= ~0xFFFFUL;
        sa = (uintptr_t)roc_nix_inl_ot_ipsec_outb_sa(sa_base, sess_priv.sa_idx);
        ucode_cmd[3] = (ROC_CPT_DFLT_ENG_GRP_SE_IE << 61 | 1UL << 60 | sa);
-       ucode_cmd[0] =
-               (ROC_IE_OT_MAJOR_OP_PROCESS_OUTBOUND_IPSEC << 48 | pkt_len);
+       ucode_cmd[0] = (ROC_IE_OT_MAJOR_OP_PROCESS_OUTBOUND_IPSEC << 48 |
+                       ((uint64_t)sess_priv.chksum) << 32 |
+                       ((uint64_t)sess_priv.dec_ttl) << 34 | pkt_len);
 
        /* CPT Word 0 and Word 1. Assume no multi-seg support */
        cmd01 = vdupq_n_u64((nixtx + 16) | (cn10k_nix_tx_ext_subs(flags) + 1));
@@ -458,12 +541,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 +555,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 +581,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);
@@ -507,13 +590,16 @@ cn10k_nix_xmit_prepare_tso(struct rte_mbuf *m, const uint64_t flags)
 
 static __rte_always_inline void
 cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
-                      const uint64_t lso_tun_fmt, bool *sec)
+                      const uint64_t lso_tun_fmt, bool *sec, uint8_t mark_flag,
+                      uint64_t mark_fmt)
 {
+       uint8_t mark_off = 0, mark_vlan = 0, markptr = 0;
        struct nix_send_ext_s *send_hdr_ext;
        struct nix_send_hdr_s *send_hdr;
        uint64_t ol_flags = 0, mask;
        union nix_send_hdr_w1_u w1;
        union nix_send_sg_s *sg;
+       uint16_t mark_form = 0;
 
        send_hdr = (struct nix_send_hdr_s *)cmd;
        if (flags & NIX_TX_NEED_EXT_HDR) {
@@ -521,7 +607,9 @@ cn10k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                sg = (union nix_send_sg_s *)(cmd + 4);
                /* Clear previous markings */
                send_hdr_ext->w0.lso = 0;
+               send_hdr_ext->w0.mark_en = 0;
                send_hdr_ext->w1.u = 0;
+               ol_flags = m->ol_flags;
        } else {
                sg = (union nix_send_sg_s *)(cmd + 2);
        }
@@ -548,11 +636,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 +652,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 +671,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 +696,47 @@ 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);
+               const uint8_t ipv6 = !!(ol_flags & RTE_MBUF_F_TX_IPV6);
+               const uint8_t ip = !!(ol_flags & (RTE_MBUF_F_TX_IPV4 |
+                                                 RTE_MBUF_F_TX_IPV6));
+
+               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;
+               /* Fill for VLAN marking only when VLAN insertion enabled */
+               mark_vlan = ((mark_flag & CNXK_TM_MARK_VLAN_DEI) &
+                            (send_hdr_ext->w1.vlan1_ins_ena ||
+                             send_hdr_ext->w1.vlan0_ins_ena));
+
+               /* Mask requested flags with packet data information */
+               mark_off = mark_flag & ((ip << 2) | (ip << 1) | mark_vlan);
+               mark_off = ffs(mark_off & CNXK_TM_MARK_MASK);
+
+               mark_form = (mark_fmt >> ((mark_off - !!mark_off) << 4));
+               mark_form = (mark_form >> (ipv6 << 3)) & 0xFF;
+               markptr = m->l2_len + (mark_form >> 7) - (mark_vlan << 2);
+
+               send_hdr_ext->w0.mark_en = !!mark_off;
+               send_hdr_ext->w0.markform = mark_form & 0x7F;
+               send_hdr_ext->w0.markptr = markptr;
        }
 
-       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 +747,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 +785,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 +794,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
@@ -717,41 +825,29 @@ cn10k_nix_xmit_mv_lmt_base(uintptr_t lmt_addr, uint64_t *cmd,
 }
 
 static __rte_always_inline void
-cn10k_nix_xmit_prepare_tstamp(uintptr_t lmt_addr, const uint64_t *cmd,
+cn10k_nix_xmit_prepare_tstamp(struct cn10k_eth_txq *txq, uintptr_t lmt_addr,
                              const uint64_t ol_flags, const uint16_t no_segdw,
                              const uint16_t flags)
 {
        if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
-               const uint8_t is_ol_tstamp = !(ol_flags & PKT_TX_IEEE1588_TMST);
-               struct nix_send_ext_s *send_hdr_ext =
-                       (struct nix_send_ext_s *)lmt_addr + 16;
+               const uint8_t is_ol_tstamp =
+                       !(ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST);
                uint64_t *lmt = (uint64_t *)lmt_addr;
                uint16_t off = (no_segdw - 1) << 1;
                struct nix_send_mem_s *send_mem;
 
                send_mem = (struct nix_send_mem_s *)(lmt + off);
-               send_hdr_ext->w0.subdc = NIX_SUBDC_EXT;
-               send_hdr_ext->w0.tstmp = 1;
-               if (flags & NIX_TX_MULTI_SEG_F) {
-                       /* Retrieving the default desc values */
-                       lmt[off] = cmd[2];
-
-                       /* Using compiler barier to avoid voilation of C
-                        * aliasing rules.
-                        */
-                       rte_compiler_barrier();
-               }
-
                /* Packets for which PKT_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
+                * NIX_SENDMEMALG_SUB and also changing send mem addr field to
+                * next 8 bytes as it corrupts the actual Tx tstamp registered
                 * address.
                 */
                send_mem->w0.subdc = NIX_SUBDC_MEM;
-               send_mem->w0.alg = NIX_SENDMEMALG_SETTSTMP - (is_ol_tstamp);
+               send_mem->w0.alg =
+                       NIX_SENDMEMALG_SETTSTMP + (is_ol_tstamp << 3);
                send_mem->addr =
-                       (rte_iova_t)(((uint64_t *)cmd[3]) + is_ol_tstamp);
+                       (rte_iova_t)(((uint64_t *)txq->ts_mem) + is_ol_tstamp);
        }
 }
 
@@ -789,7 +885,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 +904,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++;
@@ -840,8 +936,8 @@ done:
 }
 
 static __rte_always_inline uint16_t
-cn10k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
-                   uint64_t *cmd, uintptr_t base, const uint16_t flags)
+cn10k_nix_xmit_pkts(void *tx_queue, uint64_t *ws, struct rte_mbuf **tx_pkts,
+                   uint16_t pkts, uint64_t *cmd, const uint16_t flags)
 {
        struct cn10k_eth_txq *txq = tx_queue;
        const rte_iova_t io_addr = txq->io_addr;
@@ -849,8 +945,10 @@ cn10k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
        uintptr_t pa, lbase = txq->lmt_base;
        uint16_t lmt_id, burst, left, i;
        uintptr_t c_lbase = lbase;
+       uint64_t lso_tun_fmt = 0;
+       uint64_t mark_fmt = 0;
+       uint8_t mark_flag = 0;
        rte_iova_t c_io_addr;
-       uint64_t lso_tun_fmt;
        uint16_t c_lmt_id;
        uint64_t sa_base;
        uintptr_t laddr;
@@ -862,13 +960,17 @@ cn10k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
                /* Reduce the cached count */
                txq->fc_cache_pkts -= pkts;
        }
-
        /* Get cmd skeleton */
-       cn10k_nix_tx_skeleton(txq, cmd, flags);
+       cn10k_nix_tx_skeleton(txq, cmd, flags, !(flags & NIX_TX_VWQE_F));
 
        if (flags & NIX_TX_OFFLOAD_TSO_F)
                lso_tun_fmt = txq->lso_tun_fmt;
 
+       if (flags & NIX_TX_OFFLOAD_VLAN_QINQ_F) {
+               mark_fmt = txq->mark_fmt;
+               mark_flag = txq->mark_flag;
+       }
+
        /* Get LMT base address and LMT ID as lcore id */
        ROC_LMT_BASE_ID_GET(lbase, lmt_id);
        if (flags & NIX_TX_OFFLOAD_SECURITY_F) {
@@ -896,7 +998,7 @@ again:
                        cn10k_nix_xmit_prepare_tso(tx_pkts[i], flags);
 
                cn10k_nix_xmit_prepare(tx_pkts[i], cmd, flags, lso_tun_fmt,
-                                      &sec);
+                                      &sec, mark_flag, mark_fmt);
 
                laddr = (uintptr_t)LMT_OFF(lbase, lnum, 0);
 
@@ -908,14 +1010,14 @@ again:
 
                /* Move NIX desc to LMT/NIXTX area */
                cn10k_nix_xmit_mv_lmt_base(laddr, cmd, flags);
-               cn10k_nix_xmit_prepare_tstamp(laddr, &txq->cmd[0],
-                                             tx_pkts[i]->ol_flags, 4, flags);
+               cn10k_nix_xmit_prepare_tstamp(txq, laddr, tx_pkts[i]->ol_flags,
+                                             4, flags);
                if (!(flags & NIX_TX_OFFLOAD_SECURITY_F) || !sec)
                        lnum++;
        }
 
-       if (flags & NIX_TX_VWQE_F)
-               roc_sso_hws_head_wait(base);
+       if ((flags & NIX_TX_VWQE_F) && !(ws[1] & BIT_ULL(35)))
+               ws[1] = roc_sso_hws_head_wait(ws[0]);
 
        left -= burst;
        tx_pkts += burst;
@@ -924,6 +1026,7 @@ again:
        if (flags & NIX_TX_OFFLOAD_SECURITY_F) {
                /* Reduce pkts to be sent to CPT */
                burst -= ((c_lnum << 1) + c_loff);
+               cn10k_nix_sec_fc_wait(txq, (c_lnum << 1) + c_loff);
                cn10k_nix_sec_steorl(c_io_addr, c_lmt_id, c_lnum, c_loff,
                                     c_shft);
        }
@@ -966,9 +1069,9 @@ again:
 }
 
 static __rte_always_inline uint16_t
-cn10k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
-                        uint16_t pkts, uint64_t *cmd, uintptr_t base,
-                        const uint16_t flags)
+cn10k_nix_xmit_pkts_mseg(void *tx_queue, uint64_t *ws,
+                        struct rte_mbuf **tx_pkts, uint16_t pkts,
+                        uint64_t *cmd, const uint16_t flags)
 {
        struct cn10k_eth_txq *txq = tx_queue;
        uintptr_t pa0, pa1, lbase = txq->lmt_base;
@@ -976,9 +1079,11 @@ cn10k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
        uint16_t segdw, lmt_id, burst, left, i;
        uint8_t lnum, c_lnum, c_loff;
        uintptr_t c_lbase = lbase;
+       uint64_t lso_tun_fmt = 0;
+       uint64_t mark_fmt = 0;
+       uint8_t mark_flag = 0;
        uint64_t data0, data1;
        rte_iova_t c_io_addr;
-       uint64_t lso_tun_fmt;
        uint8_t shft, c_shft;
        __uint128_t data128;
        uint16_t c_lmt_id;
@@ -986,16 +1091,22 @@ cn10k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
        uintptr_t laddr;
        bool sec;
 
-       NIX_XMIT_FC_OR_RETURN(txq, pkts);
-
-       cn10k_nix_tx_skeleton(txq, cmd, flags);
-
-       /* Reduce the cached count */
-       txq->fc_cache_pkts -= pkts;
+       if (!(flags & NIX_TX_VWQE_F)) {
+               NIX_XMIT_FC_OR_RETURN(txq, pkts);
+               /* Reduce the cached count */
+               txq->fc_cache_pkts -= pkts;
+       }
+       /* Get cmd skeleton */
+       cn10k_nix_tx_skeleton(txq, cmd, flags, !(flags & NIX_TX_VWQE_F));
 
        if (flags & NIX_TX_OFFLOAD_TSO_F)
                lso_tun_fmt = txq->lso_tun_fmt;
 
+       if (flags & NIX_TX_OFFLOAD_VLAN_QINQ_F) {
+               mark_fmt = txq->mark_fmt;
+               mark_flag = txq->mark_flag;
+       }
+
        /* Get LMT base address and LMT ID as lcore id */
        ROC_LMT_BASE_ID_GET(lbase, lmt_id);
        if (flags & NIX_TX_OFFLOAD_SECURITY_F) {
@@ -1025,7 +1136,7 @@ again:
                        cn10k_nix_xmit_prepare_tso(tx_pkts[i], flags);
 
                cn10k_nix_xmit_prepare(tx_pkts[i], cmd, flags, lso_tun_fmt,
-                                      &sec);
+                                      &sec, mark_flag, mark_fmt);
 
                laddr = (uintptr_t)LMT_OFF(lbase, lnum, 0);
 
@@ -1037,13 +1148,11 @@ again:
 
                /* Move NIX desc to LMT/NIXTX area */
                cn10k_nix_xmit_mv_lmt_base(laddr, cmd, flags);
-
                /* Store sg list directly on lmt line */
                segdw = cn10k_nix_prepare_mseg(tx_pkts[i], (uint64_t *)laddr,
                                               flags);
-               cn10k_nix_xmit_prepare_tstamp(laddr, &txq->cmd[0],
-                                             tx_pkts[i]->ol_flags, segdw,
-                                             flags);
+               cn10k_nix_xmit_prepare_tstamp(txq, laddr, tx_pkts[i]->ol_flags,
+                                             segdw, flags);
                if (!(flags & NIX_TX_OFFLOAD_SECURITY_F) || !sec) {
                        lnum++;
                        data128 |= (((__uint128_t)(segdw - 1)) << shft);
@@ -1051,8 +1160,8 @@ again:
                }
        }
 
-       if (flags & NIX_TX_VWQE_F)
-               roc_sso_hws_head_wait(base);
+       if ((flags & NIX_TX_VWQE_F) && !(ws[1] & BIT_ULL(35)))
+               ws[1] = roc_sso_hws_head_wait(ws[0]);
 
        left -= burst;
        tx_pkts += burst;
@@ -1061,6 +1170,7 @@ again:
        if (flags & NIX_TX_OFFLOAD_SECURITY_F) {
                /* Reduce pkts to be sent to CPT */
                burst -= ((c_lnum << 1) + c_loff);
+               cn10k_nix_sec_fc_wait(txq, (c_lnum << 1) + c_loff);
                cn10k_nix_sec_steorl(c_io_addr, c_lmt_id, c_lnum, c_loff,
                                     c_shft);
        }
@@ -1118,7 +1228,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 +1237,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 +1287,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 +1304,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 +1345,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 +1535,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
@@ -1473,9 +1583,9 @@ cn10k_nix_xmit_store(struct rte_mbuf *mbuf, uint8_t segdw, uintptr_t laddr,
 }
 
 static __rte_always_inline uint16_t
-cn10k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
-                          uint16_t pkts, uint64_t *cmd, uintptr_t base,
-                          const uint16_t flags)
+cn10k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
+                          struct rte_mbuf **tx_pkts, uint16_t pkts,
+                          uint64_t *cmd, const uint16_t flags)
 {
        uint64x2_t dataoff_iova0, dataoff_iova1, dataoff_iova2, dataoff_iova3;
        uint64x2_t len_olflags0, len_olflags1, len_olflags2, len_olflags3;
@@ -1525,25 +1635,42 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                        cn10k_nix_xmit_prepare_tso(tx_pkts[i], flags);
        }
 
-       senddesc01_w0 = vld1q_dup_u64(&txq->send_hdr_w0);
+       if (!(flags & NIX_TX_VWQE_F)) {
+               senddesc01_w0 = vld1q_dup_u64(&txq->send_hdr_w0);
+       } else {
+               uint64_t w0 =
+                       (txq->send_hdr_w0 & 0xFFFFF00000000000) |
+                       ((uint64_t)(cn10k_nix_tx_ext_subs(flags) + 1) << 40);
+
+               senddesc01_w0 = vdupq_n_u64(w0);
+       }
        senddesc23_w0 = senddesc01_w0;
+
        senddesc01_w1 = vdupq_n_u64(0);
        senddesc23_w1 = senddesc01_w1;
-       sgdesc01_w0 = vld1q_dup_u64(&txq->sg_w0);
+       sgdesc01_w0 = vdupq_n_u64((NIX_SUBDC_SG << 60) | BIT_ULL(48));
        sgdesc23_w0 = sgdesc01_w0;
 
-       /* Load command defaults into vector variables. */
        if (flags & NIX_TX_NEED_EXT_HDR) {
-               sendext01_w0 = vld1q_dup_u64(&txq->cmd[0]);
-               sendext23_w0 = sendext01_w0;
-               sendext01_w1 = vdupq_n_u64(12 | 12U << 24);
-               sendext23_w1 = sendext01_w1;
                if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
-                       sendmem01_w0 = vld1q_dup_u64(&txq->cmd[2]);
+                       sendext01_w0 = vdupq_n_u64((NIX_SUBDC_EXT << 60) |
+                                                  BIT_ULL(15));
+                       sendmem01_w0 =
+                               vdupq_n_u64((NIX_SUBDC_MEM << 60) |
+                                           (NIX_SENDMEMALG_SETTSTMP << 56));
                        sendmem23_w0 = sendmem01_w0;
-                       sendmem01_w1 = vld1q_dup_u64(&txq->cmd[3]);
+                       sendmem01_w1 = vdupq_n_u64(txq->ts_mem);
                        sendmem23_w1 = sendmem01_w1;
+               } else {
+                       sendext01_w0 = vdupq_n_u64((NIX_SUBDC_EXT << 60));
                }
+               sendext23_w0 = sendext01_w0;
+
+               if (flags & NIX_TX_OFFLOAD_VLAN_QINQ_F)
+                       sendext01_w1 = vdupq_n_u64(12 | 12U << 24);
+               else
+                       sendext01_w1 = vdupq_n_u64(0);
+               sendext23_w1 = sendext01_w1;
        }
 
        /* Get LMT base address and LMT ID as lcore id */
@@ -1784,26 +1911,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 +2115,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 +2336,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 */
@@ -2254,9 +2381,9 @@ 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};
+                       /* 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. */
@@ -2352,28 +2479,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 +2516,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 +2552,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;
 
@@ -2562,6 +2689,13 @@ again:
                        lnum += 1;
                }
 
+               if (flags & NIX_TX_MULTI_SEG_F) {
+                       tx_pkts[0]->next = NULL;
+                       tx_pkts[1]->next = NULL;
+                       tx_pkts[2]->next = NULL;
+                       tx_pkts[3]->next = NULL;
+               }
+
                tx_pkts = tx_pkts + NIX_DESCS_PER_LOOP;
        }
 
@@ -2575,15 +2709,17 @@ again:
        if (flags & (NIX_TX_MULTI_SEG_F | NIX_TX_OFFLOAD_SECURITY_F))
                wd.data[0] >>= 16;
 
-       if (flags & NIX_TX_VWQE_F)
-               roc_sso_hws_head_wait(base);
+       if ((flags & NIX_TX_VWQE_F) && !(ws[1] & BIT_ULL(35)))
+               ws[1] = roc_sso_hws_head_wait(ws[0]);
 
        left -= burst;
 
        /* Submit CPT instructions if any */
-       if (flags & NIX_TX_OFFLOAD_SECURITY_F)
+       if (flags & NIX_TX_OFFLOAD_SECURITY_F) {
+               cn10k_nix_sec_fc_wait(txq, (c_lnum << 1) + c_loff);
                cn10k_nix_sec_steorl(c_io_addr, c_lmt_id, c_lnum, c_loff,
                                     c_shft);
+       }
 
        /* Trigger LMTST */
        if (lnum > 16) {
@@ -2639,12 +2775,11 @@ again:
 
        if (unlikely(scalar)) {
                if (flags & NIX_TX_MULTI_SEG_F)
-                       pkts += cn10k_nix_xmit_pkts_mseg(tx_queue, tx_pkts,
-                                                        scalar, cmd, base,
-                                                        flags);
+                       pkts += cn10k_nix_xmit_pkts_mseg(tx_queue, ws, tx_pkts,
+                                                        scalar, cmd, flags);
                else
-                       pkts += cn10k_nix_xmit_pkts(tx_queue, tx_pkts, scalar,
-                                                   cmd, base, flags);
+                       pkts += cn10k_nix_xmit_pkts(tx_queue, ws, tx_pkts,
+                                                   scalar, cmd, flags);
        }
 
        return pkts;
@@ -2652,16 +2787,16 @@ again:
 
 #else
 static __rte_always_inline uint16_t
-cn10k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
-                          uint16_t pkts, uint64_t *cmd, uintptr_t base,
-                          const uint16_t flags)
+cn10k_nix_xmit_pkts_vector(void *tx_queue, uint64_t *ws,
+                          struct rte_mbuf **tx_pkts, uint16_t pkts,
+                          uint64_t *cmd, const uint16_t flags)
 {
+       RTE_SET_USED(ws);
        RTE_SET_USED(tx_queue);
        RTE_SET_USED(tx_pkts);
        RTE_SET_USED(pkts);
        RTE_SET_USED(cmd);
        RTE_SET_USED(flags);
-       RTE_SET_USED(base);
        return 0;
 }
 #endif
@@ -2675,279 +2810,265 @@ cn10k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
 #define T_SEC_F      NIX_TX_OFFLOAD_SECURITY_F
 
 /* [T_SEC_F] [TSP] [TSO] [NOFF] [VLAN] [OL3OL4CSUM] [L3L4CSUM] */
-#define NIX_TX_FASTPATH_MODES                                          \
-T(no_offload,                          0, 0, 0, 0, 0, 0, 0,    4,      \
-               NIX_TX_OFFLOAD_NONE)                                    \
-T(l3l4csum,                            0, 0, 0, 0, 0, 0, 1,    4,      \
-               L3L4CSUM_F)                                             \
-T(ol3ol4csum,                          0, 0, 0, 0, 0, 1, 0,    4,      \
-               OL3OL4CSUM_F)                                           \
-T(ol3ol4csum_l3l4csum,                 0, 0, 0, 0, 0, 1, 1,    4,      \
-               OL3OL4CSUM_F | L3L4CSUM_F)                              \
-T(vlan,                                        0, 0, 0, 0, 1, 0, 0,    6,      \
-               VLAN_F)                                                 \
-T(vlan_l3l4csum,                       0, 0, 0, 0, 1, 0, 1,    6,      \
-               VLAN_F | L3L4CSUM_F)                                    \
-T(vlan_ol3ol4csum,                     0, 0, 0, 0, 1, 1, 0,    6,      \
-               VLAN_F | OL3OL4CSUM_F)                                  \
-T(vlan_ol3ol4csum_l3l4csum,            0, 0, 0, 0, 1, 1, 1,    6,      \
-               VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                     \
-T(noff,                                        0, 0, 0, 1, 0, 0, 0,    4,      \
-               NOFF_F)                                                 \
-T(noff_l3l4csum,                       0, 0, 0, 1, 0, 0, 1,    4,      \
-               NOFF_F | L3L4CSUM_F)                                    \
-T(noff_ol3ol4csum,                     0, 0, 0, 1, 0, 1, 0,    4,      \
-               NOFF_F | OL3OL4CSUM_F)                                  \
-T(noff_ol3ol4csum_l3l4csum,            0, 0, 0, 1, 0, 1, 1,    4,      \
-               NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                     \
-T(noff_vlan,                           0, 0, 0, 1, 1, 0, 0,    6,      \
-               NOFF_F | VLAN_F)                                        \
-T(noff_vlan_l3l4csum,                  0, 0, 0, 1, 1, 0, 1,    6,      \
-               NOFF_F | VLAN_F | L3L4CSUM_F)                           \
-T(noff_vlan_ol3ol4csum,                        0, 0, 0, 1, 1, 1, 0,    6,      \
-               NOFF_F | VLAN_F | OL3OL4CSUM_F)                         \
-T(noff_vlan_ol3ol4csum_l3l4csum,       0, 0, 0, 1, 1, 1, 1,    6,      \
-               NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)            \
-T(tso,                                 0, 0, 1, 0, 0, 0, 0,    6,      \
-               TSO_F)                                                  \
-T(tso_l3l4csum,                                0, 0, 1, 0, 0, 0, 1,    6,      \
-               TSO_F | L3L4CSUM_F)                                     \
-T(tso_ol3ol4csum,                      0, 0, 1, 0, 0, 1, 0,    6,      \
-               TSO_F | OL3OL4CSUM_F)                                   \
-T(tso_ol3ol4csum_l3l4csum,             0, 0, 1, 0, 0, 1, 1,    6,      \
-               TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                      \
-T(tso_vlan,                            0, 0, 1, 0, 1, 0, 0,    6,      \
-               TSO_F | VLAN_F)                                         \
-T(tso_vlan_l3l4csum,                   0, 0, 1, 0, 1, 0, 1,    6,      \
-               TSO_F | VLAN_F | L3L4CSUM_F)                            \
-T(tso_vlan_ol3ol4csum,                 0, 0, 1, 0, 1, 1, 0,    6,      \
-               TSO_F | VLAN_F | OL3OL4CSUM_F)                          \
-T(tso_vlan_ol3ol4csum_l3l4csum,                0, 0, 1, 0, 1, 1, 1,    6,      \
-               TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)             \
-T(tso_noff,                            0, 0, 1, 1, 0, 0, 0,    6,      \
-               TSO_F | NOFF_F)                                         \
-T(tso_noff_l3l4csum,                   0, 0, 1, 1, 0, 0, 1,    6,      \
-               TSO_F | NOFF_F | L3L4CSUM_F)                            \
-T(tso_noff_ol3ol4csum,                 0, 0, 1, 1, 0, 1, 0,    6,      \
-               TSO_F | NOFF_F | OL3OL4CSUM_F)                          \
-T(tso_noff_ol3ol4csum_l3l4csum,                0, 0, 1, 1, 0, 1, 1,    6,      \
-               TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)             \
-T(tso_noff_vlan,                       0, 0, 1, 1, 1, 0, 0,    6,      \
-               TSO_F | NOFF_F | VLAN_F)                                \
-T(tso_noff_vlan_l3l4csum,              0, 0, 1, 1, 1, 0, 1,    6,      \
-               TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                   \
-T(tso_noff_vlan_ol3ol4csum,            0, 0, 1, 1, 1, 1, 0,    6,      \
-               TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                 \
-T(tso_noff_vlan_ol3ol4csum_l3l4csum,   0, 0, 1, 1, 1, 1, 1,    6,      \
-               TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)    \
-T(ts,                                  0, 1, 0, 0, 0, 0, 0,    8,      \
-               TSP_F)                                                  \
-T(ts_l3l4csum,                         0, 1, 0, 0, 0, 0, 1,    8,      \
-               TSP_F | L3L4CSUM_F)                                     \
-T(ts_ol3ol4csum,                       0, 1, 0, 0, 0, 1, 0,    8,      \
-               TSP_F | OL3OL4CSUM_F)                                   \
-T(ts_ol3ol4csum_l3l4csum,              0, 1, 0, 0, 0, 1, 1,    8,      \
-               TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)                      \
-T(ts_vlan,                             0, 1, 0, 0, 1, 0, 0,    8,      \
-               TSP_F | VLAN_F)                                         \
-T(ts_vlan_l3l4csum,                    0, 1, 0, 0, 1, 0, 1,    8,      \
-               TSP_F | VLAN_F | L3L4CSUM_F)                            \
-T(ts_vlan_ol3ol4csum,                  0, 1, 0, 0, 1, 1, 0,    8,      \
-               TSP_F | VLAN_F | OL3OL4CSUM_F)                          \
-T(ts_vlan_ol3ol4csum_l3l4csum,         0, 1, 0, 0, 1, 1, 1,    8,      \
-               TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)             \
-T(ts_noff,                             0, 1, 0, 1, 0, 0, 0,    8,      \
-               TSP_F | NOFF_F)                                         \
-T(ts_noff_l3l4csum,                    0, 1, 0, 1, 0, 0, 1,    8,      \
-               TSP_F | NOFF_F | L3L4CSUM_F)                            \
-T(ts_noff_ol3ol4csum,                  0, 1, 0, 1, 0, 1, 0,    8,      \
-               TSP_F | NOFF_F | OL3OL4CSUM_F)                          \
-T(ts_noff_ol3ol4csum_l3l4csum,         0, 1, 0, 1, 0, 1, 1,    8,      \
-               TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)             \
-T(ts_noff_vlan,                                0, 1, 0, 1, 1, 0, 0,    8,      \
-               TSP_F | NOFF_F | VLAN_F)                                \
-T(ts_noff_vlan_l3l4csum,               0, 1, 0, 1, 1, 0, 1,    8,      \
-               TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)                   \
-T(ts_noff_vlan_ol3ol4csum,             0, 1, 0, 1, 1, 1, 0,    8,      \
-               TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                 \
-T(ts_noff_vlan_ol3ol4csum_l3l4csum,    0, 1, 0, 1, 1, 1, 1,    8,      \
-               TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)    \
-T(ts_tso,                              0, 1, 1, 0, 0, 0, 0,    8,      \
-               TSP_F | TSO_F)                                          \
-T(ts_tso_l3l4csum,                     0, 1, 1, 0, 0, 0, 1,    8,      \
-               TSP_F | TSO_F | L3L4CSUM_F)                             \
-T(ts_tso_ol3ol4csum,                   0, 1, 1, 0, 0, 1, 0,    8,      \
-               TSP_F | TSO_F | OL3OL4CSUM_F)                           \
-T(ts_tso_ol3ol4csum_l3l4csum,          0, 1, 1, 0, 0, 1, 1,    8,      \
-               TSP_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)              \
-T(ts_tso_vlan,                         0, 1, 1, 0, 1, 0, 0,    8,      \
-               TSP_F | TSO_F | VLAN_F)                                 \
-T(ts_tso_vlan_l3l4csum,                        0, 1, 1, 0, 1, 0, 1,    8,      \
-               TSP_F | TSO_F | VLAN_F | L3L4CSUM_F)                    \
-T(ts_tso_vlan_ol3ol4csum,              0, 1, 1, 0, 1, 1, 0,    8,      \
-               TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F)                  \
-T(ts_tso_vlan_ol3ol4csum_l3l4csum,     0, 1, 1, 0, 1, 1, 1,    8,      \
-               TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)     \
-T(ts_tso_noff,                         0, 1, 1, 1, 0, 0, 0,    8,      \
-               TSP_F | TSO_F | NOFF_F)                                 \
-T(ts_tso_noff_l3l4csum,                        0, 1, 1, 1, 0, 0, 1,    8,      \
-               TSP_F | TSO_F | NOFF_F | L3L4CSUM_F)                    \
-T(ts_tso_noff_ol3ol4csum,              0, 1, 1, 1, 0, 1, 0,    8,      \
-               TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F)                  \
-T(ts_tso_noff_ol3ol4csum_l3l4csum,     0, 1, 1, 1, 0, 1, 1,    8,      \
-               TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)     \
-T(ts_tso_noff_vlan,                    0, 1, 1, 1, 1, 0, 0,    8,      \
-               TSP_F | TSO_F | NOFF_F | VLAN_F)                        \
-T(ts_tso_noff_vlan_l3l4csum,           0, 1, 1, 1, 1, 0, 1,    8,      \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)           \
-T(ts_tso_noff_vlan_ol3ol4csum,         0, 1, 1, 1, 1, 1, 0,    8,      \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)         \
-T(ts_tso_noff_vlan_ol3ol4csum_l3l4csum,        0, 1, 1, 1, 1, 1, 1,    8,      \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)\
-T(sec,                                 1, 0, 0, 0, 0, 0, 0,    4,      \
-               T_SEC_F)                                                \
-T(sec_l3l4csum,                                1, 0, 0, 0, 0, 0, 1,    4,      \
-               T_SEC_F | L3L4CSUM_F)                                   \
-T(sec_ol3ol4csum,                      1, 0, 0, 0, 0, 1, 0,    4,      \
-               T_SEC_F | OL3OL4CSUM_F)                                 \
-T(sec_ol3ol4csum_l3l4csum,             1, 0, 0, 0, 0, 1, 1,    4,      \
-               T_SEC_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(sec_vlan,                            1, 0, 0, 0, 1, 0, 0,    6,      \
-               T_SEC_F | VLAN_F)                                       \
-T(sec_vlan_l3l4csum,                   1, 0, 0, 0, 1, 0, 1,    6,      \
-               T_SEC_F | VLAN_F | L3L4CSUM_F)                          \
-T(sec_vlan_ol3ol4csum,                 1, 0, 0, 0, 1, 1, 0,    6,      \
-               T_SEC_F | VLAN_F | OL3OL4CSUM_F)                        \
-T(sec_vlan_ol3ol4csum_l3l4csum,                1, 0, 0, 0, 1, 1, 1,    6,      \
-               T_SEC_F | VLAN_F | OL3OL4CSUM_F |       L3L4CSUM_F)     \
-T(sec_noff,                            1, 0, 0, 1, 0, 0, 0,    4,      \
-               T_SEC_F | NOFF_F)                                       \
-T(sec_noff_l3l4csum,                   1, 0, 0, 1, 0, 0, 1,    4,      \
-               T_SEC_F | NOFF_F | L3L4CSUM_F)                          \
-T(sec_noff_ol3ol4csum,                 1, 0, 0, 1, 0, 1, 0,    4,      \
-               T_SEC_F | NOFF_F | OL3OL4CSUM_F)                        \
-T(sec_noff_ol3ol4csum_l3l4csum,                1, 0, 0, 1, 0, 1, 1,    4,      \
-               T_SEC_F | NOFF_F | OL3OL4CSUM_F |       L3L4CSUM_F)     \
-T(sec_noff_vlan,                       1, 0, 0, 1, 1, 0, 0,    6,      \
-               T_SEC_F | NOFF_F | VLAN_F)                              \
-T(sec_noff_vlan_l3l4csum,              1, 0, 0, 1, 1, 0, 1,    6,      \
-               T_SEC_F | NOFF_F | VLAN_F | L3L4CSUM_F)                 \
-T(sec_noff_vlan_ol3ol4csum,            1, 0, 0, 1, 1, 1, 0,    6,      \
-               T_SEC_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)               \
-T(sec_noff_vlan_ol3ol4csum_l3l4csum,   1, 0, 0, 1, 1, 1, 1,    6,      \
-               T_SEC_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)  \
-T(sec_tso,                             1, 0, 1, 0, 0, 0, 0,    6,      \
-               T_SEC_F | TSO_F)                                        \
-T(sec_tso_l3l4csum,                    1, 0, 1, 0, 0, 0, 1,    6,      \
-               T_SEC_F | TSO_F | L3L4CSUM_F)                           \
-T(sec_tso_ol3ol4csum,                  1, 0, 1, 0, 0, 1, 0,    6,      \
-               T_SEC_F | TSO_F | OL3OL4CSUM_F)                         \
-T(sec_tso_ol3ol4csum_l3l4csum,         1, 0, 1, 0, 0, 1, 1,    6,      \
-               T_SEC_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)            \
-T(sec_tso_vlan,                                1, 0, 1, 0, 1, 0, 0,    6,      \
-               T_SEC_F | TSO_F | VLAN_F)                               \
-T(sec_tso_vlan_l3l4csum,               1, 0, 1, 0, 1, 0, 1,    6,      \
-               T_SEC_F | TSO_F | VLAN_F | L3L4CSUM_F)                  \
-T(sec_tso_vlan_ol3ol4csum,             1, 0, 1, 0, 1, 1, 0,    6,      \
-               T_SEC_F | TSO_F | VLAN_F | OL3OL4CSUM_F)                \
-T(sec_tso_vlan_ol3ol4csum_l3l4csum,    1, 0, 1, 0, 1, 1, 1,    6,      \
-               T_SEC_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)   \
-T(sec_tso_noff,                                1, 0, 1, 1, 0, 0, 0,    6,      \
-               T_SEC_F | TSO_F | NOFF_F)                               \
-T(sec_tso_noff_l3l4csum,               1, 0, 1, 1, 0, 0, 1,    6,      \
-               T_SEC_F | TSO_F | NOFF_F | L3L4CSUM_F)                  \
-T(sec_tso_noff_ol3ol4csum,             1, 0, 1, 1, 0, 1, 0,    6,      \
-               T_SEC_F | TSO_F | NOFF_F | OL3OL4CSUM_F)                \
-T(sec_tso_noff_ol3ol4csum_l3l4csum,    1, 0, 1, 1, 0, 1, 1,    6,      \
-               T_SEC_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)   \
-T(sec_tso_noff_vlan,                   1, 0, 1, 1, 1, 0, 0,    6,      \
-               T_SEC_F | TSO_F | NOFF_F | VLAN_F)                      \
-T(sec_tso_noff_vlan_l3l4csum,          1, 0, 1, 1, 1, 0, 1,    6,      \
-               T_SEC_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)         \
-T(sec_tso_noff_vlan_ol3ol4csum,                1, 0, 1, 1, 1, 1, 0,    6,      \
-               T_SEC_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)       \
-T(sec_tso_noff_vlan_ol3ol4csum_l3l4csum, 1, 0, 1, 1, 1, 1, 1,  6,      \
-               T_SEC_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)\
-T(sec_ts,                              1, 1, 0, 0, 0, 0, 0,    8,      \
-               T_SEC_F | TSP_F)                                        \
-T(sec_ts_l3l4csum,                     1, 1, 0, 0, 0, 0, 1,    8,      \
-               T_SEC_F | TSP_F | L3L4CSUM_F)                           \
-T(sec_ts_ol3ol4csum,                   1, 1, 0, 0, 0, 1, 0,    8,      \
-               T_SEC_F | TSP_F | OL3OL4CSUM_F)                         \
-T(sec_ts_ol3ol4csum_l3l4csum,          1, 1, 0, 0, 0, 1, 1,    8,      \
-               T_SEC_F | TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)            \
-T(sec_ts_vlan,                         1, 1, 0, 0, 1, 0, 0,    8,      \
-               T_SEC_F | TSP_F | VLAN_F)                               \
-T(sec_ts_vlan_l3l4csum,                        1, 1, 0, 0, 1, 0, 1,    8,      \
-               T_SEC_F | TSP_F | VLAN_F | L3L4CSUM_F)                  \
-T(sec_ts_vlan_ol3ol4csum,              1, 1, 0, 0, 1, 1, 0,    8,      \
-               T_SEC_F | TSP_F | VLAN_F | OL3OL4CSUM_F)                \
-T(sec_ts_vlan_ol3ol4csum_l3l4csum,     1, 1, 0, 0, 1, 1, 1,    8,      \
-               T_SEC_F | TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)   \
-T(sec_ts_noff,                         1, 1, 0, 1, 0, 0, 0,    8,      \
-               T_SEC_F | TSP_F | NOFF_F)                               \
-T(sec_ts_noff_l3l4csum,                        1, 1, 0, 1, 0, 0, 1,    8,      \
-               T_SEC_F | TSP_F | NOFF_F | L3L4CSUM_F)                  \
-T(sec_ts_noff_ol3ol4csum,              1, 1, 0, 1, 0, 1, 0,    8,      \
-               T_SEC_F | TSP_F | NOFF_F | OL3OL4CSUM_F)                \
-T(sec_ts_noff_ol3ol4csum_l3l4csum,     1, 1, 0, 1, 0, 1, 1,    8,      \
-               T_SEC_F | TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)   \
-T(sec_ts_noff_vlan,                    1, 1, 0, 1, 1, 0, 0,    8,      \
-               T_SEC_F | TSP_F | NOFF_F | VLAN_F)                      \
-T(sec_ts_noff_vlan_l3l4csum,           1, 1, 0, 1, 1, 0, 1,    8,      \
-               T_SEC_F | TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)         \
-T(sec_ts_noff_vlan_ol3ol4csum,         1, 1, 0, 1, 1, 1, 0,    8,      \
-               T_SEC_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)       \
-T(sec_ts_noff_vlan_ol3ol4csum_l3l4csum,        1, 1, 0, 1, 1, 1, 1,    8,      \
-               T_SEC_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)\
-T(sec_ts_tso,                          1, 1, 1, 0, 0, 0, 0,    8,      \
-               T_SEC_F | TSP_F | TSO_F)                                \
-T(sec_ts_tso_l3l4csum,                 1, 1, 1, 0, 0, 0, 1,    8,      \
-               T_SEC_F | TSP_F | TSO_F | L3L4CSUM_F)                   \
-T(sec_ts_tso_ol3ol4csum,               1, 1, 1, 0, 0, 1, 0,    8,      \
-               T_SEC_F | TSP_F | TSO_F | OL3OL4CSUM_F)                 \
-T(sec_ts_tso_ol3ol4csum_l3l4csum,      1, 1, 1, 0, 0, 1, 1,    8,      \
-               T_SEC_F | TSP_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)    \
-T(sec_ts_tso_vlan,                     1, 1, 1, 0, 1, 0, 0,    8,      \
-               T_SEC_F | TSP_F | TSO_F | VLAN_F)                       \
-T(sec_ts_tso_vlan_l3l4csum,            1, 1, 1, 0, 1, 0, 1,    8,      \
-               T_SEC_F | TSP_F | TSO_F | VLAN_F | L3L4CSUM_F)          \
-T(sec_ts_tso_vlan_ol3ol4csum,          1, 1, 1, 0, 1, 1, 0,    8,      \
-               T_SEC_F | TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F)        \
-T(sec_ts_tso_vlan_ol3ol4csum_l3l4csum, 1, 1, 1, 0, 1, 1, 1,    8,      \
-               T_SEC_F | TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F) \
-T(sec_ts_tso_noff,                     1, 1, 1, 1, 0, 0, 0,    8,      \
-               T_SEC_F | TSP_F | TSO_F | NOFF_F)                       \
-T(sec_ts_tso_noff_l3l4csum,            1, 1, 1, 1, 0, 0, 1,    8,      \
-               T_SEC_F | TSP_F | TSO_F | NOFF_F | L3L4CSUM_F)          \
-T(sec_ts_tso_noff_ol3ol4csum,          1, 1, 1, 1, 0, 1, 0,    8,      \
-               T_SEC_F | TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F)        \
-T(sec_ts_tso_noff_ol3ol4csum_l3l4csum, 1, 1, 1, 1, 0, 1, 1,    8,      \
-               T_SEC_F | TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)\
-T(sec_ts_tso_noff_vlan,                        1, 1, 1, 1, 1, 0, 0,    8,      \
-               T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F)              \
-T(sec_ts_tso_noff_vlan_l3l4csum,       1, 1, 1, 1, 1, 0, 1,    8,      \
-               T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F) \
-T(sec_ts_tso_noff_vlan_ol3ol4csum,     1, 1, 1, 1, 1, 1, 0,    8,      \
-               T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)\
-T(sec_ts_tso_noff_vlan_ol3ol4csum_l3l4csum, 1, 1, 1, 1, 1, 1, 1, 8,    \
-               T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | \
-               L3L4CSUM_F)
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                        \
+#define NIX_TX_FASTPATH_MODES_0_15                                             \
+       T(no_offload, 6, NIX_TX_OFFLOAD_NONE)                                  \
+       T(l3l4csum, 6, L3L4CSUM_F)                                             \
+       T(ol3ol4csum, 6, OL3OL4CSUM_F)                                         \
+       T(ol3ol4csum_l3l4csum, 6, 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, 6, NOFF_F)                                                     \
+       T(noff_l3l4csum, 6, NOFF_F | L3L4CSUM_F)                               \
+       T(noff_ol3ol4csum, 6, NOFF_F | OL3OL4CSUM_F)                           \
+       T(noff_ol3ol4csum_l3l4csum, 6, 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, 6, T_SEC_F)                                                     \
+       T(sec_l3l4csum, 6, T_SEC_F | L3L4CSUM_F)                               \
+       T(sec_ol3ol4csum, 6, T_SEC_F | OL3OL4CSUM_F)                           \
+       T(sec_ol3ol4csum_l3l4csum, 6, 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, 6, T_SEC_F | NOFF_F)                                       \
+       T(sec_noff_l3l4csum, 6, T_SEC_F | NOFF_F | L3L4CSUM_F)                 \
+       T(sec_noff_ol3ol4csum, 6, T_SEC_F | NOFF_F | OL3OL4CSUM_F)             \
+       T(sec_noff_ol3ol4csum_l3l4csum, 6,                                     \
+         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 cn10k_nix_xmit_pkts_##name(          \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn10k_nix_xmit_pkts_mseg_##name(     \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn10k_nix_xmit_pkts_vec_##name(      \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn10k_nix_xmit_pkts_vec_mseg_##name( \
-               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
+               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 cn10k_nix_xmit_pkts(tx_queue, NULL, 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 cn10k_nix_xmit_pkts_mseg(tx_queue, NULL, 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 cn10k_nix_xmit_pkts_vector(tx_queue, NULL, 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 cn10k_nix_xmit_pkts_vector(                             \
+                       tx_queue, NULL, tx_pkts, pkts, cmd,                    \
+                       (flags) | NIX_TX_MULTI_SEG_F);                         \
+       }
+
 #endif /* __CN10K_TX_H__ */