event/cnxk: store and reuse workslot status
[dpdk.git] / drivers / event / cnxk / cn9k_eventdev.c
index 3a0caa0..f8652d4 100644 (file)
@@ -9,16 +9,11 @@
 #define CN9K_DUAL_WS_NB_WS         2
 #define CN9K_DUAL_WS_PAIR_ID(x, id) (((x)*CN9K_DUAL_WS_NB_WS) + id)
 
-static void
-cn9k_init_hws_ops(struct cn9k_sso_hws_state *ws, uintptr_t base)
-{
-       ws->tag_op = base + SSOW_LF_GWS_TAG;
-       ws->wqp_op = base + SSOW_LF_GWS_WQP;
-       ws->getwrk_op = base + SSOW_LF_GWS_OP_GET_WORK0;
-       ws->swtag_flush_op = base + SSOW_LF_GWS_OP_SWTAG_FLUSH;
-       ws->swtag_norm_op = base + SSOW_LF_GWS_OP_SWTAG_NORM;
-       ws->swtag_desched_op = base + SSOW_LF_GWS_OP_SWTAG_DESCHED;
-}
+#define CN9K_SET_EVDEV_DEQ_OP(dev, deq_op, deq_ops)                            \
+       deq_op = deq_ops[dev->rx_offloads & (NIX_RX_OFFLOAD_MAX - 1)]
+
+#define CN9K_SET_EVDEV_ENQ_OP(dev, enq_op, enq_ops)                            \
+       enq_op = enq_ops[dev->tx_offloads & (NIX_TX_OFFLOAD_MAX - 1)]
 
 static int
 cn9k_sso_hws_link(void *arg, void *port, uint16_t *map, uint16_t nb_link)
@@ -69,7 +64,7 @@ cn9k_sso_hws_unlink(void *arg, void *port, uint16_t *map, uint16_t nb_link)
 }
 
 static void
-cn9k_sso_hws_setup(void *arg, void *hws, uintptr_t *grps_base)
+cn9k_sso_hws_setup(void *arg, void *hws, uintptr_t grp_base)
 {
        struct cnxk_sso_evdev *dev = arg;
        struct cn9k_sso_hws_dual *dws;
@@ -77,21 +72,19 @@ cn9k_sso_hws_setup(void *arg, void *hws, uintptr_t *grps_base)
        uint64_t val;
 
        /* Set get_work tmo for HWS */
-       val = NSEC2USEC(dev->deq_tmo_ns) - 1;
+       val = dev->deq_tmo_ns ? NSEC2USEC(dev->deq_tmo_ns) - 1 : 0;
        if (dev->dual_ws) {
                dws = hws;
-               rte_memcpy(dws->grps_base, grps_base,
-                          sizeof(uintptr_t) * CNXK_SSO_MAX_HWGRP);
-               dws->fc_mem = dev->fc_mem;
+               dws->grp_base = grp_base;
+               dws->fc_mem = (uint64_t *)dev->fc_iova;
                dws->xaq_lmt = dev->xaq_lmt;
 
                plt_write64(val, dws->base[0] + SSOW_LF_GWS_NW_TIM);
                plt_write64(val, dws->base[1] + SSOW_LF_GWS_NW_TIM);
        } else {
                ws = hws;
-               rte_memcpy(ws->grps_base, grps_base,
-                          sizeof(uintptr_t) * CNXK_SSO_MAX_HWGRP);
-               ws->fc_mem = dev->fc_mem;
+               ws->grp_base = grp_base;
+               ws->fc_mem = (uint64_t *)dev->fc_iova;
                ws->xaq_lmt = dev->xaq_lmt;
 
                plt_write64(val, ws->base + SSOW_LF_GWS_NW_TIM);
@@ -132,7 +125,6 @@ cn9k_sso_hws_flush_events(void *hws, uint8_t queue_id, uintptr_t base,
 {
        struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(arg);
        struct cn9k_sso_hws_dual *dws;
-       struct cn9k_sso_hws_state *st;
        struct cn9k_sso_hws *ws;
        uint64_t cq_ds_cnt = 1;
        uint64_t aq_cnt = 1;
@@ -154,22 +146,21 @@ cn9k_sso_hws_flush_events(void *hws, uint8_t queue_id, uintptr_t base,
 
        if (dev->dual_ws) {
                dws = hws;
-               st = &dws->ws_state[0];
                ws_base = dws->base[0];
        } else {
                ws = hws;
-               st = (struct cn9k_sso_hws_state *)ws;
                ws_base = ws->base;
        }
 
        while (aq_cnt || cq_ds_cnt || ds_cnt) {
-               plt_write64(req, st->getwrk_op);
-               cn9k_sso_hws_get_work_empty(st, &ev);
+               plt_write64(req, ws_base + SSOW_LF_GWS_OP_GET_WORK0);
+               cn9k_sso_hws_get_work_empty(ws_base, &ev);
                if (fn != NULL && ev.u64 != 0)
                        fn(arg, ev);
                if (ev.sched_type != SSO_TT_EMPTY)
-                       cnxk_sso_hws_swtag_flush(st->tag_op,
-                                                st->swtag_flush_op);
+                       cnxk_sso_hws_swtag_flush(
+                               ws_base + SSOW_LF_GWS_TAG,
+                               ws_base + SSOW_LF_GWS_OP_SWTAG_FLUSH);
                do {
                        val = plt_read64(ws_base + SSOW_LF_GWS_PENDSTATE);
                } while (val & BIT_ULL(56));
@@ -248,22 +239,342 @@ cn9k_sso_rsrc_init(void *arg, uint8_t hws, uint8_t hwgrp)
        return roc_sso_rsrc_init(&dev->sso, hws, hwgrp);
 }
 
+static int
+cn9k_sso_updt_tx_adptr_data(const struct rte_eventdev *event_dev)
+{
+       struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+       int i;
+
+       if (dev->tx_adptr_data == NULL)
+               return 0;
+
+       for (i = 0; i < dev->nb_event_ports; i++) {
+               if (dev->dual_ws) {
+                       struct cn9k_sso_hws_dual *dws =
+                               event_dev->data->ports[i];
+                       void *ws_cookie;
+
+                       ws_cookie = cnxk_sso_hws_get_cookie(dws);
+                       ws_cookie = rte_realloc_socket(
+                               ws_cookie,
+                               sizeof(struct cnxk_sso_hws_cookie) +
+                                       sizeof(struct cn9k_sso_hws_dual) +
+                                       dev->tx_adptr_data_sz,
+                               RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+                       if (ws_cookie == NULL)
+                               return -ENOMEM;
+                       dws = RTE_PTR_ADD(ws_cookie,
+                                         sizeof(struct cnxk_sso_hws_cookie));
+                       memcpy(&dws->tx_adptr_data, dev->tx_adptr_data,
+                              dev->tx_adptr_data_sz);
+                       event_dev->data->ports[i] = dws;
+               } else {
+                       struct cn9k_sso_hws *ws = event_dev->data->ports[i];
+                       void *ws_cookie;
+
+                       ws_cookie = cnxk_sso_hws_get_cookie(ws);
+                       ws_cookie = rte_realloc_socket(
+                               ws_cookie,
+                               sizeof(struct cnxk_sso_hws_cookie) +
+                                       sizeof(struct cn9k_sso_hws_dual) +
+                                       dev->tx_adptr_data_sz,
+                               RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+                       if (ws_cookie == NULL)
+                               return -ENOMEM;
+                       ws = RTE_PTR_ADD(ws_cookie,
+                                        sizeof(struct cnxk_sso_hws_cookie));
+                       memcpy(&ws->tx_adptr_data, dev->tx_adptr_data,
+                              dev->tx_adptr_data_sz);
+                       event_dev->data->ports[i] = ws;
+               }
+       }
+       rte_mb();
+
+       return 0;
+}
+
 static void
 cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 {
        struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+       /* Single WS modes */
+       const event_dequeue_t sso_hws_deq[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_deq_tmo[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_tmo_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_tmo_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_tmo_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_deq_ca[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_ca_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_ca_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_ca_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_deq_tmo_ca[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_tmo_ca_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_tmo_ca_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_tmo_ca_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_deq_seg[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_seg_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_seg_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_deq_tmo_seg[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_tmo_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_tmo_seg_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_tmo_seg_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_deq_ca_seg[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_ca_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_ca_seg_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_ca_seg_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_deq_tmo_ca_seg[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_tmo_ca_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_tmo_ca_seg_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       /* Dual WS modes */
+       const event_dequeue_t sso_hws_dual_deq[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_dual_deq_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_tmo[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_tmo_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_dual_deq_tmo_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_tmo_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_ca[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_ca_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_dual_deq_ca_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_ca_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_tmo_ca[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_tmo_ca_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_dual_deq_tmo_ca_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_seg[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_dual_deq_seg_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_seg_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_tmo_seg[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_tmo_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_dual_deq_tmo_seg_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_tmo_seg_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_ca_seg[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_ca_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_dual_deq_ca_seg_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_ca_seg_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_tmo_ca_seg[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_tmo_ca_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_dual_deq_tmo_ca_seg_burst[NIX_RX_OFFLOAD_MAX] = {
+#define R(name, flags)[flags] = cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       /* Tx modes */
+       const event_tx_adapter_enqueue_t sso_hws_tx_adptr_enq[NIX_TX_OFFLOAD_MAX] = {
+#define T(name, sz, flags)[flags] = cn9k_sso_hws_tx_adptr_enq_##name,
+               NIX_TX_FASTPATH_MODES
+#undef T
+       };
+
+       const event_tx_adapter_enqueue_t sso_hws_tx_adptr_enq_seg[NIX_TX_OFFLOAD_MAX] = {
+#define T(name, sz, flags)[flags] = cn9k_sso_hws_tx_adptr_enq_seg_##name,
+               NIX_TX_FASTPATH_MODES
+#undef T
+       };
+
+       const event_tx_adapter_enqueue_t sso_hws_dual_tx_adptr_enq[NIX_TX_OFFLOAD_MAX] = {
+#define T(name, sz, flags)[flags] = cn9k_sso_hws_dual_tx_adptr_enq_##name,
+               NIX_TX_FASTPATH_MODES
+#undef T
+       };
+
+       const event_tx_adapter_enqueue_t sso_hws_dual_tx_adptr_enq_seg[NIX_TX_OFFLOAD_MAX] = {
+#define T(name, sz, flags)[flags] = cn9k_sso_hws_dual_tx_adptr_enq_seg_##name,
+               NIX_TX_FASTPATH_MODES
+#undef T
+       };
 
        event_dev->enqueue = cn9k_sso_hws_enq;
        event_dev->enqueue_burst = cn9k_sso_hws_enq_burst;
        event_dev->enqueue_new_burst = cn9k_sso_hws_enq_new_burst;
        event_dev->enqueue_forward_burst = cn9k_sso_hws_enq_fwd_burst;
+       if (dev->rx_offloads & NIX_RX_MULTI_SEG_F) {
+               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue, sso_hws_deq_seg);
+               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                     sso_hws_deq_seg_burst);
+               if (dev->is_timeout_deq) {
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                             sso_hws_deq_tmo_seg);
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                             sso_hws_deq_tmo_seg_burst);
+               }
+               if (dev->is_ca_internal_port) {
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                             sso_hws_deq_ca_seg);
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                             sso_hws_deq_ca_seg_burst);
+               }
 
-       event_dev->dequeue = cn9k_sso_hws_deq;
-       event_dev->dequeue_burst = cn9k_sso_hws_deq_burst;
-       if (dev->deq_tmo_ns) {
-               event_dev->dequeue = cn9k_sso_hws_tmo_deq;
-               event_dev->dequeue_burst = cn9k_sso_hws_tmo_deq_burst;
+               if (dev->is_ca_internal_port && dev->is_timeout_deq) {
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                             sso_hws_deq_tmo_ca_seg);
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                             sso_hws_deq_tmo_ca_seg_burst);
+               }
+       } else {
+               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue, sso_hws_deq);
+               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                     sso_hws_deq_burst);
+               if (dev->is_timeout_deq) {
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                             sso_hws_deq_tmo);
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                             sso_hws_deq_tmo_burst);
+               }
+               if (dev->is_ca_internal_port) {
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                             sso_hws_deq_ca);
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                             sso_hws_deq_ca_burst);
+               }
+
+               if (dev->is_ca_internal_port && dev->is_timeout_deq) {
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                             sso_hws_deq_tmo_ca);
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                             sso_hws_deq_tmo_ca_burst);
+               }
        }
+       event_dev->ca_enqueue = cn9k_sso_hws_ca_enq;
+
+       if (dev->tx_offloads & NIX_TX_MULTI_SEG_F)
+               CN9K_SET_EVDEV_ENQ_OP(dev, event_dev->txa_enqueue,
+                                     sso_hws_tx_adptr_enq_seg);
+       else
+               CN9K_SET_EVDEV_ENQ_OP(dev, event_dev->txa_enqueue,
+                                     sso_hws_tx_adptr_enq);
 
        if (dev->dual_ws) {
                event_dev->enqueue = cn9k_sso_hws_dual_enq;
@@ -271,15 +582,73 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
                event_dev->enqueue_new_burst = cn9k_sso_hws_dual_enq_new_burst;
                event_dev->enqueue_forward_burst =
                        cn9k_sso_hws_dual_enq_fwd_burst;
-
-               event_dev->dequeue = cn9k_sso_hws_dual_deq;
-               event_dev->dequeue_burst = cn9k_sso_hws_dual_deq_burst;
-               if (dev->deq_tmo_ns) {
-                       event_dev->dequeue = cn9k_sso_hws_dual_tmo_deq;
-                       event_dev->dequeue_burst =
-                               cn9k_sso_hws_dual_tmo_deq_burst;
+               event_dev->ca_enqueue = cn9k_sso_hws_dual_ca_enq;
+
+               if (dev->rx_offloads & NIX_RX_MULTI_SEG_F) {
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                             sso_hws_dual_deq_seg);
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                             sso_hws_dual_deq_seg_burst);
+                       if (dev->is_timeout_deq) {
+                               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                                     sso_hws_dual_deq_tmo_seg);
+                               CN9K_SET_EVDEV_DEQ_OP(
+                                       dev, event_dev->dequeue_burst,
+                                       sso_hws_dual_deq_tmo_seg_burst);
+                       }
+                       if (dev->is_ca_internal_port) {
+                               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                                     sso_hws_dual_deq_ca_seg);
+                               CN9K_SET_EVDEV_DEQ_OP(
+                                       dev, event_dev->dequeue_burst,
+                                       sso_hws_dual_deq_ca_seg_burst);
+                       }
+                       if (dev->is_ca_internal_port && dev->is_timeout_deq) {
+                               CN9K_SET_EVDEV_DEQ_OP(
+                                       dev, event_dev->dequeue,
+                                       sso_hws_dual_deq_tmo_ca_seg);
+                               CN9K_SET_EVDEV_DEQ_OP(
+                                       dev, event_dev->dequeue_burst,
+                                       sso_hws_dual_deq_tmo_ca_seg_burst);
+                       }
+               } else {
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                             sso_hws_dual_deq);
+                       CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
+                                             sso_hws_dual_deq_burst);
+                       if (dev->is_timeout_deq) {
+                               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                                     sso_hws_dual_deq_tmo);
+                               CN9K_SET_EVDEV_DEQ_OP(
+                                       dev, event_dev->dequeue_burst,
+                                       sso_hws_dual_deq_tmo_burst);
+                       }
+                       if (dev->is_ca_internal_port) {
+                               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                                     sso_hws_dual_deq_ca);
+                               CN9K_SET_EVDEV_DEQ_OP(
+                                       dev, event_dev->dequeue_burst,
+                                       sso_hws_dual_deq_ca_burst);
+                       }
+                       if (dev->is_ca_internal_port && dev->is_timeout_deq) {
+                               CN9K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
+                                                     sso_hws_dual_deq_tmo_ca);
+                               CN9K_SET_EVDEV_DEQ_OP(
+                                       dev, event_dev->dequeue_burst,
+                                       sso_hws_dual_deq_tmo_ca_burst);
+                       }
                }
+
+               if (dev->tx_offloads & NIX_TX_MULTI_SEG_F)
+                       CN9K_SET_EVDEV_ENQ_OP(dev, event_dev->txa_enqueue,
+                                             sso_hws_dual_tx_adptr_enq_seg);
+               else
+                       CN9K_SET_EVDEV_ENQ_OP(dev, event_dev->txa_enqueue,
+                                             sso_hws_dual_tx_adptr_enq);
        }
+
+       event_dev->txa_enqueue_same_dest = event_dev->txa_enqueue;
+       rte_mb();
 }
 
 static void *
@@ -305,8 +674,6 @@ cn9k_sso_init_hws_mem(void *arg, uint8_t port_id)
                        &dev->sso, CN9K_DUAL_WS_PAIR_ID(port_id, 0));
                dws->base[1] = roc_sso_hws_base_get(
                        &dev->sso, CN9K_DUAL_WS_PAIR_ID(port_id, 1));
-               cn9k_init_hws_ops(&dws->ws_state[0], dws->base[0]);
-               cn9k_init_hws_ops(&dws->ws_state[1], dws->base[1]);
                dws->hws_id = port_id;
                dws->swtag_req = 0;
                dws->vws = 0;
@@ -326,7 +693,6 @@ cn9k_sso_init_hws_mem(void *arg, uint8_t port_id)
                /* First cache line is reserved for cookie */
                ws = RTE_PTR_ADD(ws, sizeof(struct cnxk_sso_hws_cookie));
                ws->base = roc_sso_hws_base_get(&dev->sso, port_id);
-               cn9k_init_hws_ops((struct cn9k_sso_hws_state *)ws, ws->base);
                ws->hws_id = port_id;
                ws->swtag_req = 0;
 
@@ -358,8 +724,6 @@ cn9k_sso_dev_configure(const struct rte_eventdev *event_dev)
                return -EINVAL;
        }
 
-       roc_sso_rsrc_fini(&dev->sso);
-
        rc = cn9k_sso_rsrc_init(dev, dev->nb_event_ports, dev->nb_event_queues);
        if (rc < 0) {
                plt_err("Failed to initialize SSO resources");
@@ -453,6 +817,10 @@ cn9k_sso_start(struct rte_eventdev *event_dev)
 {
        int rc;
 
+       rc = cn9k_sso_updt_tx_adptr_data(event_dev);
+       if (rc < 0)
+               return rc;
+
        rc = cnxk_sso_start(event_dev, cn9k_sso_hws_reset,
                            cn9k_sso_hws_flush_events);
        if (rc < 0)
@@ -481,7 +849,230 @@ cn9k_sso_selftest(void)
        return cnxk_sso_selftest(RTE_STR(event_cn9k));
 }
 
-static struct rte_eventdev_ops cn9k_sso_dev_ops = {
+static int
+cn9k_sso_rx_adapter_caps_get(const struct rte_eventdev *event_dev,
+                            const struct rte_eth_dev *eth_dev, uint32_t *caps)
+{
+       int rc;
+
+       RTE_SET_USED(event_dev);
+       rc = strncmp(eth_dev->device->driver->name, "net_cn9k", 9);
+       if (rc)
+               *caps = RTE_EVENT_ETH_RX_ADAPTER_SW_CAP;
+       else
+               *caps = RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT |
+                       RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ |
+                       RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID;
+
+       return 0;
+}
+
+static void
+cn9k_sso_set_priv_mem(const struct rte_eventdev *event_dev, void *lookup_mem,
+                     void *tstmp_info)
+{
+       struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+       int i;
+
+       for (i = 0; i < dev->nb_event_ports; i++) {
+               if (dev->dual_ws) {
+                       struct cn9k_sso_hws_dual *dws =
+                               event_dev->data->ports[i];
+                       dws->lookup_mem = lookup_mem;
+                       dws->tstamp = tstmp_info;
+               } else {
+                       struct cn9k_sso_hws *ws = event_dev->data->ports[i];
+                       ws->lookup_mem = lookup_mem;
+                       ws->tstamp = tstmp_info;
+               }
+       }
+}
+
+static int
+cn9k_sso_rx_adapter_queue_add(
+       const struct rte_eventdev *event_dev, const struct rte_eth_dev *eth_dev,
+       int32_t rx_queue_id,
+       const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
+{
+       struct cn9k_eth_rxq *rxq;
+       void *lookup_mem;
+       void *tstmp_info;
+       int rc;
+
+       rc = strncmp(eth_dev->device->driver->name, "net_cn9k", 8);
+       if (rc)
+               return -EINVAL;
+
+       rc = cnxk_sso_rx_adapter_queue_add(event_dev, eth_dev, rx_queue_id,
+                                          queue_conf);
+       if (rc)
+               return -EINVAL;
+
+       rxq = eth_dev->data->rx_queues[0];
+       lookup_mem = rxq->lookup_mem;
+       tstmp_info = rxq->tstamp;
+       cn9k_sso_set_priv_mem(event_dev, lookup_mem, tstmp_info);
+       cn9k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
+
+       return 0;
+}
+
+static int
+cn9k_sso_rx_adapter_queue_del(const struct rte_eventdev *event_dev,
+                             const struct rte_eth_dev *eth_dev,
+                             int32_t rx_queue_id)
+{
+       int rc;
+
+       rc = strncmp(eth_dev->device->driver->name, "net_cn9k", 8);
+       if (rc)
+               return -EINVAL;
+
+       return cnxk_sso_rx_adapter_queue_del(event_dev, eth_dev, rx_queue_id);
+}
+
+static int
+cn9k_sso_tx_adapter_caps_get(const struct rte_eventdev *dev,
+                            const struct rte_eth_dev *eth_dev, uint32_t *caps)
+{
+       int ret;
+
+       RTE_SET_USED(dev);
+       ret = strncmp(eth_dev->device->driver->name, "net_cn9k", 8);
+       if (ret)
+               *caps = 0;
+       else
+               *caps = RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT;
+
+       return 0;
+}
+
+static void
+cn9k_sso_txq_fc_update(const struct rte_eth_dev *eth_dev, int32_t tx_queue_id,
+                      bool ena)
+{
+       struct cnxk_eth_dev *cnxk_eth_dev = eth_dev->data->dev_private;
+       struct cn9k_eth_txq *txq;
+       struct roc_nix_sq *sq;
+       int i;
+
+       if (tx_queue_id < 0) {
+               for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+                       cn9k_sso_txq_fc_update(eth_dev, i, ena);
+       } else {
+               uint16_t sq_limit;
+
+               sq = &cnxk_eth_dev->sqs[tx_queue_id];
+               txq = eth_dev->data->tx_queues[tx_queue_id];
+               sq_limit =
+                       ena ? RTE_MIN(CNXK_SSO_SQB_LIMIT, sq->aura_sqb_bufs) :
+                                   sq->nb_sqb_bufs;
+               txq->nb_sqb_bufs_adj =
+                       sq_limit -
+                       RTE_ALIGN_MUL_CEIL(sq_limit,
+                                          (1ULL << txq->sqes_per_sqb_log2)) /
+                               (1ULL << txq->sqes_per_sqb_log2);
+               txq->nb_sqb_bufs_adj = (70 * txq->nb_sqb_bufs_adj) / 100;
+       }
+}
+
+static int
+cn9k_sso_tx_adapter_queue_add(uint8_t id, const struct rte_eventdev *event_dev,
+                             const struct rte_eth_dev *eth_dev,
+                             int32_t tx_queue_id)
+{
+       struct cnxk_eth_dev *cnxk_eth_dev = eth_dev->data->dev_private;
+       struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+       uint64_t tx_offloads;
+       int rc;
+
+       RTE_SET_USED(id);
+       rc = cnxk_sso_tx_adapter_queue_add(event_dev, eth_dev, tx_queue_id);
+       if (rc < 0)
+               return rc;
+
+       /* Can't enable tstamp if all the ports don't have it enabled. */
+       tx_offloads = cnxk_eth_dev->tx_offload_flags;
+       if (dev->tx_adptr_configured) {
+               uint8_t tstmp_req = !!(tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F);
+               uint8_t tstmp_ena =
+                       !!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F);
+
+               if (tstmp_ena && !tstmp_req)
+                       dev->tx_offloads &= ~(NIX_TX_OFFLOAD_TSTAMP_F);
+               else if (!tstmp_ena && tstmp_req)
+                       tx_offloads &= ~(NIX_TX_OFFLOAD_TSTAMP_F);
+       }
+
+       dev->tx_offloads |= tx_offloads;
+       cn9k_sso_txq_fc_update(eth_dev, tx_queue_id, true);
+       rc = cn9k_sso_updt_tx_adptr_data(event_dev);
+       if (rc < 0)
+               return rc;
+       cn9k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
+       dev->tx_adptr_configured = 1;
+
+       return 0;
+}
+
+static int
+cn9k_sso_tx_adapter_queue_del(uint8_t id, const struct rte_eventdev *event_dev,
+                             const struct rte_eth_dev *eth_dev,
+                             int32_t tx_queue_id)
+{
+       int rc;
+
+       RTE_SET_USED(id);
+       rc = cnxk_sso_tx_adapter_queue_del(event_dev, eth_dev, tx_queue_id);
+       if (rc < 0)
+               return rc;
+       cn9k_sso_txq_fc_update(eth_dev, tx_queue_id, false);
+       return cn9k_sso_updt_tx_adptr_data(event_dev);
+}
+
+static int
+cn9k_crypto_adapter_caps_get(const struct rte_eventdev *event_dev,
+                            const struct rte_cryptodev *cdev, uint32_t *caps)
+{
+       CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k");
+       CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k");
+
+       *caps = RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD |
+               RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA;
+
+       return 0;
+}
+
+static int
+cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
+                          const struct rte_cryptodev *cdev,
+                          int32_t queue_pair_id, const struct rte_event *event)
+{
+       struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+
+       RTE_SET_USED(event);
+
+       CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k");
+       CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k");
+
+       dev->is_ca_internal_port = 1;
+       cn9k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
+
+       return cnxk_crypto_adapter_qp_add(event_dev, cdev, queue_pair_id);
+}
+
+static int
+cn9k_crypto_adapter_qp_del(const struct rte_eventdev *event_dev,
+                          const struct rte_cryptodev *cdev,
+                          int32_t queue_pair_id)
+{
+       CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn9k");
+       CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn9k");
+
+       return cnxk_crypto_adapter_qp_del(cdev, queue_pair_id);
+}
+
+static struct eventdev_ops cn9k_sso_dev_ops = {
        .dev_infos_get = cn9k_sso_info_get,
        .dev_configure = cn9k_sso_dev_configure,
        .queue_def_conf = cnxk_sso_queue_def_conf,
@@ -494,8 +1085,22 @@ static struct rte_eventdev_ops cn9k_sso_dev_ops = {
        .port_unlink = cn9k_sso_port_unlink,
        .timeout_ticks = cnxk_sso_timeout_ticks,
 
+       .eth_rx_adapter_caps_get = cn9k_sso_rx_adapter_caps_get,
+       .eth_rx_adapter_queue_add = cn9k_sso_rx_adapter_queue_add,
+       .eth_rx_adapter_queue_del = cn9k_sso_rx_adapter_queue_del,
+       .eth_rx_adapter_start = cnxk_sso_rx_adapter_start,
+       .eth_rx_adapter_stop = cnxk_sso_rx_adapter_stop,
+
+       .eth_tx_adapter_caps_get = cn9k_sso_tx_adapter_caps_get,
+       .eth_tx_adapter_queue_add = cn9k_sso_tx_adapter_queue_add,
+       .eth_tx_adapter_queue_del = cn9k_sso_tx_adapter_queue_del,
+
        .timer_adapter_caps_get = cnxk_tim_caps_get,
 
+       .crypto_adapter_caps_get = cn9k_crypto_adapter_caps_get,
+       .crypto_adapter_queue_pair_add = cn9k_crypto_adapter_qp_add,
+       .crypto_adapter_queue_pair_del = cn9k_crypto_adapter_qp_del,
+
        .dump = cnxk_sso_dump,
        .dev_start = cn9k_sso_start,
        .dev_stop = cn9k_sso_stop,
@@ -554,6 +1159,16 @@ cn9k_sso_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 }
 
 static const struct rte_pci_id cn9k_pci_sso_map[] = {
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
        {
                .vendor_id = 0,
        },
@@ -571,5 +1186,9 @@ RTE_PMD_REGISTER_PCI_TABLE(event_cn9k, cn9k_pci_sso_map);
 RTE_PMD_REGISTER_KMOD_DEP(event_cn9k, "vfio-pci");
 RTE_PMD_REGISTER_PARAM_STRING(event_cn9k, CNXK_SSO_XAE_CNT "=<int>"
                              CNXK_SSO_GGRP_QOS "=<string>"
+                             CNXK_SSO_FORCE_BP "=1"
                              CN9K_SSO_SINGLE_WS "=1"
-                             CNXK_TIM_DISABLE_NPA "=1");
+                             CNXK_TIM_DISABLE_NPA "=1"
+                             CNXK_TIM_CHNK_SLOTS "=<int>"
+                             CNXK_TIM_RINGS_LMT "=<int>"
+                             CNXK_TIM_STATS_ENA "=1");