event/cnxk: store and reuse workslot status
[dpdk.git] / drivers / event / cnxk / cn9k_worker.h
index d536c0a..8455272 100644 (file)
@@ -31,17 +31,18 @@ cn9k_sso_hws_new_event(struct cn9k_sso_hws *ws, const struct rte_event *ev)
        if (ws->xaq_lmt <= *ws->fc_mem)
                return 0;
 
-       cnxk_sso_hws_add_work(event_ptr, tag, new_tt, ws->grps_base[grp]);
+       cnxk_sso_hws_add_work(event_ptr, tag, new_tt,
+                             ws->grp_base + (grp << 12));
        return 1;
 }
 
 static __rte_always_inline void
-cn9k_sso_hws_fwd_swtag(struct cn9k_sso_hws_state *vws,
-                      const struct rte_event *ev)
+cn9k_sso_hws_fwd_swtag(uint64_t base, const struct rte_event *ev)
 {
        const uint32_t tag = (uint32_t)ev->event;
        const uint8_t new_tt = ev->sched_type;
-       const uint8_t cur_tt = CNXK_TT_FROM_TAG(plt_read64(vws->tag_op));
+       const uint8_t cur_tt =
+               CNXK_TT_FROM_TAG(plt_read64(base + SSOW_LF_GWS_TAG));
 
        /* CNXK model
         * cur_tt/new_tt     SSO_TT_ORDERED SSO_TT_ATOMIC SSO_TT_UNTAGGED
@@ -53,24 +54,24 @@ cn9k_sso_hws_fwd_swtag(struct cn9k_sso_hws_state *vws,
 
        if (new_tt == SSO_TT_UNTAGGED) {
                if (cur_tt != SSO_TT_UNTAGGED)
-                       cnxk_sso_hws_swtag_untag(
-                               CN9K_SSOW_GET_BASE_ADDR(vws->getwrk_op) +
-                               SSOW_LF_GWS_OP_SWTAG_UNTAG);
+                       cnxk_sso_hws_swtag_untag(base +
+                                                SSOW_LF_GWS_OP_SWTAG_UNTAG);
        } else {
-               cnxk_sso_hws_swtag_norm(tag, new_tt, vws->swtag_norm_op);
+               cnxk_sso_hws_swtag_norm(tag, new_tt,
+                                       base + SSOW_LF_GWS_OP_SWTAG_NORM);
        }
 }
 
 static __rte_always_inline void
-cn9k_sso_hws_fwd_group(struct cn9k_sso_hws_state *ws,
-                      const struct rte_event *ev, const uint16_t grp)
+cn9k_sso_hws_fwd_group(uint64_t base, const struct rte_event *ev,
+                      const uint16_t grp)
 {
        const uint32_t tag = (uint32_t)ev->event;
        const uint8_t new_tt = ev->sched_type;
 
-       plt_write64(ev->u64, CN9K_SSOW_GET_BASE_ADDR(ws->getwrk_op) +
-                                    SSOW_LF_GWS_OP_UPD_WQP_GRP1);
-       cnxk_sso_hws_swtag_desched(tag, new_tt, grp, ws->swtag_desched_op);
+       plt_write64(ev->u64, base + SSOW_LF_GWS_OP_UPD_WQP_GRP1);
+       cnxk_sso_hws_swtag_desched(tag, new_tt, grp,
+                                  base + SSOW_LF_GWS_OP_SWTAG_DESCHED);
 }
 
 static __rte_always_inline void
@@ -79,8 +80,8 @@ cn9k_sso_hws_forward_event(struct cn9k_sso_hws *ws, const struct rte_event *ev)
        const uint8_t grp = ev->queue_id;
 
        /* Group hasn't changed, Use SWTAG to forward the event */
-       if (CNXK_GRP_FROM_TAG(plt_read64(ws->tag_op)) == grp) {
-               cn9k_sso_hws_fwd_swtag((struct cn9k_sso_hws_state *)ws, ev);
+       if (CNXK_GRP_FROM_TAG(plt_read64(ws->base + SSOW_LF_GWS_TAG)) == grp) {
+               cn9k_sso_hws_fwd_swtag(ws->base, ev);
                ws->swtag_req = 1;
        } else {
                /*
@@ -88,8 +89,7 @@ cn9k_sso_hws_forward_event(struct cn9k_sso_hws *ws, const struct rte_event *ev)
                 * Use deschedule/add_work operation to transfer the event to
                 * new group/core
                 */
-               cn9k_sso_hws_fwd_group((struct cn9k_sso_hws_state *)ws, ev,
-                                      grp);
+               cn9k_sso_hws_fwd_group(ws->base, ev, grp);
        }
 }
 
@@ -108,20 +108,20 @@ cn9k_sso_hws_dual_new_event(struct cn9k_sso_hws_dual *dws,
        if (dws->xaq_lmt <= *dws->fc_mem)
                return 0;
 
-       cnxk_sso_hws_add_work(event_ptr, tag, new_tt, dws->grps_base[grp]);
+       cnxk_sso_hws_add_work(event_ptr, tag, new_tt,
+                             dws->grp_base + (grp << 12));
        return 1;
 }
 
 static __rte_always_inline void
-cn9k_sso_hws_dual_forward_event(struct cn9k_sso_hws_dual *dws,
-                               struct cn9k_sso_hws_state *vws,
+cn9k_sso_hws_dual_forward_event(struct cn9k_sso_hws_dual *dws, uint64_t base,
                                const struct rte_event *ev)
 {
        const uint8_t grp = ev->queue_id;
 
        /* Group hasn't changed, Use SWTAG to forward the event */
-       if (CNXK_GRP_FROM_TAG(plt_read64(vws->tag_op)) == grp) {
-               cn9k_sso_hws_fwd_swtag(vws, ev);
+       if (CNXK_GRP_FROM_TAG(plt_read64(base + SSOW_LF_GWS_TAG)) == grp) {
+               cn9k_sso_hws_fwd_swtag(base, ev);
                dws->swtag_req = 1;
        } else {
                /*
@@ -129,7 +129,7 @@ cn9k_sso_hws_dual_forward_event(struct cn9k_sso_hws_dual *dws,
                 * Use deschedule/add_work operation to transfer the event to
                 * new group/core
                 */
-               cn9k_sso_hws_fwd_group(vws, ev, grp);
+               cn9k_sso_hws_fwd_group(base, ev, grp);
        }
 }
 
@@ -147,8 +147,7 @@ cn9k_wqe_to_mbuf(uint64_t wqe, const uint64_t mbuf, uint8_t port_id,
 }
 
 static __rte_always_inline uint16_t
-cn9k_sso_hws_dual_get_work(struct cn9k_sso_hws_state *ws,
-                          struct cn9k_sso_hws_state *ws_pair,
+cn9k_sso_hws_dual_get_work(uint64_t base, uint64_t pair_base,
                           struct rte_event *ev, const uint32_t flags,
                           const void *const lookup_mem,
                           struct cnxk_timesync_info *const tstamp)
@@ -175,14 +174,15 @@ cn9k_sso_hws_dual_get_work(struct cn9k_sso_hws_state *ws,
                     "          prfm pldl1keep, [%[mbuf]]       \n"
                     : [tag] "=&r"(gw.u64[0]), [wqp] "=&r"(gw.u64[1]),
                       [mbuf] "=&r"(mbuf)
-                    : [tag_loc] "r"(ws->tag_op), [wqp_loc] "r"(ws->wqp_op),
-                      [gw] "r"(set_gw), [pong] "r"(ws_pair->getwrk_op));
+                    : [tag_loc] "r"(base + SSOW_LF_GWS_TAG),
+                      [wqp_loc] "r"(base + SSOW_LF_GWS_WQP), [gw] "r"(set_gw),
+                      [pong] "r"(pair_base + SSOW_LF_GWS_OP_GET_WORK0));
 #else
-       gw.u64[0] = plt_read64(ws->tag_op);
+       gw.u64[0] = plt_read64(base + SSOW_LF_GWS_TAG);
        while ((BIT_ULL(63)) & gw.u64[0])
-               gw.u64[0] = plt_read64(ws->tag_op);
-       gw.u64[1] = plt_read64(ws->wqp_op);
-       plt_write64(set_gw, ws_pair->getwrk_op);
+               gw.u64[0] = plt_read64(base + SSOW_LF_GWS_TAG);
+       gw.u64[1] = plt_read64(base + SSOW_LF_GWS_WQP);
+       plt_write64(set_gw, pair_base + SSOW_LF_GWS_OP_GET_WORK0);
        mbuf = (uint64_t)((char *)gw.u64[1] - sizeof(struct rte_mbuf));
 #endif
 
@@ -234,7 +234,7 @@ cn9k_sso_hws_get_work(struct cn9k_sso_hws *ws, struct rte_event *ev,
 
        plt_write64(BIT_ULL(16) | /* wait for work. */
                            1,    /* Use Mask set 0. */
-                   ws->getwrk_op);
+                   ws->base + SSOW_LF_GWS_OP_GET_WORK0);
 
        if (flags & NIX_RX_OFFLOAD_PTYPE_F)
                rte_prefetch_non_temporal(lookup_mem);
@@ -253,13 +253,14 @@ cn9k_sso_hws_get_work(struct cn9k_sso_hws *ws, struct rte_event *ev,
                     "          prfm pldl1keep, [%[mbuf]]       \n"
                     : [tag] "=&r"(gw.u64[0]), [wqp] "=&r"(gw.u64[1]),
                       [mbuf] "=&r"(mbuf)
-                    : [tag_loc] "r"(ws->tag_op), [wqp_loc] "r"(ws->wqp_op));
+                    : [tag_loc] "r"(ws->base + SSOW_LF_GWS_TAG),
+                      [wqp_loc] "r"(ws->base + SSOW_LF_GWS_WQP));
 #else
-       gw.u64[0] = plt_read64(ws->tag_op);
+       gw.u64[0] = plt_read64(ws->base + SSOW_LF_GWS_TAG);
        while ((BIT_ULL(63)) & gw.u64[0])
-               gw.u64[0] = plt_read64(ws->tag_op);
+               gw.u64[0] = plt_read64(ws->base + SSOW_LF_GWS_TAG);
 
-       gw.u64[1] = plt_read64(ws->wqp_op);
+       gw.u64[1] = plt_read64(ws->base + SSOW_LF_GWS_WQP);
        mbuf = (uint64_t)((char *)gw.u64[1] - sizeof(struct rte_mbuf));
 #endif
 
@@ -301,7 +302,7 @@ cn9k_sso_hws_get_work(struct cn9k_sso_hws *ws, struct rte_event *ev,
 
 /* Used in cleaning up workslot. */
 static __rte_always_inline uint16_t
-cn9k_sso_hws_get_work_empty(struct cn9k_sso_hws_state *ws, struct rte_event *ev)
+cn9k_sso_hws_get_work_empty(uint64_t base, struct rte_event *ev)
 {
        union {
                __uint128_t get_work;
@@ -323,13 +324,14 @@ cn9k_sso_hws_get_work_empty(struct cn9k_sso_hws_state *ws, struct rte_event *ev)
                     "          sub %[mbuf], %[wqp], #0x80      \n"
                     : [tag] "=&r"(gw.u64[0]), [wqp] "=&r"(gw.u64[1]),
                       [mbuf] "=&r"(mbuf)
-                    : [tag_loc] "r"(ws->tag_op), [wqp_loc] "r"(ws->wqp_op));
+                    : [tag_loc] "r"(base + SSOW_LF_GWS_TAG),
+                      [wqp_loc] "r"(base + SSOW_LF_GWS_WQP));
 #else
-       gw.u64[0] = plt_read64(ws->tag_op);
+       gw.u64[0] = plt_read64(base + SSOW_LF_GWS_TAG);
        while ((BIT_ULL(63)) & gw.u64[0])
-               gw.u64[0] = plt_read64(ws->tag_op);
+               gw.u64[0] = plt_read64(base + SSOW_LF_GWS_TAG);
 
-       gw.u64[1] = plt_read64(ws->wqp_op);
+       gw.u64[1] = plt_read64(base + SSOW_LF_GWS_WQP);
        mbuf = (uint64_t)((char *)gw.u64[1] - sizeof(struct rte_mbuf));
 #endif
 
@@ -383,7 +385,7 @@ uint16_t __rte_hot cn9k_sso_hws_ca_enq(void *port, struct rte_event ev[],
 uint16_t __rte_hot cn9k_sso_hws_dual_ca_enq(void *port, struct rte_event ev[],
                                            uint16_t nb_events);
 
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+#define R(name, flags)                                                         \
        uint16_t __rte_hot cn9k_sso_hws_deq_##name(                            \
                void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
        uint16_t __rte_hot cn9k_sso_hws_deq_burst_##name(                      \
@@ -399,6 +401,11 @@ uint16_t __rte_hot cn9k_sso_hws_dual_ca_enq(void *port, struct rte_event ev[],
        uint16_t __rte_hot cn9k_sso_hws_deq_ca_burst_##name(                   \
                void *port, struct rte_event ev[], uint16_t nb_events,         \
                uint64_t timeout_ticks);                                       \
+       uint16_t __rte_hot cn9k_sso_hws_deq_tmo_ca_##name(                     \
+               void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
+       uint16_t __rte_hot cn9k_sso_hws_deq_tmo_ca_burst_##name(               \
+               void *port, struct rte_event ev[], uint16_t nb_events,         \
+               uint64_t timeout_ticks);                                       \
        uint16_t __rte_hot cn9k_sso_hws_deq_seg_##name(                        \
                void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
        uint16_t __rte_hot cn9k_sso_hws_deq_seg_burst_##name(                  \
@@ -412,13 +419,59 @@ uint16_t __rte_hot cn9k_sso_hws_dual_ca_enq(void *port, struct rte_event ev[],
        uint16_t __rte_hot cn9k_sso_hws_deq_ca_seg_##name(                     \
                void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
        uint16_t __rte_hot cn9k_sso_hws_deq_ca_seg_burst_##name(               \
+               void *port, struct rte_event ev[], uint16_t nb_events,         \
+               uint64_t timeout_ticks);                                       \
+       uint16_t __rte_hot cn9k_sso_hws_deq_tmo_ca_seg_##name(                 \
+               void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
+       uint16_t __rte_hot cn9k_sso_hws_deq_tmo_ca_seg_burst_##name(           \
                void *port, struct rte_event ev[], uint16_t nb_events,         \
                uint64_t timeout_ticks);
 
 NIX_RX_FASTPATH_MODES
 #undef R
 
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+#define SSO_DEQ(fn, flags)                                                     \
+       uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
+                             uint64_t timeout_ticks)                          \
+       {                                                                      \
+               struct cn9k_sso_hws *ws = port;                                \
+               RTE_SET_USED(timeout_ticks);                                   \
+               if (ws->swtag_req) {                                           \
+                       ws->swtag_req = 0;                                     \
+                       cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_TAG);   \
+                       return 1;                                              \
+               }                                                              \
+               return cn9k_sso_hws_get_work(ws, ev, flags, ws->lookup_mem);   \
+       }
+
+#define SSO_DEQ_SEG(fn, flags)   SSO_DEQ(fn, flags | NIX_RX_MULTI_SEG_F)
+#define SSO_DEQ_CA(fn, flags)    SSO_DEQ(fn, flags | CPT_RX_WQE_F)
+#define SSO_DEQ_CA_SEG(fn, flags) SSO_DEQ_SEG(fn, flags | CPT_RX_WQE_F)
+
+#define SSO_DEQ_TMO(fn, flags)                                                 \
+       uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
+                             uint64_t timeout_ticks)                          \
+       {                                                                      \
+               struct cn9k_sso_hws *ws = port;                                \
+               uint16_t ret = 1;                                              \
+               uint64_t iter;                                                 \
+               if (ws->swtag_req) {                                           \
+                       ws->swtag_req = 0;                                     \
+                       cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_TAG);   \
+                       return ret;                                            \
+               }                                                              \
+               ret = cn9k_sso_hws_get_work(ws, ev, flags, ws->lookup_mem);    \
+               for (iter = 1; iter < timeout_ticks && (ret == 0); iter++)     \
+                       ret = cn9k_sso_hws_get_work(ws, ev, flags,             \
+                                                   ws->lookup_mem);           \
+               return ret;                                                    \
+       }
+
+#define SSO_DEQ_TMO_SEG(fn, flags)    SSO_DEQ_TMO(fn, flags | NIX_RX_MULTI_SEG_F)
+#define SSO_DEQ_TMO_CA(fn, flags)     SSO_DEQ_TMO(fn, flags | CPT_RX_WQE_F)
+#define SSO_DEQ_TMO_CA_SEG(fn, flags) SSO_DEQ_TMO_SEG(fn, flags | CPT_RX_WQE_F)
+
+#define R(name, flags)                                                         \
        uint16_t __rte_hot cn9k_sso_hws_dual_deq_##name(                       \
                void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
        uint16_t __rte_hot cn9k_sso_hws_dual_deq_burst_##name(                 \
@@ -434,6 +487,11 @@ NIX_RX_FASTPATH_MODES
        uint16_t __rte_hot cn9k_sso_hws_dual_deq_ca_burst_##name(              \
                void *port, struct rte_event ev[], uint16_t nb_events,         \
                uint64_t timeout_ticks);                                       \
+       uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_ca_##name(                \
+               void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
+       uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_ca_burst_##name(          \
+               void *port, struct rte_event ev[], uint16_t nb_events,         \
+               uint64_t timeout_ticks);                                       \
        uint16_t __rte_hot cn9k_sso_hws_dual_deq_seg_##name(                   \
                void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
        uint16_t __rte_hot cn9k_sso_hws_dual_deq_seg_burst_##name(             \
@@ -447,12 +505,91 @@ NIX_RX_FASTPATH_MODES
        uint16_t __rte_hot cn9k_sso_hws_dual_deq_ca_seg_##name(                \
                void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
        uint16_t __rte_hot cn9k_sso_hws_dual_deq_ca_seg_burst_##name(          \
+               void *port, struct rte_event ev[], uint16_t nb_events,         \
+               uint64_t timeout_ticks);                                       \
+       uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_ca_seg_##name(            \
+               void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
+       uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name(      \
                void *port, struct rte_event ev[], uint16_t nb_events,         \
                uint64_t timeout_ticks);
 
 NIX_RX_FASTPATH_MODES
 #undef R
 
+#define SSO_DUAL_DEQ(fn, flags)                                                \
+       uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
+                             uint64_t timeout_ticks)                          \
+       {                                                                      \
+               struct cn9k_sso_hws_dual *dws = port;                          \
+               uint16_t gw;                                                   \
+               RTE_SET_USED(timeout_ticks);                                   \
+               if (dws->swtag_req) {                                          \
+                       dws->swtag_req = 0;                                    \
+                       cnxk_sso_hws_swtag_wait(dws->base[!dws->vws] +         \
+                                               SSOW_LF_GWS_TAG);              \
+                       return 1;                                              \
+               }                                                              \
+               gw = cn9k_sso_hws_dual_get_work(                               \
+                       dws->base[dws->vws], dws->base[!dws->vws], ev, flags,  \
+                       dws->lookup_mem, dws->tstamp);                         \
+               dws->vws = !dws->vws;                                          \
+               return gw;                                                     \
+       }
+
+#define SSO_DUAL_DEQ_SEG(fn, flags) SSO_DUAL_DEQ(fn, flags | NIX_RX_MULTI_SEG_F)
+#define SSO_DUAL_DEQ_CA(fn, flags)  SSO_DUAL_DEQ(fn, flags | CPT_RX_WQE_F)
+#define SSO_DUAL_DEQ_CA_SEG(fn, flags)                                         \
+       SSO_DUAL_DEQ_SEG(fn, flags | CPT_RX_WQE_F)
+
+#define SSO_DUAL_DEQ_TMO(fn, flags)                                            \
+       uint16_t __rte_hot fn(void *port, struct rte_event *ev,                \
+                             uint64_t timeout_ticks)                          \
+       {                                                                      \
+               struct cn9k_sso_hws_dual *dws = port;                          \
+               uint16_t ret = 1;                                              \
+               uint64_t iter;                                                 \
+               if (dws->swtag_req) {                                          \
+                       dws->swtag_req = 0;                                    \
+                       cnxk_sso_hws_swtag_wait(dws->base[!dws->vws] +         \
+                                               SSOW_LF_GWS_TAG);              \
+                       return ret;                                            \
+               }                                                              \
+               ret = cn9k_sso_hws_dual_get_work(                              \
+                       dws->base[dws->vws], dws->base[!dws->vws], ev, flags,  \
+                       dws->lookup_mem, dws->tstamp);                         \
+               dws->vws = !dws->vws;                                          \
+               for (iter = 1; iter < timeout_ticks && (ret == 0); iter++) {   \
+                       ret = cn9k_sso_hws_dual_get_work(                      \
+                               dws->base[dws->vws], dws->base[!dws->vws], ev, \
+                               flags, dws->lookup_mem, dws->tstamp);          \
+                       dws->vws = !dws->vws;                                  \
+               }                                                              \
+               return ret;                                                    \
+       }
+
+#define SSO_DUAL_DEQ_TMO_SEG(fn, flags)                                        \
+       SSO_DUAL_DEQ_TMO(fn, flags | NIX_RX_MULTI_SEG_F)
+#define SSO_DUAL_DEQ_TMO_CA(fn, flags)                                         \
+       SSO_DUAL_DEQ_TMO(fn, flags | CPT_RX_WQE_F)
+#define SSO_DUAL_DEQ_TMO_CA_SEG(fn, flags)                                     \
+       SSO_DUAL_DEQ_TMO_SEG(fn, flags | CPT_RX_WQE_F)
+
+#define SSO_CMN_DEQ_BURST(fnb, fn, flags)                                      \
+       uint16_t __rte_hot fnb(void *port, struct rte_event ev[],              \
+                              uint16_t nb_events, uint64_t timeout_ticks)     \
+       {                                                                      \
+               RTE_SET_USED(nb_events);                                       \
+               return fn(port, ev, timeout_ticks);                            \
+       }
+
+#define SSO_CMN_DEQ_SEG_BURST(fnb, fn, flags)                                  \
+       uint16_t __rte_hot fnb(void *port, struct rte_event ev[],              \
+                              uint16_t nb_events, uint64_t timeout_ticks)     \
+       {                                                                      \
+               RTE_SET_USED(nb_events);                                       \
+               return fn(port, ev, timeout_ticks);                            \
+       }
+
 static __rte_always_inline void
 cn9k_sso_txq_fc_wait(const struct cn9k_eth_txq *txq)
 {
@@ -462,20 +599,13 @@ cn9k_sso_txq_fc_wait(const struct cn9k_eth_txq *txq)
                ;
 }
 
-static __rte_always_inline const struct cn9k_eth_txq *
-cn9k_sso_hws_xtract_meta(struct rte_mbuf *m,
-                        const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT])
+static __rte_always_inline struct cn9k_eth_txq *
+cn9k_sso_hws_xtract_meta(struct rte_mbuf *m, uint64_t *txq_data)
 {
-       return (const struct cn9k_eth_txq *)
-               txq_data[m->port][rte_event_eth_tx_adapter_txq_get(m)];
-}
-
-static __rte_always_inline void
-cn9k_sso_hws_prepare_pkt(const struct cn9k_eth_txq *txq, struct rte_mbuf *m,
-                        uint64_t *cmd, const uint32_t flags)
-{
-       roc_lmt_mov(cmd, txq->cmd, cn9k_nix_tx_ext_subs(flags));
-       cn9k_nix_xmit_prepare(m, cmd, flags, txq->lso_tun_fmt);
+       return (struct cn9k_eth_txq
+                       *)(txq_data[(txq_data[m->port] >> 48) +
+                                   rte_event_eth_tx_adapter_txq_get(m)] &
+                          (BIT_ULL(48) - 1));
 }
 
 #if defined(RTE_ARCH_ARM64)
@@ -532,7 +662,7 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base,
        nixtx += BIT_ULL(7);
        nixtx = (nixtx - 1) & ~(BIT_ULL(7) - 1);
 
-       roc_lmt_mov((void *)(nixtx + 16), cmd, cn9k_nix_tx_ext_subs(flags));
+       roc_lmt_mov_nv((void *)(nixtx + 16), cmd, cn9k_nix_tx_ext_subs(flags));
 
        /* Load opcode and cptr already prepared at pkt metadata set */
        pkt_len -= l2_len;
@@ -570,7 +700,7 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base,
 
        /* Head wait if needed */
        if (base)
-               roc_sso_hws_head_wait(base + SSOW_LF_GWS_TAG);
+               roc_sso_hws_head_wait(base);
 
        /* ESN */
        outb_priv = roc_nix_inl_onf_ipsec_outb_sa_sw_rsvd((void *)sa);
@@ -619,12 +749,11 @@ cn9k_sso_hws_xmit_sec_one(const struct cn9k_eth_txq *txq, uint64_t base,
 
 static __rte_always_inline uint16_t
 cn9k_sso_hws_event_tx(uint64_t base, struct rte_event *ev, uint64_t *cmd,
-                     const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT],
-                     const uint32_t flags)
+                     uint64_t *txq_data, const uint32_t flags)
 {
        struct rte_mbuf *m = ev->mbuf;
-       const struct cn9k_eth_txq *txq;
        uint16_t ref_cnt = m->refcnt;
+       struct cn9k_eth_txq *txq;
 
        /* Perform header writes before barrier for TSO */
        cn9k_nix_xmit_prepare_tso(m, flags);
@@ -637,7 +766,8 @@ cn9k_sso_hws_event_tx(uint64_t base, struct rte_event *ev, uint64_t *cmd,
            !(flags & NIX_TX_OFFLOAD_SECURITY_F))
                rte_io_wmb();
        txq = cn9k_sso_hws_xtract_meta(m, txq_data);
-       cn9k_sso_hws_prepare_pkt(txq, m, cmd, flags);
+       cn9k_nix_tx_skeleton(txq, cmd, flags, 0);
+       cn9k_nix_xmit_prepare(m, cmd, flags, txq->lso_tun_fmt);
 
        if (flags & NIX_TX_OFFLOAD_SECURITY_F) {
                uint64_t ol_flags = m->ol_flags;
@@ -659,9 +789,11 @@ cn9k_sso_hws_event_tx(uint64_t base, struct rte_event *ev, uint64_t *cmd,
 
        if (flags & NIX_TX_MULTI_SEG_F) {
                const uint16_t segdw = cn9k_nix_prepare_mseg(m, cmd, flags);
+               cn9k_nix_xmit_prepare_tstamp(txq, cmd, m->ol_flags, segdw,
+                                            flags);
                if (!CNXK_TT_FROM_EVENT(ev->event)) {
                        cn9k_nix_xmit_mseg_prep_lmt(cmd, txq->lmt_addr, segdw);
-                       roc_sso_hws_head_wait(base + SSOW_LF_GWS_TAG);
+                       roc_sso_hws_head_wait(base);
                        cn9k_sso_txq_fc_wait(txq);
                        if (cn9k_nix_xmit_submit_lmt(txq->io_addr) == 0)
                                cn9k_nix_xmit_mseg_one(cmd, txq->lmt_addr,
@@ -671,9 +803,10 @@ cn9k_sso_hws_event_tx(uint64_t base, struct rte_event *ev, uint64_t *cmd,
                                               segdw);
                }
        } else {
+               cn9k_nix_xmit_prepare_tstamp(txq, cmd, m->ol_flags, 4, flags);
                if (!CNXK_TT_FROM_EVENT(ev->event)) {
                        cn9k_nix_xmit_prep_lmt(cmd, txq->lmt_addr, flags);
-                       roc_sso_hws_head_wait(base + SSOW_LF_GWS_TAG);
+                       roc_sso_hws_head_wait(base);
                        cn9k_sso_txq_fc_wait(txq);
                        if (cn9k_nix_xmit_submit_lmt(txq->io_addr) == 0)
                                cn9k_nix_xmit_one(cmd, txq->lmt_addr,
@@ -696,7 +829,7 @@ done:
        return 1;
 }
 
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+#define T(name, sz, flags)                                                     \
        uint16_t __rte_hot cn9k_sso_hws_tx_adptr_enq_##name(                   \
                void *port, struct rte_event ev[], uint16_t nb_events);        \
        uint16_t __rte_hot cn9k_sso_hws_tx_adptr_enq_seg_##name(               \
@@ -709,4 +842,52 @@ done:
 NIX_TX_FASTPATH_MODES
 #undef T
 
+#define SSO_TX(fn, sz, flags)                                                  \
+       uint16_t __rte_hot fn(void *port, struct rte_event ev[],               \
+                             uint16_t nb_events)                              \
+       {                                                                      \
+               struct cn9k_sso_hws *ws = port;                                \
+               uint64_t cmd[sz];                                              \
+               RTE_SET_USED(nb_events);                                       \
+               return cn9k_sso_hws_event_tx(ws->base, &ev[0], cmd,            \
+                                            (uint64_t *)ws->tx_adptr_data,    \
+                                            flags);                           \
+       }
+
+#define SSO_TX_SEG(fn, sz, flags)                                              \
+       uint16_t __rte_hot fn(void *port, struct rte_event ev[],               \
+                             uint16_t nb_events)                              \
+       {                                                                      \
+               uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2];           \
+               struct cn9k_sso_hws *ws = port;                                \
+               RTE_SET_USED(nb_events);                                       \
+               return cn9k_sso_hws_event_tx(ws->base, &ev[0], cmd,            \
+                                            (uint64_t *)ws->tx_adptr_data,    \
+                                            (flags) | NIX_TX_MULTI_SEG_F);    \
+       }
+
+#define SSO_DUAL_TX(fn, sz, flags)                                             \
+       uint16_t __rte_hot fn(void *port, struct rte_event ev[],               \
+                             uint16_t nb_events)                              \
+       {                                                                      \
+               struct cn9k_sso_hws_dual *ws = port;                           \
+               uint64_t cmd[sz];                                              \
+               RTE_SET_USED(nb_events);                                       \
+               return cn9k_sso_hws_event_tx(ws->base[!ws->vws], &ev[0], cmd,  \
+                                            (uint64_t *)ws->tx_adptr_data,    \
+                                            flags);                           \
+       }
+
+#define SSO_DUAL_TX_SEG(fn, sz, flags)                                         \
+       uint16_t __rte_hot fn(void *port, struct rte_event ev[],               \
+                             uint16_t nb_events)                              \
+       {                                                                      \
+               uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2];           \
+               struct cn9k_sso_hws_dual *ws = port;                           \
+               RTE_SET_USED(nb_events);                                       \
+               return cn9k_sso_hws_event_tx(ws->base[!ws->vws], &ev[0], cmd,  \
+                                            (uint64_t *)ws->tx_adptr_data,    \
+                                            (flags) | NIX_TX_MULTI_SEG_F);    \
+       }
+
 #endif