net/cnxk: fix RSS RETA table update
[dpdk.git] / drivers / net / cnxk / cn9k_tx.h
index 1899d66..d23e4b6 100644 (file)
@@ -13,6 +13,8 @@
 #define NIX_TX_OFFLOAD_MBUF_NOFF_F    BIT(3)
 #define NIX_TX_OFFLOAD_TSO_F         BIT(4)
 #define NIX_TX_OFFLOAD_TSTAMP_F              BIT(5)
+#define NIX_TX_OFFLOAD_SECURITY_F     BIT(6)
+#define NIX_TX_OFFLOAD_MAX           (NIX_TX_OFFLOAD_SECURITY_F << 1)
 
 /* Flags to control xmit_prepare function.
  * Defining it from backwards to denote its been
@@ -56,17 +58,40 @@ cn9k_nix_tx_ext_subs(const uint16_t flags)
                                  : 0);
 }
 
+static __rte_always_inline void
+cn9k_nix_tx_skeleton(struct cn9k_eth_txq *txq, uint64_t *cmd,
+                    const uint16_t flags, const uint16_t static_sz)
+{
+       if (static_sz)
+               cmd[0] = txq->send_hdr_w0;
+       else
+               cmd[0] = (txq->send_hdr_w0 & 0xFFFFF00000000000) |
+                        ((uint64_t)(cn9k_nix_tx_ext_subs(flags) + 1) << 40);
+       cmd[1] = 0;
+
+       if (flags & NIX_TX_NEED_EXT_HDR) {
+               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);
+       }
+}
+
 static __rte_always_inline void
 cn9k_nix_xmit_prepare_tso(struct rte_mbuf *m, const uint64_t flags)
 {
        uint64_t mask, ol_flags = m->ol_flags;
 
-       if (flags & NIX_TX_OFFLOAD_TSO_F && (ol_flags & PKT_TX_TCP_SEG)) {
+       if (flags & NIX_TX_OFFLOAD_TSO_F && (ol_flags & RTE_MBUF_F_TX_TCP_SEG)) {
                uintptr_t mdata = rte_pktmbuf_mtod(m, uintptr_t);
                uint16_t *iplen, *oiplen, *oudplen;
                uint16_t lso_sb, paylen;
 
-               mask = -!!(ol_flags & (PKT_TX_OUTER_IPV4 | PKT_TX_OUTER_IPV6));
+               mask = -!!(ol_flags & (RTE_MBUF_F_TX_OUTER_IPV4 | RTE_MBUF_F_TX_OUTER_IPV6));
                lso_sb = (mask & (m->outer_l2_len + m->outer_l3_len)) +
                         m->l2_len + m->l3_len + m->l4_len;
 
@@ -75,18 +100,18 @@ cn9k_nix_xmit_prepare_tso(struct rte_mbuf *m, const uint64_t flags)
 
                /* Get iplen position assuming no tunnel hdr */
                iplen = (uint16_t *)(mdata + m->l2_len +
-                                    (2 << !!(ol_flags & PKT_TX_IPV6)));
+                                    (2 << !!(ol_flags & RTE_MBUF_F_TX_IPV6)));
                /* Handle tunnel tso */
                if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
-                   (ol_flags & PKT_TX_TUNNEL_MASK)) {
+                   (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) {
                        const uint8_t is_udp_tun =
                                (CNXK_NIX_UDP_TUN_BITMASK >>
-                                ((ol_flags & PKT_TX_TUNNEL_MASK) >> 45)) &
+                                ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) >> 45)) &
                                0x1;
 
                        oiplen = (uint16_t *)(mdata + m->outer_l2_len +
                                              (2 << !!(ol_flags &
-                                                      PKT_TX_OUTER_IPV6)));
+                                                      RTE_MBUF_F_TX_OUTER_IPV6)));
                        *oiplen = rte_cpu_to_be_16(rte_be_to_cpu_16(*oiplen) -
                                                   paylen);
 
@@ -101,7 +126,7 @@ cn9k_nix_xmit_prepare_tso(struct rte_mbuf *m, const uint64_t flags)
                        /* Update iplen position to inner ip hdr */
                        iplen = (uint16_t *)(mdata + lso_sb - m->l3_len -
                                             m->l4_len +
-                                            (2 << !!(ol_flags & PKT_TX_IPV6)));
+                                            (2 << !!(ol_flags & RTE_MBUF_F_TX_IPV6)));
                }
 
                *iplen = rte_cpu_to_be_16(rte_be_to_cpu_16(*iplen) - paylen);
@@ -134,11 +159,11 @@ cn9k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                w1.u = 0;
        }
 
-       if (!(flags & NIX_TX_MULTI_SEG_F)) {
+       if (!(flags & NIX_TX_MULTI_SEG_F))
                send_hdr->w0.total = m->data_len;
-               send_hdr->w0.aura =
-                       roc_npa_aura_handle_to_aura(m->pool->pool_id);
-       }
+       else
+               send_hdr->w0.total = m->pkt_len;
+       send_hdr->w0.aura = roc_npa_aura_handle_to_aura(m->pool->pool_id);
 
        /*
         * L3type:  2 => IPV4
@@ -151,11 +176,11 @@ cn9k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
 
        if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
            (flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) {
-               const uint8_t csum = !!(ol_flags & PKT_TX_OUTER_UDP_CKSUM);
+               const uint8_t csum = !!(ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM);
                const uint8_t ol3type =
-                       ((!!(ol_flags & PKT_TX_OUTER_IPV4)) << 1) +
-                       ((!!(ol_flags & PKT_TX_OUTER_IPV6)) << 2) +
-                       !!(ol_flags & PKT_TX_OUTER_IP_CKSUM);
+                       ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV4)) << 1) +
+                       ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6)) << 2) +
+                       !!(ol_flags & RTE_MBUF_F_TX_OUTER_IP_CKSUM);
 
                /* Outer L3 */
                w1.ol3type = ol3type;
@@ -167,15 +192,15 @@ cn9k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                w1.ol4type = csum + (csum << 1);
 
                /* Inner L3 */
-               w1.il3type = ((!!(ol_flags & PKT_TX_IPV4)) << 1) +
-                            ((!!(ol_flags & PKT_TX_IPV6)) << 2);
+               w1.il3type = ((!!(ol_flags & RTE_MBUF_F_TX_IPV4)) << 1) +
+                            ((!!(ol_flags & RTE_MBUF_F_TX_IPV6)) << 2);
                w1.il3ptr = w1.ol4ptr + m->l2_len;
                w1.il4ptr = w1.il3ptr + m->l3_len;
                /* Increment it by 1 if it is IPV4 as 3 is with csum */
-               w1.il3type = w1.il3type + !!(ol_flags & PKT_TX_IP_CKSUM);
+               w1.il3type = w1.il3type + !!(ol_flags & RTE_MBUF_F_TX_IP_CKSUM);
 
                /* Inner L4 */
-               w1.il4type = (ol_flags & PKT_TX_L4_MASK) >> 52;
+               w1.il4type = (ol_flags & RTE_MBUF_F_TX_L4_MASK) >> 52;
 
                /* In case of no tunnel header use only
                 * shift IL3/IL4 fields a bit to use
@@ -186,16 +211,16 @@ cn9k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                       ((w1.u & 0X00000000FFFFFFFF) >> (mask << 4));
 
        } else if (flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) {
-               const uint8_t csum = !!(ol_flags & PKT_TX_OUTER_UDP_CKSUM);
+               const uint8_t csum = !!(ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM);
                const uint8_t outer_l2_len = m->outer_l2_len;
 
                /* Outer L3 */
                w1.ol3ptr = outer_l2_len;
                w1.ol4ptr = outer_l2_len + m->outer_l3_len;
                /* Increment it by 1 if it is IPV4 as 3 is with csum */
-               w1.ol3type = ((!!(ol_flags & PKT_TX_OUTER_IPV4)) << 1) +
-                            ((!!(ol_flags & PKT_TX_OUTER_IPV6)) << 2) +
-                            !!(ol_flags & PKT_TX_OUTER_IP_CKSUM);
+               w1.ol3type = ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV4)) << 1) +
+                            ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6)) << 2) +
+                            !!(ol_flags & RTE_MBUF_F_TX_OUTER_IP_CKSUM);
 
                /* Outer L4 */
                w1.ol4type = csum + (csum << 1);
@@ -211,27 +236,27 @@ cn9k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                w1.ol3ptr = l2_len;
                w1.ol4ptr = l2_len + m->l3_len;
                /* Increment it by 1 if it is IPV4 as 3 is with csum */
-               w1.ol3type = ((!!(ol_flags & PKT_TX_IPV4)) << 1) +
-                            ((!!(ol_flags & PKT_TX_IPV6)) << 2) +
-                            !!(ol_flags & PKT_TX_IP_CKSUM);
+               w1.ol3type = ((!!(ol_flags & RTE_MBUF_F_TX_IPV4)) << 1) +
+                            ((!!(ol_flags & RTE_MBUF_F_TX_IPV6)) << 2) +
+                            !!(ol_flags & RTE_MBUF_F_TX_IP_CKSUM);
 
                /* Inner L4 */
-               w1.ol4type = (ol_flags & PKT_TX_L4_MASK) >> 52;
+               w1.ol4type = (ol_flags & RTE_MBUF_F_TX_L4_MASK) >> 52;
        }
 
        if (flags & NIX_TX_NEED_EXT_HDR && flags & NIX_TX_OFFLOAD_VLAN_QINQ_F) {
-               send_hdr_ext->w1.vlan1_ins_ena = !!(ol_flags & PKT_TX_VLAN);
+               send_hdr_ext->w1.vlan1_ins_ena = !!(ol_flags & RTE_MBUF_F_TX_VLAN);
                /* HW will update ptr after vlan0 update */
                send_hdr_ext->w1.vlan1_ins_ptr = 12;
                send_hdr_ext->w1.vlan1_ins_tci = m->vlan_tci;
 
-               send_hdr_ext->w1.vlan0_ins_ena = !!(ol_flags & PKT_TX_QINQ);
+               send_hdr_ext->w1.vlan0_ins_ena = !!(ol_flags & RTE_MBUF_F_TX_QINQ);
                /* 2B before end of l2 header */
                send_hdr_ext->w1.vlan0_ins_ptr = 12;
                send_hdr_ext->w1.vlan0_ins_tci = m->vlan_tci_outer;
        }
 
-       if (flags & NIX_TX_OFFLOAD_TSO_F && (ol_flags & PKT_TX_TCP_SEG)) {
+       if (flags & NIX_TX_OFFLOAD_TSO_F && (ol_flags & RTE_MBUF_F_TX_TCP_SEG)) {
                uint16_t lso_sb;
                uint64_t mask;
 
@@ -242,20 +267,20 @@ cn9k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                send_hdr_ext->w0.lso = 1;
                send_hdr_ext->w0.lso_mps = m->tso_segsz;
                send_hdr_ext->w0.lso_format =
-                       NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags & PKT_TX_IPV6);
+                       NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags & RTE_MBUF_F_TX_IPV6);
                w1.ol4type = NIX_SENDL4TYPE_TCP_CKSUM;
 
                /* Handle tunnel tso */
                if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
-                   (ol_flags & PKT_TX_TUNNEL_MASK)) {
+                   (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) {
                        const uint8_t is_udp_tun =
                                (CNXK_NIX_UDP_TUN_BITMASK >>
-                                ((ol_flags & PKT_TX_TUNNEL_MASK) >> 45)) &
+                                ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) >> 45)) &
                                0x1;
                        uint8_t shift = is_udp_tun ? 32 : 0;
 
-                       shift += (!!(ol_flags & PKT_TX_OUTER_IPV6) << 4);
-                       shift += (!!(ol_flags & PKT_TX_IPV6) << 3);
+                       shift += (!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6) << 4);
+                       shift += (!!(ol_flags & RTE_MBUF_F_TX_IPV6) << 3);
 
                        w1.il4type = NIX_SENDL4TYPE_TCP_CKSUM;
                        w1.ol4type = is_udp_tun ? NIX_SENDL4TYPE_UDP_CKSUM : 0;
@@ -284,42 +309,40 @@ cn9k_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
                }
                /* Mark mempool object as "put" since it is freed by NIX */
                if (!send_hdr->w0.df)
-                       __mempool_check_cookies(m->pool, (void **)&m, 1, 0);
+                       RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
+       } else {
+               sg->seg1_size = m->data_len;
+               *(rte_iova_t *)(sg + 1) = rte_mbuf_data_iova(m);
+
+               /* NOFF is handled later for multi-seg */
        }
 }
 
 static __rte_always_inline void
-cn9k_nix_xmit_prepare_tstamp(uint64_t *cmd, const uint64_t *send_mem_desc,
+cn9k_nix_xmit_prepare_tstamp(struct cn9k_eth_txq *txq, uint64_t *cmd,
                             const uint64_t ol_flags, const uint16_t no_segdw,
                             const uint16_t flags)
 {
        if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
                struct nix_send_mem_s *send_mem;
                uint16_t off = (no_segdw - 1) << 1;
-               const uint8_t is_ol_tstamp = !(ol_flags & PKT_TX_IEEE1588_TMST);
+               const uint8_t is_ol_tstamp =
+                       !(ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST);
 
                send_mem = (struct nix_send_mem_s *)(cmd + off);
-               if (flags & NIX_TX_MULTI_SEG_F) {
-                       /* Retrieving the default desc values */
-                       cmd[off] = send_mem_desc[6];
-
-                       /* Using compiler barier to avoid voilation of C
-                        * 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.cn9k.subdc = NIX_SUBDC_MEM;
                send_mem->w0.cn9k.alg =
-                       NIX_SENDMEMALG_SETTSTMP - (is_ol_tstamp);
+                       NIX_SENDMEMALG_SETTSTMP + (is_ol_tstamp << 3);
 
-               send_mem->addr = (rte_iova_t)((uint64_t *)send_mem_desc[7] +
-                                             (is_ol_tstamp));
+               send_mem->addr = (rte_iova_t)(((uint64_t *)txq->ts_mem) +
+                               (is_ol_tstamp));
        }
 }
 
@@ -365,8 +388,6 @@ cn9k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
        uint8_t off, i;
 
        send_hdr = (struct nix_send_hdr_s *)cmd;
-       send_hdr->w0.total = m->pkt_len;
-       send_hdr->w0.aura = roc_npa_aura_handle_to_aura(m->pool->pool_id);
 
        if (flags & NIX_TX_NEED_EXT_HDR)
                off = 2;
@@ -374,13 +395,29 @@ cn9k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
                off = 0;
 
        sg = (union nix_send_sg_s *)&cmd[2 + off];
-       /* Clear sg->u header before use */
-       sg->u &= 0xFC00000000000000;
+
+       /* Start from second segment, first segment is already there */
+       i = 1;
        sg_u = sg->u;
-       slist = &cmd[3 + off];
+       nb_segs = m->nb_segs - 1;
+       m_next = m->next;
+       slist = &cmd[3 + off + 1];
 
-       i = 0;
-       nb_segs = m->nb_segs;
+       /* Set invert df if buffer is not to be freed by H/W */
+       if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
+               sg_u |= (cnxk_nix_prefree_seg(m) << 55);
+               rte_io_wmb();
+       }
+
+       /* Mark mempool object as "put" since it is freed by NIX */
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+       if (!(sg_u & (1ULL << 55)))
+               RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
+       rte_io_wmb();
+#endif
+       m = m_next;
+       if (!m)
+               goto done;
 
        /* Fill mbuf segments */
        do {
@@ -396,7 +433,7 @@ cn9k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
                /* Mark mempool object as "put" since it is freed by NIX */
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
                if (!(sg_u & (1ULL << (i + 55))))
-                       __mempool_check_cookies(m->pool, (void **)&m, 1, 0);
+                       RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
                rte_io_wmb();
 #endif
                slist++;
@@ -415,6 +452,7 @@ cn9k_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
                m = m_next;
        } while (nb_segs);
 
+done:
        sg->u = sg_u;
        sg->segs = i;
        segdw = (uint64_t *)slist - (uint64_t *)&cmd[2 + off];
@@ -470,7 +508,7 @@ cn9k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
 
        NIX_XMIT_FC_OR_RETURN(txq, pkts);
 
-       roc_lmt_mov(cmd, &txq->cmd[0], cn9k_nix_tx_ext_subs(flags));
+       cn9k_nix_tx_skeleton(txq, cmd, flags, 1);
 
        /* Perform header writes before barrier for TSO */
        if (flags & NIX_TX_OFFLOAD_TSO_F) {
@@ -488,8 +526,8 @@ cn9k_nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts,
 
        for (i = 0; i < pkts; i++) {
                cn9k_nix_xmit_prepare(tx_pkts[i], cmd, flags, lso_tun_fmt);
-               cn9k_nix_xmit_prepare_tstamp(cmd, &txq->cmd[0],
-                                            tx_pkts[i]->ol_flags, 4, flags);
+               cn9k_nix_xmit_prepare_tstamp(txq, cmd, tx_pkts[i]->ol_flags, 4,
+                                            flags);
                cn9k_nix_xmit_one(cmd, lmt_addr, io_addr, flags);
        }
 
@@ -512,7 +550,7 @@ cn9k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
 
        NIX_XMIT_FC_OR_RETURN(txq, pkts);
 
-       roc_lmt_mov(cmd, &txq->cmd[0], cn9k_nix_tx_ext_subs(flags));
+       cn9k_nix_tx_skeleton(txq, cmd, flags, 1);
 
        /* Perform header writes before barrier for TSO */
        if (flags & NIX_TX_OFFLOAD_TSO_F) {
@@ -531,9 +569,8 @@ cn9k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
        for (i = 0; i < pkts; i++) {
                cn9k_nix_xmit_prepare(tx_pkts[i], cmd, flags, lso_tun_fmt);
                segdw = cn9k_nix_prepare_mseg(tx_pkts[i], cmd, flags);
-               cn9k_nix_xmit_prepare_tstamp(cmd, &txq->cmd[0],
-                                            tx_pkts[i]->ol_flags, segdw,
-                                            flags);
+               cn9k_nix_xmit_prepare_tstamp(txq, cmd, tx_pkts[i]->ol_flags,
+                                            segdw, flags);
                cn9k_nix_xmit_mseg_one(cmd, lmt_addr, io_addr, segdw);
        }
 
@@ -545,17 +582,290 @@ cn9k_nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
 
 #if defined(RTE_ARCH_ARM64)
 
+static __rte_always_inline void
+cn9k_nix_prepare_tso(struct rte_mbuf *m, union nix_send_hdr_w1_u *w1,
+                    union nix_send_ext_w0_u *w0, uint64_t ol_flags,
+                    uint64_t flags)
+{
+       uint16_t lso_sb;
+       uint64_t mask;
+
+       if (!(ol_flags & RTE_MBUF_F_TX_TCP_SEG))
+               return;
+
+       mask = -(!w1->il3type);
+       lso_sb = (mask & w1->ol4ptr) + (~mask & w1->il4ptr) + m->l4_len;
+
+       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 & 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 & RTE_MBUF_F_TX_TUNNEL_MASK)) {
+               const uint8_t is_udp_tun =
+                       (CNXK_NIX_UDP_TUN_BITMASK >>
+                        ((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) >> 45)) &
+                       0x1;
+
+               w1->il4type = NIX_SENDL4TYPE_TCP_CKSUM;
+               w1->ol4type = is_udp_tun ? NIX_SENDL4TYPE_UDP_CKSUM : 0;
+               /* Update format for UDP tunneled packet */
+               w0->lso_format += is_udp_tun ? 2 : 6;
+
+               w0->lso_format += !!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6) << 1;
+       }
+}
+
+static __rte_always_inline uint8_t
+cn9k_nix_prepare_mseg_vec_list(struct rte_mbuf *m, uint64_t *cmd,
+                              union nix_send_hdr_w0_u *sh,
+                              union nix_send_sg_s *sg, const uint32_t flags)
+{
+       struct rte_mbuf *m_next;
+       uint64_t *slist, sg_u;
+       uint16_t nb_segs;
+       uint64_t segdw;
+       int i = 1;
+
+       sh->total = m->pkt_len;
+       /* Clear sg->u header before use */
+       sg->u &= 0xFC00000000000000;
+       sg_u = sg->u;
+       slist = &cmd[0];
+
+       sg_u = sg_u | ((uint64_t)m->data_len);
+
+       nb_segs = m->nb_segs - 1;
+       m_next = m->next;
+
+       /* Set invert df if buffer is not to be freed by H/W */
+       if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)
+               sg_u |= (cnxk_nix_prefree_seg(m) << 55);
+               /* Mark mempool object as "put" since it is freed by NIX */
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+       if (!(sg_u & (1ULL << 55)))
+               RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
+       rte_io_wmb();
+#endif
+
+       m = m_next;
+       /* Fill mbuf segments */
+       do {
+               m_next = m->next;
+               sg_u = sg_u | ((uint64_t)m->data_len << (i << 4));
+               *slist = rte_mbuf_data_iova(m);
+               /* Set invert df if buffer is not to be freed by H/W */
+               if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)
+                       sg_u |= (cnxk_nix_prefree_seg(m) << (i + 55));
+                       /* Mark mempool object as "put" since it is freed by NIX
+                        */
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+               if (!(sg_u & (1ULL << (i + 55))))
+                       RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
+               rte_io_wmb();
+#endif
+               slist++;
+               i++;
+               nb_segs--;
+               if (i > 2 && nb_segs) {
+                       i = 0;
+                       /* Next SG subdesc */
+                       *(uint64_t *)slist = sg_u & 0xFC00000000000000;
+                       sg->u = sg_u;
+                       sg->segs = 3;
+                       sg = (union nix_send_sg_s *)slist;
+                       sg_u = sg->u;
+                       slist++;
+               }
+               m = m_next;
+       } while (nb_segs);
+
+       sg->u = sg_u;
+       sg->segs = i;
+       segdw = (uint64_t *)slist - (uint64_t *)&cmd[0];
+
+       segdw += 2;
+       /* Roundup extra dwords to multiple of 2 */
+       segdw = (segdw >> 1) + (segdw & 0x1);
+       /* Default dwords */
+       segdw += 1 + !!(flags & NIX_TX_NEED_EXT_HDR) +
+                !!(flags & NIX_TX_OFFLOAD_TSTAMP_F);
+       sh->sizem1 = segdw - 1;
+
+       return segdw;
+}
+
+static __rte_always_inline uint8_t
+cn9k_nix_prepare_mseg_vec(struct rte_mbuf *m, uint64_t *cmd, uint64x2_t *cmd0,
+                         uint64x2_t *cmd1, const uint32_t flags)
+{
+       union nix_send_hdr_w0_u sh;
+       union nix_send_sg_s sg;
+       uint8_t ret;
+
+       if (m->nb_segs == 1) {
+               if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
+                       sg.u = vgetq_lane_u64(cmd1[0], 0);
+                       sg.u |= (cnxk_nix_prefree_seg(m) << 55);
+                       cmd1[0] = vsetq_lane_u64(sg.u, cmd1[0], 0);
+               }
+
+#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
+               sg.u = vgetq_lane_u64(cmd1[0], 0);
+               if (!(sg.u & (1ULL << 55)))
+                       RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
+               rte_io_wmb();
+#endif
+               return 2 + !!(flags & NIX_TX_NEED_EXT_HDR) +
+                      !!(flags & NIX_TX_OFFLOAD_TSTAMP_F);
+       }
+
+       sh.u = vgetq_lane_u64(cmd0[0], 0);
+       sg.u = vgetq_lane_u64(cmd1[0], 0);
+
+       ret = cn9k_nix_prepare_mseg_vec_list(m, cmd, &sh, &sg, flags);
+
+       cmd0[0] = vsetq_lane_u64(sh.u, cmd0[0], 0);
+       cmd1[0] = vsetq_lane_u64(sg.u, cmd1[0], 0);
+       return ret;
+}
+
 #define NIX_DESCS_PER_LOOP 4
+
+static __rte_always_inline void
+cn9k_nix_xmit_pkts_mseg_vector(uint64x2_t *cmd0, uint64x2_t *cmd1,
+                              uint64x2_t *cmd2, uint64x2_t *cmd3,
+                              uint8_t *segdw,
+                              uint64_t slist[][CNXK_NIX_TX_MSEG_SG_DWORDS - 2],
+                              uint64_t *lmt_addr, rte_iova_t io_addr,
+                              const uint32_t flags)
+{
+       uint64_t lmt_status;
+       uint8_t j, off;
+
+       if (!(flags & NIX_TX_NEED_EXT_HDR) &&
+           !(flags & NIX_TX_OFFLOAD_TSTAMP_F)) {
+               /* No segments in 4 consecutive packets. */
+               if ((segdw[0] + segdw[1] + segdw[2] + segdw[3]) <= 8) {
+                       do {
+                               vst1q_u64(lmt_addr, cmd0[0]);
+                               vst1q_u64(lmt_addr + 2, cmd1[0]);
+                               vst1q_u64(lmt_addr + 4, cmd0[1]);
+                               vst1q_u64(lmt_addr + 6, cmd1[1]);
+                               vst1q_u64(lmt_addr + 8, cmd0[2]);
+                               vst1q_u64(lmt_addr + 10, cmd1[2]);
+                               vst1q_u64(lmt_addr + 12, cmd0[3]);
+                               vst1q_u64(lmt_addr + 14, cmd1[3]);
+                               lmt_status = roc_lmt_submit_ldeor(io_addr);
+                       } while (lmt_status == 0);
+
+                       return;
+               }
+       }
+
+       for (j = 0; j < NIX_DESCS_PER_LOOP;) {
+               /* Fit consecutive packets in same LMTLINE. */
+               if ((segdw[j] + segdw[j + 1]) <= 8) {
+again0:
+                       if ((flags & NIX_TX_NEED_EXT_HDR) &&
+                           (flags & NIX_TX_OFFLOAD_TSTAMP_F)) {
+                               vst1q_u64(lmt_addr, cmd0[j]);
+                               vst1q_u64(lmt_addr + 2, cmd2[j]);
+                               vst1q_u64(lmt_addr + 4, cmd1[j]);
+                               /* Copy segs */
+                               off = segdw[j] - 4;
+                               roc_lmt_mov_seg(lmt_addr + 6, slist[j], off);
+                               off <<= 1;
+                               vst1q_u64(lmt_addr + 6 + off, cmd3[j]);
+
+                               vst1q_u64(lmt_addr + 8 + off, cmd0[j + 1]);
+                               vst1q_u64(lmt_addr + 10 + off, cmd2[j + 1]);
+                               vst1q_u64(lmt_addr + 12 + off, cmd1[j + 1]);
+                               roc_lmt_mov_seg(lmt_addr + 14 + off,
+                                               slist[j + 1], segdw[j + 1] - 4);
+                               off += ((segdw[j + 1] - 4) << 1);
+                               vst1q_u64(lmt_addr + 14 + off, cmd3[j + 1]);
+                       } else if (flags & NIX_TX_NEED_EXT_HDR) {
+                               vst1q_u64(lmt_addr, cmd0[j]);
+                               vst1q_u64(lmt_addr + 2, cmd2[j]);
+                               vst1q_u64(lmt_addr + 4, cmd1[j]);
+                               /* Copy segs */
+                               off = segdw[j] - 3;
+                               roc_lmt_mov_seg(lmt_addr + 6, slist[j], off);
+                               off <<= 1;
+                               vst1q_u64(lmt_addr + 6 + off, cmd0[j + 1]);
+                               vst1q_u64(lmt_addr + 8 + off, cmd2[j + 1]);
+                               vst1q_u64(lmt_addr + 10 + off, cmd1[j + 1]);
+                               roc_lmt_mov_seg(lmt_addr + 12 + off,
+                                               slist[j + 1], segdw[j + 1] - 3);
+                       } else {
+                               vst1q_u64(lmt_addr, cmd0[j]);
+                               vst1q_u64(lmt_addr + 2, cmd1[j]);
+                               /* Copy segs */
+                               off = segdw[j] - 2;
+                               roc_lmt_mov_seg(lmt_addr + 4, slist[j], off);
+                               off <<= 1;
+                               vst1q_u64(lmt_addr + 4 + off, cmd0[j + 1]);
+                               vst1q_u64(lmt_addr + 6 + off, cmd1[j + 1]);
+                               roc_lmt_mov_seg(lmt_addr + 8 + off,
+                                               slist[j + 1], segdw[j + 1] - 2);
+                       }
+                       lmt_status = roc_lmt_submit_ldeor(io_addr);
+                       if (lmt_status == 0)
+                               goto again0;
+                       j += 2;
+               } else {
+again1:
+                       if ((flags & NIX_TX_NEED_EXT_HDR) &&
+                           (flags & NIX_TX_OFFLOAD_TSTAMP_F)) {
+                               vst1q_u64(lmt_addr, cmd0[j]);
+                               vst1q_u64(lmt_addr + 2, cmd2[j]);
+                               vst1q_u64(lmt_addr + 4, cmd1[j]);
+                               /* Copy segs */
+                               off = segdw[j] - 4;
+                               roc_lmt_mov_seg(lmt_addr + 6, slist[j], off);
+                               off <<= 1;
+                               vst1q_u64(lmt_addr + 6 + off, cmd3[j]);
+                       } else if (flags & NIX_TX_NEED_EXT_HDR) {
+                               vst1q_u64(lmt_addr, cmd0[j]);
+                               vst1q_u64(lmt_addr + 2, cmd2[j]);
+                               vst1q_u64(lmt_addr + 4, cmd1[j]);
+                               /* Copy segs */
+                               off = segdw[j] - 3;
+                               roc_lmt_mov_seg(lmt_addr + 6, slist[j], off);
+                       } else {
+                               vst1q_u64(lmt_addr, cmd0[j]);
+                               vst1q_u64(lmt_addr + 2, cmd1[j]);
+                               /* Copy segs */
+                               off = segdw[j] - 2;
+                               roc_lmt_mov_seg(lmt_addr + 4, slist[j], off);
+                       }
+                       lmt_status = roc_lmt_submit_ldeor(io_addr);
+                       if (lmt_status == 0)
+                               goto again1;
+                       j += 1;
+               }
+       }
+}
+
 static __rte_always_inline uint16_t
 cn9k_nix_xmit_pkts_vector(void *tx_queue, 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;
-       uint64x2_t cmd0[NIX_DESCS_PER_LOOP], cmd1[NIX_DESCS_PER_LOOP];
+       uint64x2_t cmd0[NIX_DESCS_PER_LOOP], cmd1[NIX_DESCS_PER_LOOP],
+               cmd2[NIX_DESCS_PER_LOOP], cmd3[NIX_DESCS_PER_LOOP];
        uint64_t *mbuf0, *mbuf1, *mbuf2, *mbuf3;
        uint64x2_t senddesc01_w0, senddesc23_w0;
        uint64x2_t senddesc01_w1, senddesc23_w1;
+       uint64x2_t sendext01_w0, sendext23_w0;
+       uint64x2_t sendext01_w1, sendext23_w1;
+       uint64x2_t sendmem01_w0, sendmem23_w0;
+       uint64x2_t sendmem01_w1, sendmem23_w1;
        uint64x2_t sgdesc01_w0, sgdesc23_w0;
        uint64x2_t sgdesc01_w1, sgdesc23_w1;
        struct cn9k_eth_txq *txq = tx_queue;
@@ -575,19 +885,48 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
        /* Reduce the cached count */
        txq->fc_cache_pkts -= pkts;
 
+       /* Perform header writes before barrier for TSO */
+       if (flags & NIX_TX_OFFLOAD_TSO_F) {
+               for (i = 0; i < pkts; i++)
+                       cn9k_nix_xmit_prepare_tso(tx_pkts[i], flags);
+       }
+
        /* Lets commit any changes in the packet here as no further changes
         * to the packet will be done unless no fast free is enabled.
         */
        if (!(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F))
                rte_io_wmb();
 
-       senddesc01_w0 = vld1q_dup_u64(&txq->cmd[0]);
+       senddesc01_w0 = vld1q_dup_u64(&txq->send_hdr_w0);
        senddesc23_w0 = senddesc01_w0;
+
        senddesc01_w1 = vdupq_n_u64(0);
        senddesc23_w1 = senddesc01_w1;
-       sgdesc01_w0 = vld1q_dup_u64(&txq->cmd[2]);
+       sgdesc01_w0 = vdupq_n_u64((NIX_SUBDC_SG << 60) | BIT_ULL(48));
        sgdesc23_w0 = sgdesc01_w0;
 
+       if (flags & NIX_TX_NEED_EXT_HDR) {
+               if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
+                       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 = 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;
+       }
+
        for (i = 0; i < pkts; i += NIX_DESCS_PER_LOOP) {
                /* Clear lower 32bit of SEND_HDR_W0 and SEND_SG_W0 */
                senddesc01_w0 =
@@ -597,6 +936,31 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                senddesc23_w0 = senddesc01_w0;
                sgdesc23_w0 = sgdesc01_w0;
 
+               /* Clear vlan enables. */
+               if (flags & NIX_TX_NEED_EXT_HDR) {
+                       sendext01_w1 = vbicq_u64(sendext01_w1,
+                                                vdupq_n_u64(0x3FFFF00FFFF00));
+                       sendext23_w1 = sendext01_w1;
+               }
+
+               if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
+                       /* Reset send mem alg to SETTSTMP from SUB*/
+                       sendmem01_w0 = vbicq_u64(sendmem01_w0,
+                                                vdupq_n_u64(BIT_ULL(59)));
+                       /* Reset send mem address to default. */
+                       sendmem01_w1 =
+                               vbicq_u64(sendmem01_w1, vdupq_n_u64(0xF));
+                       sendmem23_w0 = sendmem01_w0;
+                       sendmem23_w1 = sendmem01_w1;
+               }
+
+               if (flags & NIX_TX_OFFLOAD_TSO_F) {
+                       /* Clear the LSO enable bit. */
+                       sendext01_w0 = vbicq_u64(sendext01_w0,
+                                                vdupq_n_u64(BIT_ULL(14)));
+                       sendext23_w0 = sendext01_w0;
+               }
+
                /* Move mbufs to iova */
                mbuf0 = (uint64_t *)tx_pkts[0];
                mbuf1 = (uint64_t *)tx_pkts[1];
@@ -739,26 +1103,26 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                        const uint8x16_t tbl = {
                                /* [0-15] = il4type:il3type */
                                0x04, /* none (IPv6 assumed) */
-                               0x14, /* PKT_TX_TCP_CKSUM (IPv6 assumed) */
-                               0x24, /* PKT_TX_SCTP_CKSUM (IPv6 assumed) */
-                               0x34, /* PKT_TX_UDP_CKSUM (IPv6 assumed) */
-                               0x03, /* PKT_TX_IP_CKSUM */
-                               0x13, /* PKT_TX_IP_CKSUM | PKT_TX_TCP_CKSUM */
-                               0x23, /* PKT_TX_IP_CKSUM | PKT_TX_SCTP_CKSUM */
-                               0x33, /* PKT_TX_IP_CKSUM | PKT_TX_UDP_CKSUM */
-                               0x02, /* PKT_TX_IPV4  */
-                               0x12, /* PKT_TX_IPV4 | PKT_TX_TCP_CKSUM */
-                               0x22, /* PKT_TX_IPV4 | PKT_TX_SCTP_CKSUM */
-                               0x32, /* PKT_TX_IPV4 | PKT_TX_UDP_CKSUM */
-                               0x03, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM */
-                               0x13, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                      * PKT_TX_TCP_CKSUM
+                               0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6 assumed) */
+                               0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM (IPv6 assumed) */
+                               0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6 assumed) */
+                               0x03, /* RTE_MBUF_F_TX_IP_CKSUM */
+                               0x13, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_TCP_CKSUM */
+                               0x23, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_SCTP_CKSUM */
+                               0x33, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_UDP_CKSUM */
+                               0x02, /* RTE_MBUF_F_TX_IPV4  */
+                               0x12, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_TCP_CKSUM */
+                               0x22, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_SCTP_CKSUM */
+                               0x32, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_UDP_CKSUM */
+                               0x03, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM */
+                               0x13, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                      * RTE_MBUF_F_TX_TCP_CKSUM
                                       */
-                               0x23, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                      * PKT_TX_SCTP_CKSUM
+                               0x23, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                      * RTE_MBUF_F_TX_SCTP_CKSUM
                                       */
-                               0x33, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                      * PKT_TX_UDP_CKSUM
+                               0x33, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                      * RTE_MBUF_F_TX_UDP_CKSUM
                                       */
                        };
 
@@ -943,40 +1307,40 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                                {
                                        /* [0-15] = il4type:il3type */
                                        0x04, /* none (IPv6) */
-                                       0x14, /* PKT_TX_TCP_CKSUM (IPv6) */
-                                       0x24, /* PKT_TX_SCTP_CKSUM (IPv6) */
-                                       0x34, /* PKT_TX_UDP_CKSUM (IPv6) */
-                                       0x03, /* PKT_TX_IP_CKSUM */
-                                       0x13, /* PKT_TX_IP_CKSUM |
-                                              * PKT_TX_TCP_CKSUM
+                                       0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6) */
+                                       0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM (IPv6) */
+                                       0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6) */
+                                       0x03, /* RTE_MBUF_F_TX_IP_CKSUM */
+                                       0x13, /* RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_TCP_CKSUM
                                               */
-                                       0x23, /* PKT_TX_IP_CKSUM |
-                                              * PKT_TX_SCTP_CKSUM
+                                       0x23, /* RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_SCTP_CKSUM
                                               */
-                                       0x33, /* PKT_TX_IP_CKSUM |
-                                              * PKT_TX_UDP_CKSUM
+                                       0x33, /* RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_UDP_CKSUM
                                               */
-                                       0x02, /* PKT_TX_IPV4 */
-                                       0x12, /* PKT_TX_IPV4 |
-                                              * PKT_TX_TCP_CKSUM
+                                       0x02, /* RTE_MBUF_F_TX_IPV4 */
+                                       0x12, /* RTE_MBUF_F_TX_IPV4 |
+                                              * RTE_MBUF_F_TX_TCP_CKSUM
                                               */
-                                       0x22, /* PKT_TX_IPV4 |
-                                              * PKT_TX_SCTP_CKSUM
+                                       0x22, /* RTE_MBUF_F_TX_IPV4 |
+                                              * RTE_MBUF_F_TX_SCTP_CKSUM
                                               */
-                                       0x32, /* PKT_TX_IPV4 |
-                                              * PKT_TX_UDP_CKSUM
+                                       0x32, /* RTE_MBUF_F_TX_IPV4 |
+                                              * RTE_MBUF_F_TX_UDP_CKSUM
                                               */
-                                       0x03, /* PKT_TX_IPV4 |
-                                              * PKT_TX_IP_CKSUM
+                                       0x03, /* RTE_MBUF_F_TX_IPV4 |
+                                              * RTE_MBUF_F_TX_IP_CKSUM
                                               */
-                                       0x13, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                              * PKT_TX_TCP_CKSUM
+                                       0x13, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_TCP_CKSUM
                                               */
-                                       0x23, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                              * PKT_TX_SCTP_CKSUM
+                                       0x23, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_SCTP_CKSUM
                                               */
-                                       0x33, /* PKT_TX_IPV4 | PKT_TX_IP_CKSUM |
-                                              * PKT_TX_UDP_CKSUM
+                                       0x33, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
+                                              * RTE_MBUF_F_TX_UDP_CKSUM
                                               */
                                },
 
@@ -1162,7 +1526,136 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                senddesc01_w0 = vorrq_u64(senddesc01_w0, xmask01);
                senddesc23_w0 = vorrq_u64(senddesc23_w0, xmask23);
 
-               if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
+               if (flags & NIX_TX_OFFLOAD_VLAN_QINQ_F) {
+                       /* Tx ol_flag for 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 = {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 */
+                       uint64x2_t ext01 = {
+                               ((uint32_t)tx_pkts[0]->vlan_tci_outer) << 8 |
+                                       ((uint64_t)tx_pkts[0]->vlan_tci) << 32,
+                               ((uint32_t)tx_pkts[1]->vlan_tci_outer) << 8 |
+                                       ((uint64_t)tx_pkts[1]->vlan_tci) << 32,
+                       };
+                       uint64x2_t ext23 = {
+                               ((uint32_t)tx_pkts[2]->vlan_tci_outer) << 8 |
+                                       ((uint64_t)tx_pkts[2]->vlan_tci) << 32,
+                               ((uint32_t)tx_pkts[3]->vlan_tci_outer) << 8 |
+                                       ((uint64_t)tx_pkts[3]->vlan_tci) << 32,
+                       };
+
+                       /* Get ol_flags of the packets. */
+                       xtmp128 = vzip1q_u64(len_olflags0, len_olflags1);
+                       ytmp128 = vzip1q_u64(len_olflags2, len_olflags3);
+
+                       /* ORR vlan outer/inner values into cmd. */
+                       sendext01_w1 = vorrq_u64(sendext01_w1, ext01);
+                       sendext23_w1 = vorrq_u64(sendext23_w1, ext23);
+
+                       /* Test for offload enable bits and generate masks. */
+                       xtmp128 = vorrq_u64(vandq_u64(vtstq_u64(xtmp128, olv),
+                                                     mlv),
+                                           vandq_u64(vtstq_u64(xtmp128, olq),
+                                                     mlq));
+                       ytmp128 = vorrq_u64(vandq_u64(vtstq_u64(ytmp128, olv),
+                                                     mlv),
+                                           vandq_u64(vtstq_u64(ytmp128, olq),
+                                                     mlq));
+
+                       /* Set vlan enable bits into cmd based on mask. */
+                       sendext01_w1 = vorrq_u64(sendext01_w1, xtmp128);
+                       sendext23_w1 = vorrq_u64(sendext23_w1, ytmp128);
+               }
+
+               if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
+                       /* 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. */
+                       const uint64x2_t addr = {0x8, 0x8};
+
+                       xtmp128 = vzip1q_u64(len_olflags0, len_olflags1);
+                       ytmp128 = vzip1q_u64(len_olflags2, len_olflags3);
+
+                       /* Check if timestamp is requested and generate inverted
+                        * mask as we need not make any changes to default cmd
+                        * value.
+                        */
+                       xtmp128 = vmvnq_u32(vtstq_u64(olf, xtmp128));
+                       ytmp128 = vmvnq_u32(vtstq_u64(olf, ytmp128));
+
+                       /* Change send mem address to an 8 byte offset when
+                        * TSTMP is disabled.
+                        */
+                       sendmem01_w1 = vaddq_u64(sendmem01_w1,
+                                                vandq_u64(xtmp128, addr));
+                       sendmem23_w1 = vaddq_u64(sendmem23_w1,
+                                                vandq_u64(ytmp128, addr));
+                       /* Change send mem alg to SUB when TSTMP is disabled. */
+                       sendmem01_w0 = vorrq_u64(sendmem01_w0,
+                                                vandq_u64(xtmp128, alg));
+                       sendmem23_w0 = vorrq_u64(sendmem23_w0,
+                                                vandq_u64(ytmp128, alg));
+
+                       cmd3[0] = vzip1q_u64(sendmem01_w0, sendmem01_w1);
+                       cmd3[1] = vzip2q_u64(sendmem01_w0, sendmem01_w1);
+                       cmd3[2] = vzip1q_u64(sendmem23_w0, sendmem23_w1);
+                       cmd3[3] = vzip2q_u64(sendmem23_w0, sendmem23_w1);
+               }
+
+               if (flags & NIX_TX_OFFLOAD_TSO_F) {
+                       uint64_t sx_w0[NIX_DESCS_PER_LOOP];
+                       uint64_t sd_w1[NIX_DESCS_PER_LOOP];
+
+                       /* Extract SD W1 as we need to set L4 types. */
+                       vst1q_u64(sd_w1, senddesc01_w1);
+                       vst1q_u64(sd_w1 + 2, senddesc23_w1);
+
+                       /* Extract SX W0 as we need to set LSO fields. */
+                       vst1q_u64(sx_w0, sendext01_w0);
+                       vst1q_u64(sx_w0 + 2, sendext23_w0);
+
+                       /* Extract ol_flags. */
+                       xtmp128 = vzip1q_u64(len_olflags0, len_olflags1);
+                       ytmp128 = vzip1q_u64(len_olflags2, len_olflags3);
+
+                       /* Prepare individual mbufs. */
+                       cn9k_nix_prepare_tso(tx_pkts[0],
+                               (union nix_send_hdr_w1_u *)&sd_w1[0],
+                               (union nix_send_ext_w0_u *)&sx_w0[0],
+                               vgetq_lane_u64(xtmp128, 0), flags);
+
+                       cn9k_nix_prepare_tso(tx_pkts[1],
+                               (union nix_send_hdr_w1_u *)&sd_w1[1],
+                               (union nix_send_ext_w0_u *)&sx_w0[1],
+                               vgetq_lane_u64(xtmp128, 1), flags);
+
+                       cn9k_nix_prepare_tso(tx_pkts[2],
+                               (union nix_send_hdr_w1_u *)&sd_w1[2],
+                               (union nix_send_ext_w0_u *)&sx_w0[2],
+                               vgetq_lane_u64(ytmp128, 0), flags);
+
+                       cn9k_nix_prepare_tso(tx_pkts[3],
+                               (union nix_send_hdr_w1_u *)&sd_w1[3],
+                               (union nix_send_ext_w0_u *)&sx_w0[3],
+                               vgetq_lane_u64(ytmp128, 1), flags);
+
+                       senddesc01_w1 = vld1q_u64(sd_w1);
+                       senddesc23_w1 = vld1q_u64(sd_w1 + 2);
+
+                       sendext01_w0 = vld1q_u64(sx_w0);
+                       sendext23_w0 = vld1q_u64(sx_w0 + 2);
+               }
+
+               if ((flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) &&
+                   !(flags & NIX_TX_MULTI_SEG_F)) {
                        /* Set don't free bit if reference count > 1 */
                        xmask01 = vdupq_n_u64(0);
                        xmask23 = xmask01;
@@ -1176,28 +1669,28 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                        if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf0))
                                vsetq_lane_u64(0x80000, xmask01, 0);
                        else
-                               __mempool_check_cookies(
+                               RTE_MEMPOOL_CHECK_COOKIES(
                                        ((struct rte_mbuf *)mbuf0)->pool,
                                        (void **)&mbuf0, 1, 0);
 
                        if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf1))
                                vsetq_lane_u64(0x80000, xmask01, 1);
                        else
-                               __mempool_check_cookies(
+                               RTE_MEMPOOL_CHECK_COOKIES(
                                        ((struct rte_mbuf *)mbuf1)->pool,
                                        (void **)&mbuf1, 1, 0);
 
                        if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf2))
                                vsetq_lane_u64(0x80000, xmask23, 0);
                        else
-                               __mempool_check_cookies(
+                               RTE_MEMPOOL_CHECK_COOKIES(
                                        ((struct rte_mbuf *)mbuf2)->pool,
                                        (void **)&mbuf2, 1, 0);
 
                        if (cnxk_nix_prefree_seg((struct rte_mbuf *)mbuf3))
                                vsetq_lane_u64(0x80000, xmask23, 1);
                        else
-                               __mempool_check_cookies(
+                               RTE_MEMPOOL_CHECK_COOKIES(
                                        ((struct rte_mbuf *)mbuf3)->pool,
                                        (void **)&mbuf3, 1, 0);
                        senddesc01_w0 = vorrq_u64(senddesc01_w0, xmask01);
@@ -1206,7 +1699,7 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                         * cnxk_nix_prefree_seg are written before LMTST.
                         */
                        rte_io_wmb();
-               } else {
+               } else if (!(flags & NIX_TX_MULTI_SEG_F)) {
                        /* Move mbufs to iova */
                        mbuf0 = (uint64_t *)tx_pkts[0];
                        mbuf1 = (uint64_t *)tx_pkts[1];
@@ -1216,19 +1709,19 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                        /* Mark mempool object as "put" since
                         * it is freed by NIX
                         */
-                       __mempool_check_cookies(
+                       RTE_MEMPOOL_CHECK_COOKIES(
                                ((struct rte_mbuf *)mbuf0)->pool,
                                (void **)&mbuf0, 1, 0);
 
-                       __mempool_check_cookies(
+                       RTE_MEMPOOL_CHECK_COOKIES(
                                ((struct rte_mbuf *)mbuf1)->pool,
                                (void **)&mbuf1, 1, 0);
 
-                       __mempool_check_cookies(
+                       RTE_MEMPOOL_CHECK_COOKIES(
                                ((struct rte_mbuf *)mbuf2)->pool,
                                (void **)&mbuf2, 1, 0);
 
-                       __mempool_check_cookies(
+                       RTE_MEMPOOL_CHECK_COOKIES(
                                ((struct rte_mbuf *)mbuf3)->pool,
                                (void **)&mbuf3, 1, 0);
 #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
@@ -1247,23 +1740,103 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
                cmd1[2] = vzip1q_u64(sgdesc23_w0, sgdesc23_w1);
                cmd1[3] = vzip2q_u64(sgdesc23_w0, sgdesc23_w1);
 
-               do {
-                       vst1q_u64(lmt_addr, cmd0[0]);
-                       vst1q_u64(lmt_addr + 2, cmd1[0]);
-                       vst1q_u64(lmt_addr + 4, cmd0[1]);
-                       vst1q_u64(lmt_addr + 6, cmd1[1]);
-                       vst1q_u64(lmt_addr + 8, cmd0[2]);
-                       vst1q_u64(lmt_addr + 10, cmd1[2]);
-                       vst1q_u64(lmt_addr + 12, cmd0[3]);
-                       vst1q_u64(lmt_addr + 14, cmd1[3]);
-                       lmt_status = roc_lmt_submit_ldeor(io_addr);
-               } while (lmt_status == 0);
+               if (flags & NIX_TX_NEED_EXT_HDR) {
+                       cmd2[0] = vzip1q_u64(sendext01_w0, sendext01_w1);
+                       cmd2[1] = vzip2q_u64(sendext01_w0, sendext01_w1);
+                       cmd2[2] = vzip1q_u64(sendext23_w0, sendext23_w1);
+                       cmd2[3] = vzip2q_u64(sendext23_w0, sendext23_w1);
+               }
+
+               if (flags & NIX_TX_MULTI_SEG_F) {
+                       uint64_t seg_list[NIX_DESCS_PER_LOOP]
+                                        [CNXK_NIX_TX_MSEG_SG_DWORDS - 2];
+                       uint8_t j, segdw[NIX_DESCS_PER_LOOP + 1];
+
+                       /* Build mseg list for each packet individually. */
+                       for (j = 0; j < NIX_DESCS_PER_LOOP; j++)
+                               segdw[j] = cn9k_nix_prepare_mseg_vec(tx_pkts[j],
+                                                       seg_list[j], &cmd0[j],
+                                                       &cmd1[j], flags);
+                       segdw[4] = 8;
+
+                       /* Commit all changes to mbuf before LMTST. */
+                       if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)
+                               rte_io_wmb();
+
+                       cn9k_nix_xmit_pkts_mseg_vector(cmd0, cmd1, cmd2, cmd3,
+                                                      segdw, seg_list,
+                                                      lmt_addr, io_addr,
+                                                      flags);
+               } else if (flags & NIX_TX_NEED_EXT_HDR) {
+                       /* With ext header in the command we can no longer send
+                        * all 4 packets together since LMTLINE is 128bytes.
+                        * Split and Tx twice.
+                        */
+                       do {
+                               if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
+                                       vst1q_u64(lmt_addr, cmd0[0]);
+                                       vst1q_u64(lmt_addr + 2, cmd2[0]);
+                                       vst1q_u64(lmt_addr + 4, cmd1[0]);
+                                       vst1q_u64(lmt_addr + 6, cmd3[0]);
+                                       vst1q_u64(lmt_addr + 8, cmd0[1]);
+                                       vst1q_u64(lmt_addr + 10, cmd2[1]);
+                                       vst1q_u64(lmt_addr + 12, cmd1[1]);
+                                       vst1q_u64(lmt_addr + 14, cmd3[1]);
+                               } else {
+                                       vst1q_u64(lmt_addr, cmd0[0]);
+                                       vst1q_u64(lmt_addr + 2, cmd2[0]);
+                                       vst1q_u64(lmt_addr + 4, cmd1[0]);
+                                       vst1q_u64(lmt_addr + 6, cmd0[1]);
+                                       vst1q_u64(lmt_addr + 8, cmd2[1]);
+                                       vst1q_u64(lmt_addr + 10, cmd1[1]);
+                               }
+                               lmt_status = roc_lmt_submit_ldeor(io_addr);
+                       } while (lmt_status == 0);
+
+                       do {
+                               if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
+                                       vst1q_u64(lmt_addr, cmd0[2]);
+                                       vst1q_u64(lmt_addr + 2, cmd2[2]);
+                                       vst1q_u64(lmt_addr + 4, cmd1[2]);
+                                       vst1q_u64(lmt_addr + 6, cmd3[2]);
+                                       vst1q_u64(lmt_addr + 8, cmd0[3]);
+                                       vst1q_u64(lmt_addr + 10, cmd2[3]);
+                                       vst1q_u64(lmt_addr + 12, cmd1[3]);
+                                       vst1q_u64(lmt_addr + 14, cmd3[3]);
+                               } else {
+                                       vst1q_u64(lmt_addr, cmd0[2]);
+                                       vst1q_u64(lmt_addr + 2, cmd2[2]);
+                                       vst1q_u64(lmt_addr + 4, cmd1[2]);
+                                       vst1q_u64(lmt_addr + 6, cmd0[3]);
+                                       vst1q_u64(lmt_addr + 8, cmd2[3]);
+                                       vst1q_u64(lmt_addr + 10, cmd1[3]);
+                               }
+                               lmt_status = roc_lmt_submit_ldeor(io_addr);
+                       } while (lmt_status == 0);
+               } else {
+                       do {
+                               vst1q_u64(lmt_addr, cmd0[0]);
+                               vst1q_u64(lmt_addr + 2, cmd1[0]);
+                               vst1q_u64(lmt_addr + 4, cmd0[1]);
+                               vst1q_u64(lmt_addr + 6, cmd1[1]);
+                               vst1q_u64(lmt_addr + 8, cmd0[2]);
+                               vst1q_u64(lmt_addr + 10, cmd1[2]);
+                               vst1q_u64(lmt_addr + 12, cmd0[3]);
+                               vst1q_u64(lmt_addr + 14, cmd1[3]);
+                               lmt_status = roc_lmt_submit_ldeor(io_addr);
+                       } while (lmt_status == 0);
+               }
                tx_pkts = tx_pkts + NIX_DESCS_PER_LOOP;
        }
 
-       if (unlikely(pkts_left))
-               pkts += cn9k_nix_xmit_pkts(tx_queue, tx_pkts, pkts_left, cmd,
-                                          flags);
+       if (unlikely(pkts_left)) {
+               if (flags & NIX_TX_MULTI_SEG_F)
+                       pkts += cn9k_nix_xmit_pkts_mseg(tx_queue, tx_pkts,
+                                                       pkts_left, cmd, flags);
+               else
+                       pkts += cn9k_nix_xmit_pkts(tx_queue, tx_pkts, pkts_left,
+                                                  cmd, flags);
+       }
 
        return pkts;
 }
@@ -1288,149 +1861,267 @@ cn9k_nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
 #define NOFF_F      NIX_TX_OFFLOAD_MBUF_NOFF_F
 #define TSO_F       NIX_TX_OFFLOAD_TSO_F
 #define TSP_F       NIX_TX_OFFLOAD_TSTAMP_F
-
-/* [TSP] [TSO] [NOFF] [VLAN] [OL3OL4CSUM] [L3L4CSUM] */
-#define NIX_TX_FASTPATH_MODES                                                 \
-T(no_offload,                          0, 0, 0, 0, 0, 0,       4,             \
-               NIX_TX_OFFLOAD_NONE)                                           \
-T(l3l4csum,                            0, 0, 0, 0, 0, 1,       4,             \
-               L3L4CSUM_F)                                                    \
-T(ol3ol4csum,                          0, 0, 0, 0, 1, 0,       4,             \
-               OL3OL4CSUM_F)                                                  \
-T(ol3ol4csum_l3l4csum,                 0, 0, 0, 0, 1, 1,       4,             \
-               OL3OL4CSUM_F | L3L4CSUM_F)                                     \
-T(vlan,                                        0, 0, 0, 1, 0, 0,       6,             \
-               VLAN_F)                                                        \
-T(vlan_l3l4csum,                       0, 0, 0, 1, 0, 1,       6,             \
-               VLAN_F | L3L4CSUM_F)                                           \
-T(vlan_ol3ol4csum,                     0, 0, 0, 1, 1, 0,       6,             \
-               VLAN_F | OL3OL4CSUM_F)                                         \
-T(vlan_ol3ol4csum_l3l4csum,            0, 0, 0, 1, 1, 1,       6,             \
-               VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                            \
-T(noff,                                        0, 0, 1, 0, 0, 0,       4,             \
-               NOFF_F)                                                        \
-T(noff_l3l4csum,                       0, 0, 1, 0, 0, 1,       4,             \
-               NOFF_F | L3L4CSUM_F)                                           \
-T(noff_ol3ol4csum,                     0, 0, 1, 0, 1, 0,       4,             \
-               NOFF_F | OL3OL4CSUM_F)                                         \
-T(noff_ol3ol4csum_l3l4csum,            0, 0, 1, 0, 1, 1,       4,             \
-               NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                            \
-T(noff_vlan,                           0, 0, 1, 1, 0, 0,       6,             \
-               NOFF_F | VLAN_F)                                               \
-T(noff_vlan_l3l4csum,                  0, 0, 1, 1, 0, 1,       6,             \
-               NOFF_F | VLAN_F | L3L4CSUM_F)                                  \
-T(noff_vlan_ol3ol4csum,                        0, 0, 1, 1, 1, 0,       6,             \
-               NOFF_F | VLAN_F | OL3OL4CSUM_F)                                \
-T(noff_vlan_ol3ol4csum_l3l4csum,       0, 0, 1, 1, 1, 1,       6,             \
-               NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                   \
-T(tso,                                 0, 1, 0, 0, 0, 0,       6,             \
-               TSO_F)                                                         \
-T(tso_l3l4csum,                                0, 1, 0, 0, 0, 1,       6,             \
-               TSO_F | L3L4CSUM_F)                                            \
-T(tso_ol3ol4csum,                      0, 1, 0, 0, 1, 0,       6,             \
-               TSO_F | OL3OL4CSUM_F)                                          \
-T(tso_ol3ol4csum_l3l4csum,             0, 1, 0, 0, 1, 1,       6,             \
-               TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                             \
-T(tso_vlan,                            0, 1, 0, 1, 0, 0,       6,             \
-               TSO_F | VLAN_F)                                                \
-T(tso_vlan_l3l4csum,                   0, 1, 0, 1, 0, 1,       6,             \
-               TSO_F | VLAN_F | L3L4CSUM_F)                                   \
-T(tso_vlan_ol3ol4csum,                 0, 1, 0, 1, 1, 0,       6,             \
-               TSO_F | VLAN_F | OL3OL4CSUM_F)                                 \
-T(tso_vlan_ol3ol4csum_l3l4csum,                0, 1, 0, 1, 1, 1,       6,             \
-               TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(tso_noff,                            0, 1, 1, 0, 0, 0,       6,             \
-               TSO_F | NOFF_F)                                                \
-T(tso_noff_l3l4csum,                   0, 1, 1, 0, 0, 1,       6,             \
-               TSO_F | NOFF_F | L3L4CSUM_F)                                   \
-T(tso_noff_ol3ol4csum,                 0, 1, 1, 0, 1, 0,       6,             \
-               TSO_F | NOFF_F | OL3OL4CSUM_F)                                 \
-T(tso_noff_ol3ol4csum_l3l4csum,                0, 1, 1, 0, 1, 1,       6,             \
-               TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(tso_noff_vlan,                       0, 1, 1, 1, 0, 0,       6,             \
-               TSO_F | NOFF_F | VLAN_F)                                       \
-T(tso_noff_vlan_l3l4csum,              0, 1, 1, 1, 0, 1,       6,             \
-               TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                          \
-T(tso_noff_vlan_ol3ol4csum,            0, 1, 1, 1, 1, 0,       6,             \
-               TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                        \
-T(tso_noff_vlan_ol3ol4csum_l3l4csum,   0, 1, 1, 1, 1, 1,       6,             \
-               TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)           \
-T(ts,                                  1, 0, 0, 0, 0, 0,       8,             \
-               TSP_F)                                                         \
-T(ts_l3l4csum,                         1, 0, 0, 0, 0, 1,       8,             \
-               TSP_F | L3L4CSUM_F)                                            \
-T(ts_ol3ol4csum,                       1, 0, 0, 0, 1, 0,       8,             \
-               TSP_F | OL3OL4CSUM_F)                                          \
-T(ts_ol3ol4csum_l3l4csum,              1, 0, 0, 0, 1, 1,       8,             \
-               TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)                             \
-T(ts_vlan,                             1, 0, 0, 1, 0, 0,       8,             \
-               TSP_F | VLAN_F)                                                \
-T(ts_vlan_l3l4csum,                    1, 0, 0, 1, 0, 1,       8,             \
-               TSP_F | VLAN_F | L3L4CSUM_F)                                   \
-T(ts_vlan_ol3ol4csum,                  1, 0, 0, 1, 1, 0,       8,             \
-               TSP_F | VLAN_F | OL3OL4CSUM_F)                                 \
-T(ts_vlan_ol3ol4csum_l3l4csum,         1, 0, 0, 1, 1, 1,       8,             \
-               TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(ts_noff,                             1, 0, 1, 0, 0, 0,       8,             \
-               TSP_F | NOFF_F)                                                \
-T(ts_noff_l3l4csum,                    1, 0, 1, 0, 0, 1,       8,             \
-               TSP_F | NOFF_F | L3L4CSUM_F)                                   \
-T(ts_noff_ol3ol4csum,                  1, 0, 1, 0, 1, 0,       8,             \
-               TSP_F | NOFF_F | OL3OL4CSUM_F)                                 \
-T(ts_noff_ol3ol4csum_l3l4csum,         1, 0, 1, 0, 1, 1,       8,             \
-               TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                    \
-T(ts_noff_vlan,                                1, 0, 1, 1, 0, 0,       8,             \
-               TSP_F | NOFF_F | VLAN_F)                                       \
-T(ts_noff_vlan_l3l4csum,               1, 0, 1, 1, 0, 1,       8,             \
-               TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)                          \
-T(ts_noff_vlan_ol3ol4csum,             1, 0, 1, 1, 1, 0,       8,             \
-               TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                        \
-T(ts_noff_vlan_ol3ol4csum_l3l4csum,    1, 0, 1, 1, 1, 1,       8,             \
-               TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)           \
-T(ts_tso,                              1, 1, 0, 0, 0, 0,       8,             \
-               TSP_F | TSO_F)                                                 \
-T(ts_tso_l3l4csum,                     1, 1, 0, 0, 0, 1,       8,             \
-               TSP_F | TSO_F | L3L4CSUM_F)                                    \
-T(ts_tso_ol3ol4csum,                   1, 1, 0, 0, 1, 0,       8,             \
-               TSP_F | TSO_F | OL3OL4CSUM_F)                                  \
-T(ts_tso_ol3ol4csum_l3l4csum,          1, 1, 0, 0, 1, 1,       8,             \
-               TSP_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                     \
-T(ts_tso_vlan,                         1, 1, 0, 1, 0, 0,       8,             \
-               TSP_F | TSO_F | VLAN_F)                                        \
-T(ts_tso_vlan_l3l4csum,                        1, 1, 0, 1, 0, 1,       8,             \
-               TSP_F | TSO_F | VLAN_F | L3L4CSUM_F)                           \
-T(ts_tso_vlan_ol3ol4csum,              1, 1, 0, 1, 1, 0,       8,             \
-               TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F)                         \
-T(ts_tso_vlan_ol3ol4csum_l3l4csum,     1, 1, 0, 1, 1, 1,       8,             \
-               TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)            \
-T(ts_tso_noff,                         1, 1, 1, 0, 0, 0,       8,             \
-               TSP_F | TSO_F | NOFF_F)                                        \
-T(ts_tso_noff_l3l4csum,                        1, 1, 1, 0, 0, 1,       8,             \
-               TSP_F | TSO_F | NOFF_F | L3L4CSUM_F)                           \
-T(ts_tso_noff_ol3ol4csum,              1, 1, 1, 0, 1, 0,       8,             \
-               TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F)                         \
-T(ts_tso_noff_ol3ol4csum_l3l4csum,     1, 1, 1, 0, 1, 1,       8,             \
-               TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)            \
-T(ts_tso_noff_vlan,                    1, 1, 1, 1, 0, 0,       8,             \
-               TSP_F | TSO_F | NOFF_F | VLAN_F)                               \
-T(ts_tso_noff_vlan_l3l4csum,           1, 1, 1, 1, 0, 1,       8,             \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                  \
-T(ts_tso_noff_vlan_ol3ol4csum,         1, 1, 1, 1, 1, 0,       8,             \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                \
-T(ts_tso_noff_vlan_ol3ol4csum_l3l4csum,        1, 1, 1, 1, 1, 1,       8,             \
-               TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
-
-#define T(name, f5, f4, f3, f2, f1, f0, sz, flags)                            \
+#define T_SEC_F      NIX_TX_OFFLOAD_SECURITY_F
+
+/* [T_SEC_F] [TSP] [TSO] [NOFF] [VLAN] [OL3OL4CSUM] [L3L4CSUM] */
+#define NIX_TX_FASTPATH_MODES_0_15                                             \
+       T(no_offload, 4, NIX_TX_OFFLOAD_NONE)                                  \
+       T(l3l4csum, 4, L3L4CSUM_F)                                             \
+       T(ol3ol4csum, 4, OL3OL4CSUM_F)                                         \
+       T(ol3ol4csum_l3l4csum, 4, OL3OL4CSUM_F | L3L4CSUM_F)                   \
+       T(vlan, 6, VLAN_F)                                                     \
+       T(vlan_l3l4csum, 6, VLAN_F | L3L4CSUM_F)                               \
+       T(vlan_ol3ol4csum, 6, VLAN_F | OL3OL4CSUM_F)                           \
+       T(vlan_ol3ol4csum_l3l4csum, 6, VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)     \
+       T(noff, 4, NOFF_F)                                                     \
+       T(noff_l3l4csum, 4, NOFF_F | L3L4CSUM_F)                               \
+       T(noff_ol3ol4csum, 4, NOFF_F | OL3OL4CSUM_F)                           \
+       T(noff_ol3ol4csum_l3l4csum, 4, NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)     \
+       T(noff_vlan, 6, NOFF_F | VLAN_F)                                       \
+       T(noff_vlan_l3l4csum, 6, NOFF_F | VLAN_F | L3L4CSUM_F)                 \
+       T(noff_vlan_ol3ol4csum, 6, NOFF_F | VLAN_F | OL3OL4CSUM_F)             \
+       T(noff_vlan_ol3ol4csum_l3l4csum, 6,                                    \
+         NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_16_31                                            \
+       T(tso, 6, TSO_F)                                                       \
+       T(tso_l3l4csum, 6, TSO_F | L3L4CSUM_F)                                 \
+       T(tso_ol3ol4csum, 6, TSO_F | OL3OL4CSUM_F)                             \
+       T(tso_ol3ol4csum_l3l4csum, 6, TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)       \
+       T(tso_vlan, 6, TSO_F | VLAN_F)                                         \
+       T(tso_vlan_l3l4csum, 6, TSO_F | VLAN_F | L3L4CSUM_F)                   \
+       T(tso_vlan_ol3ol4csum, 6, TSO_F | VLAN_F | OL3OL4CSUM_F)               \
+       T(tso_vlan_ol3ol4csum_l3l4csum, 6,                                     \
+         TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                          \
+       T(tso_noff, 6, TSO_F | NOFF_F)                                         \
+       T(tso_noff_l3l4csum, 6, TSO_F | NOFF_F | L3L4CSUM_F)                   \
+       T(tso_noff_ol3ol4csum, 6, TSO_F | NOFF_F | OL3OL4CSUM_F)               \
+       T(tso_noff_ol3ol4csum_l3l4csum, 6,                                     \
+         TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                          \
+       T(tso_noff_vlan, 6, TSO_F | NOFF_F | VLAN_F)                           \
+       T(tso_noff_vlan_l3l4csum, 6, TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)     \
+       T(tso_noff_vlan_ol3ol4csum, 6, TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F) \
+       T(tso_noff_vlan_ol3ol4csum_l3l4csum, 6,                                \
+         TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_32_47                                            \
+       T(ts, 8, TSP_F)                                                        \
+       T(ts_l3l4csum, 8, TSP_F | L3L4CSUM_F)                                  \
+       T(ts_ol3ol4csum, 8, TSP_F | OL3OL4CSUM_F)                              \
+       T(ts_ol3ol4csum_l3l4csum, 8, TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)        \
+       T(ts_vlan, 8, TSP_F | VLAN_F)                                          \
+       T(ts_vlan_l3l4csum, 8, TSP_F | VLAN_F | L3L4CSUM_F)                    \
+       T(ts_vlan_ol3ol4csum, 8, TSP_F | VLAN_F | OL3OL4CSUM_F)                \
+       T(ts_vlan_ol3ol4csum_l3l4csum, 8,                                      \
+         TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                          \
+       T(ts_noff, 8, TSP_F | NOFF_F)                                          \
+       T(ts_noff_l3l4csum, 8, TSP_F | NOFF_F | L3L4CSUM_F)                    \
+       T(ts_noff_ol3ol4csum, 8, TSP_F | NOFF_F | OL3OL4CSUM_F)                \
+       T(ts_noff_ol3ol4csum_l3l4csum, 8,                                      \
+         TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                          \
+       T(ts_noff_vlan, 8, TSP_F | NOFF_F | VLAN_F)                            \
+       T(ts_noff_vlan_l3l4csum, 8, TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)      \
+       T(ts_noff_vlan_ol3ol4csum, 8, TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)  \
+       T(ts_noff_vlan_ol3ol4csum_l3l4csum, 8,                                 \
+         TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_48_63                                            \
+       T(ts_tso, 8, TSP_F | TSO_F)                                            \
+       T(ts_tso_l3l4csum, 8, TSP_F | TSO_F | L3L4CSUM_F)                      \
+       T(ts_tso_ol3ol4csum, 8, TSP_F | TSO_F | OL3OL4CSUM_F)                  \
+       T(ts_tso_ol3ol4csum_l3l4csum, 8,                                       \
+         TSP_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                           \
+       T(ts_tso_vlan, 8, TSP_F | TSO_F | VLAN_F)                              \
+       T(ts_tso_vlan_l3l4csum, 8, TSP_F | TSO_F | VLAN_F | L3L4CSUM_F)        \
+       T(ts_tso_vlan_ol3ol4csum, 8, TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F)    \
+       T(ts_tso_vlan_ol3ol4csum_l3l4csum, 8,                                  \
+         TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                  \
+       T(ts_tso_noff, 8, TSP_F | TSO_F | NOFF_F)                              \
+       T(ts_tso_noff_l3l4csum, 8, TSP_F | TSO_F | NOFF_F | L3L4CSUM_F)        \
+       T(ts_tso_noff_ol3ol4csum, 8, TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F)    \
+       T(ts_tso_noff_ol3ol4csum_l3l4csum, 8,                                  \
+         TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                  \
+       T(ts_tso_noff_vlan, 8, TSP_F | TSO_F | NOFF_F | VLAN_F)                \
+       T(ts_tso_noff_vlan_l3l4csum, 8,                                        \
+         TSP_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                        \
+       T(ts_tso_noff_vlan_ol3ol4csum, 8,                                      \
+         TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                      \
+       T(ts_tso_noff_vlan_ol3ol4csum_l3l4csum, 8,                             \
+         TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_64_79                                            \
+       T(sec, 4, T_SEC_F)                                                     \
+       T(sec_l3l4csum, 4, T_SEC_F | L3L4CSUM_F)                               \
+       T(sec_ol3ol4csum, 4, T_SEC_F | OL3OL4CSUM_F)                           \
+       T(sec_ol3ol4csum_l3l4csum, 4, T_SEC_F | OL3OL4CSUM_F | L3L4CSUM_F)     \
+       T(sec_vlan, 6, T_SEC_F | VLAN_F)                                       \
+       T(sec_vlan_l3l4csum, 6, T_SEC_F | VLAN_F | L3L4CSUM_F)                 \
+       T(sec_vlan_ol3ol4csum, 6, T_SEC_F | VLAN_F | OL3OL4CSUM_F)             \
+       T(sec_vlan_ol3ol4csum_l3l4csum, 6,                                     \
+         T_SEC_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                        \
+       T(sec_noff, 4, T_SEC_F | NOFF_F)                                       \
+       T(sec_noff_l3l4csum, 4, T_SEC_F | NOFF_F | L3L4CSUM_F)                 \
+       T(sec_noff_ol3ol4csum, 4, T_SEC_F | NOFF_F | OL3OL4CSUM_F)             \
+       T(sec_noff_ol3ol4csum_l3l4csum, 4,                                     \
+         T_SEC_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                        \
+       T(sec_noff_vlan, 6, T_SEC_F | NOFF_F | VLAN_F)                         \
+       T(sec_noff_vlan_l3l4csum, 6, T_SEC_F | NOFF_F | VLAN_F | L3L4CSUM_F)   \
+       T(sec_noff_vlan_ol3ol4csum, 6,                                         \
+         T_SEC_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                            \
+       T(sec_noff_vlan_ol3ol4csum_l3l4csum, 6,                                \
+         T_SEC_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_80_95                                            \
+       T(sec_tso, 6, T_SEC_F | TSO_F)                                         \
+       T(sec_tso_l3l4csum, 6, T_SEC_F | TSO_F | L3L4CSUM_F)                   \
+       T(sec_tso_ol3ol4csum, 6, T_SEC_F | TSO_F | OL3OL4CSUM_F)               \
+       T(sec_tso_ol3ol4csum_l3l4csum, 6,                                      \
+         T_SEC_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                         \
+       T(sec_tso_vlan, 6, T_SEC_F | TSO_F | VLAN_F)                           \
+       T(sec_tso_vlan_l3l4csum, 6, T_SEC_F | TSO_F | VLAN_F | L3L4CSUM_F)     \
+       T(sec_tso_vlan_ol3ol4csum, 6, T_SEC_F | TSO_F | VLAN_F | OL3OL4CSUM_F) \
+       T(sec_tso_vlan_ol3ol4csum_l3l4csum, 6,                                 \
+         T_SEC_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                \
+       T(sec_tso_noff, 6, T_SEC_F | TSO_F | NOFF_F)                           \
+       T(sec_tso_noff_l3l4csum, 6, T_SEC_F | TSO_F | NOFF_F | L3L4CSUM_F)     \
+       T(sec_tso_noff_ol3ol4csum, 6, T_SEC_F | TSO_F | NOFF_F | OL3OL4CSUM_F) \
+       T(sec_tso_noff_ol3ol4csum_l3l4csum, 6,                                 \
+         T_SEC_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                \
+       T(sec_tso_noff_vlan, 6, T_SEC_F | TSO_F | NOFF_F | VLAN_F)             \
+       T(sec_tso_noff_vlan_l3l4csum, 6,                                       \
+         T_SEC_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)                      \
+       T(sec_tso_noff_vlan_ol3ol4csum, 6,                                     \
+         T_SEC_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                    \
+       T(sec_tso_noff_vlan_ol3ol4csum_l3l4csum, 6,                            \
+         T_SEC_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_96_111                                           \
+       T(sec_ts, 8, T_SEC_F | TSP_F)                                          \
+       T(sec_ts_l3l4csum, 8, T_SEC_F | TSP_F | L3L4CSUM_F)                    \
+       T(sec_ts_ol3ol4csum, 8, T_SEC_F | TSP_F | OL3OL4CSUM_F)                \
+       T(sec_ts_ol3ol4csum_l3l4csum, 8,                                       \
+         T_SEC_F | TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)                         \
+       T(sec_ts_vlan, 8, T_SEC_F | TSP_F | VLAN_F)                            \
+       T(sec_ts_vlan_l3l4csum, 8, T_SEC_F | TSP_F | VLAN_F | L3L4CSUM_F)      \
+       T(sec_ts_vlan_ol3ol4csum, 8, T_SEC_F | TSP_F | VLAN_F | OL3OL4CSUM_F)  \
+       T(sec_ts_vlan_ol3ol4csum_l3l4csum, 8,                                  \
+         T_SEC_F | TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)                \
+       T(sec_ts_noff, 8, T_SEC_F | TSP_F | NOFF_F)                            \
+       T(sec_ts_noff_l3l4csum, 8, T_SEC_F | TSP_F | NOFF_F | L3L4CSUM_F)      \
+       T(sec_ts_noff_ol3ol4csum, 8, T_SEC_F | TSP_F | NOFF_F | OL3OL4CSUM_F)  \
+       T(sec_ts_noff_ol3ol4csum_l3l4csum, 8,                                  \
+         T_SEC_F | TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)                \
+       T(sec_ts_noff_vlan, 8, T_SEC_F | TSP_F | NOFF_F | VLAN_F)              \
+       T(sec_ts_noff_vlan_l3l4csum, 8,                                        \
+         T_SEC_F | TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)                      \
+       T(sec_ts_noff_vlan_ol3ol4csum, 8,                                      \
+         T_SEC_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)                    \
+       T(sec_ts_noff_vlan_ol3ol4csum_l3l4csum, 8,                             \
+         T_SEC_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES_112_127                                          \
+       T(sec_ts_tso, 8, T_SEC_F | TSP_F | TSO_F)                              \
+       T(sec_ts_tso_l3l4csum, 8, T_SEC_F | TSP_F | TSO_F | L3L4CSUM_F)        \
+       T(sec_ts_tso_ol3ol4csum, 8, T_SEC_F | TSP_F | TSO_F | OL3OL4CSUM_F)    \
+       T(sec_ts_tso_ol3ol4csum_l3l4csum, 8,                                   \
+         T_SEC_F | TSP_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)                 \
+       T(sec_ts_tso_vlan, 8, T_SEC_F | TSP_F | TSO_F | VLAN_F)                \
+       T(sec_ts_tso_vlan_l3l4csum, 8,                                         \
+         T_SEC_F | TSP_F | TSO_F | VLAN_F | L3L4CSUM_F)                       \
+       T(sec_ts_tso_vlan_ol3ol4csum, 8,                                       \
+         T_SEC_F | TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F)                     \
+       T(sec_ts_tso_vlan_ol3ol4csum_l3l4csum, 8,                              \
+         T_SEC_F | TSP_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)        \
+       T(sec_ts_tso_noff, 8, T_SEC_F | TSP_F | TSO_F | NOFF_F)                \
+       T(sec_ts_tso_noff_l3l4csum, 8,                                         \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | L3L4CSUM_F)                       \
+       T(sec_ts_tso_noff_ol3ol4csum, 8,                                       \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F)                     \
+       T(sec_ts_tso_noff_ol3ol4csum_l3l4csum, 8,                              \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)        \
+       T(sec_ts_tso_noff_vlan, 8, T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F)  \
+       T(sec_ts_tso_noff_vlan_l3l4csum, 8,                                    \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)              \
+       T(sec_ts_tso_noff_vlan_ol3ol4csum, 8,                                  \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)            \
+       T(sec_ts_tso_noff_vlan_ol3ol4csum_l3l4csum, 8,                         \
+         T_SEC_F | TSP_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F |           \
+                 L3L4CSUM_F)
+
+#define NIX_TX_FASTPATH_MODES                                                  \
+       NIX_TX_FASTPATH_MODES_0_15                                             \
+       NIX_TX_FASTPATH_MODES_16_31                                            \
+       NIX_TX_FASTPATH_MODES_32_47                                            \
+       NIX_TX_FASTPATH_MODES_48_63                                            \
+       NIX_TX_FASTPATH_MODES_64_79                                            \
+       NIX_TX_FASTPATH_MODES_80_95                                            \
+       NIX_TX_FASTPATH_MODES_96_111                                           \
+       NIX_TX_FASTPATH_MODES_112_127
+
+#define T(name, sz, flags)                                                     \
        uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_##name(           \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_mseg_##name(      \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_vec_##name(       \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);     \
+       uint16_t __rte_noinline __rte_hot cn9k_nix_xmit_pkts_vec_mseg_##name(  \
                void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts);
 
 NIX_TX_FASTPATH_MODES
 #undef T
 
+#define NIX_TX_XMIT(fn, sz, flags)                                             \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               uint64_t cmd[sz];                                              \
+               /* For TSO inner checksum is a must */                         \
+               if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&                        \
+                   !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
+                       return 0;                                              \
+               return cn9k_nix_xmit_pkts(tx_queue, tx_pkts, pkts, cmd,        \
+                                         flags);                              \
+       }
+
+#define NIX_TX_XMIT_MSEG(fn, sz, flags)                                        \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2];           \
+               /* For TSO inner checksum is a must */                         \
+               if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&                        \
+                   !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
+                       return 0;                                              \
+               return cn9k_nix_xmit_pkts_mseg(tx_queue, tx_pkts, pkts, cmd,   \
+                                              (flags) | NIX_TX_MULTI_SEG_F);  \
+       }
+
+#define NIX_TX_XMIT_VEC(fn, sz, flags)                                         \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               uint64_t cmd[sz];                                              \
+               /* For TSO inner checksum is a must */                         \
+               if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&                        \
+                   !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
+                       return 0;                                              \
+               return cn9k_nix_xmit_pkts_vector(tx_queue, tx_pkts, pkts, cmd, \
+                                                (flags));                     \
+       }
+
+#define NIX_TX_XMIT_VEC_MSEG(fn, sz, flags)                                    \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2];           \
+               /* For TSO inner checksum is a must */                         \
+               if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&                        \
+                   !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))                  \
+                       return 0;                                              \
+               return cn9k_nix_xmit_pkts_vector(tx_queue, tx_pkts, pkts, cmd, \
+                                                (flags) |                     \
+                                                        NIX_TX_MULTI_SEG_F);  \
+       }
+
 #endif /* __CN9K_TX_H__ */