net/ice: fix flow redirect
[dpdk.git] / drivers / event / cnxk / cn9k_eventdev.c
index 21f8032..d757da7 100644 (file)
@@ -9,6 +9,24 @@
 #define CN9K_DUAL_WS_NB_WS         2
 #define CN9K_DUAL_WS_PAIR_ID(x, id) (((x)*CN9K_DUAL_WS_NB_WS) + id)
 
+#define CN9K_SET_EVDEV_DEQ_OP(dev, deq_op, deq_ops)                            \
+       (deq_op = deq_ops[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]    \
+                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]  \
+                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]      \
+                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)] \
+                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]    \
+                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]       \
+                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)])
+
+#define CN9K_SET_EVDEV_ENQ_OP(dev, enq_op, enq_ops)                            \
+       (enq_op = enq_ops[!!(dev->tx_offloads & NIX_TX_OFFLOAD_SECURITY_F)]    \
+                       [!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]       \
+                       [!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]          \
+                       [!!(dev->tx_offloads & NIX_TX_OFFLOAD_MBUF_NOFF_F)]    \
+                       [!!(dev->tx_offloads & NIX_TX_OFFLOAD_VLAN_QINQ_F)]    \
+                       [!!(dev->tx_offloads & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)] \
+                       [!!(dev->tx_offloads & NIX_TX_OFFLOAD_L3_L4_CSUM_F)])
+
 static void
 cn9k_init_hws_ops(struct cn9k_sso_hws_state *ws, uintptr_t base)
 {
@@ -313,121 +331,220 @@ 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[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_##name,
+       const event_dequeue_t sso_hws_deq[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t sso_hws_deq_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_burst_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const event_dequeue_burst_t sso_hws_deq_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_burst_##name,
+       const event_dequeue_t sso_hws_deq_tmo[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_tmo_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t
+               sso_hws_deq_tmo_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_tmo_burst_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const event_dequeue_t sso_hws_deq_tmo[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_tmo_##name,
+       const event_dequeue_t sso_hws_deq_ca[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_ca_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const event_dequeue_burst_t sso_hws_deq_tmo_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_tmo_burst_##name,
+       const event_dequeue_burst_t
+               sso_hws_deq_ca_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_ca_burst_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const event_dequeue_t sso_hws_deq_seg[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_seg_##name,
+       const event_dequeue_t sso_hws_deq_seg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_seg_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const event_dequeue_burst_t sso_hws_deq_seg_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_seg_burst_##name,
+       const event_dequeue_burst_t
+               sso_hws_deq_seg_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_seg_burst_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const event_dequeue_t sso_hws_deq_tmo_seg[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_tmo_seg_##name,
+       const event_dequeue_t sso_hws_deq_tmo_seg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_tmo_seg_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
        const event_dequeue_burst_t
-               sso_hws_deq_tmo_seg_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_tmo_seg_burst_##name,
+               sso_hws_deq_tmo_seg_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_tmo_seg_burst_##name,
                        NIX_RX_FASTPATH_MODES
 #undef R
-               };
+       };
+
+       const event_dequeue_t sso_hws_deq_ca_seg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_ca_seg_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t
+               sso_hws_deq_ca_seg_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_deq_ca_seg_burst_##name,
+                       NIX_RX_FASTPATH_MODES
+#undef R
+       };
 
        /* Dual WS modes */
-       const event_dequeue_t sso_hws_dual_deq[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_##name,
+       const event_dequeue_t sso_hws_dual_deq[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_burst_t
+               sso_hws_dual_deq_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_burst_##name,
+               NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_tmo[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_tmo_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const event_dequeue_burst_t sso_hws_dual_deq_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_burst_##name,
+       const event_dequeue_burst_t
+               sso_hws_dual_deq_tmo_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_tmo_burst_##name,
+                       NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_ca[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_ca_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const event_dequeue_t sso_hws_dual_deq_tmo[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_tmo_##name,
+       const event_dequeue_burst_t
+               sso_hws_dual_deq_ca_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_ca_burst_##name,
+                       NIX_RX_FASTPATH_MODES
+#undef R
+       };
+
+       const event_dequeue_t sso_hws_dual_deq_seg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_seg_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
        const event_dequeue_burst_t
-               sso_hws_dual_deq_tmo_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_tmo_burst_##name,
+               sso_hws_dual_deq_seg_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_seg_burst_##name,
                        NIX_RX_FASTPATH_MODES
 #undef R
                };
 
-       const event_dequeue_t sso_hws_dual_deq_seg[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_seg_##name,
+       const event_dequeue_t sso_hws_dual_deq_tmo_seg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_tmo_seg_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
        const event_dequeue_burst_t
-               sso_hws_dual_deq_seg_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_seg_burst_##name,
+               sso_hws_dual_deq_tmo_seg_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] =                                         \
+                       cn9k_sso_hws_dual_deq_tmo_seg_burst_##name,
                        NIX_RX_FASTPATH_MODES
 #undef R
                };
 
-       const event_dequeue_t sso_hws_dual_deq_tmo_seg[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_tmo_seg_##name,
+       const event_dequeue_t sso_hws_dual_deq_ca_seg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_ca_seg_##name,
                NIX_RX_FASTPATH_MODES
 #undef R
        };
 
        const event_dequeue_burst_t
-               sso_hws_dual_deq_tmo_seg_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                 \
-       [f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_deq_tmo_seg_burst_##name,
+               sso_hws_dual_deq_ca_seg_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                             \
+       [f6][f5][f4][f3][f2][f1][f0] =                                         \
+                       cn9k_sso_hws_dual_deq_ca_seg_burst_##name,
                        NIX_RX_FASTPATH_MODES
 #undef R
+       };
+
+       /* Tx modes */
+       const event_tx_adapter_enqueue_t
+               sso_hws_tx_adptr_enq[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] = 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[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] = 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[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] = 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[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] =                                         \
+                       cn9k_sso_hws_dual_tx_adptr_enq_seg_##name,
+                       NIX_TX_FASTPATH_MODES
+#undef T
                };
 
        event_dev->enqueue = cn9k_sso_hws_enq;
@@ -435,80 +552,46 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
        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) {
-               event_dev->dequeue = sso_hws_deq_seg
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-               event_dev->dequeue_burst = sso_hws_deq_seg_burst
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_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) {
-                       event_dev->dequeue = sso_hws_deq_tmo_seg
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-                       event_dev->dequeue_burst = sso_hws_deq_tmo_seg_burst
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
+                       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);
                }
        } else {
-               event_dev->dequeue = sso_hws_deq
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-               event_dev->dequeue_burst = sso_hws_deq_burst
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
+               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) {
-                       event_dev->dequeue = sso_hws_deq_tmo
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-                       event_dev->dequeue_burst = sso_hws_deq_tmo_burst
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
+                       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);
                }
        }
+       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;
@@ -516,110 +599,57 @@ 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->ca_enqueue = cn9k_sso_hws_dual_ca_enq;
 
                if (dev->rx_offloads & NIX_RX_MULTI_SEG_F) {
-                       event_dev->dequeue = sso_hws_dual_deq_seg
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-                       event_dev->dequeue_burst = sso_hws_dual_deq_seg_burst
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_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) {
-                               event_dev->dequeue = sso_hws_dual_deq_tmo_seg
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_TSTAMP_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_CHECKSUM_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_PTYPE_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_RSS_F)];
-                               event_dev->dequeue_burst =
-                                       sso_hws_dual_deq_tmo_seg_burst
-                                               [!!(dev->rx_offloads &
-                                                 NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                                               [!!(dev->rx_offloads &
-                                                   NIX_RX_OFFLOAD_TSTAMP_F)]
-                                               [!!(dev->rx_offloads &
-                                                 NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                                               [!!(dev->rx_offloads &
-                                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                                               [!!(dev->rx_offloads &
-                                                   NIX_RX_OFFLOAD_PTYPE_F)]
-                                               [!!(dev->rx_offloads &
-                                                   NIX_RX_OFFLOAD_RSS_F)];
+                               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);
                        }
                } else {
-                       event_dev->dequeue = sso_hws_dual_deq
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-                       event_dev->dequeue_burst = sso_hws_dual_deq_burst
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                               [!!(dev->rx_offloads &
-                                   NIX_RX_OFFLOAD_CHECKSUM_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-                               [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
+                       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) {
-                               event_dev->dequeue = sso_hws_dual_deq_tmo
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_TSTAMP_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_CHECKSUM_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_PTYPE_F)]
-                                       [!!(dev->rx_offloads &
-                                           NIX_RX_OFFLOAD_RSS_F)];
-                               event_dev->dequeue_burst =
-                                       sso_hws_dual_deq_tmo_burst
-                                               [!!(dev->rx_offloads &
-                                                 NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-                                               [!!(dev->rx_offloads &
-                                                 NIX_RX_OFFLOAD_TSTAMP_F)]
-                                               [!!(dev->rx_offloads &
-                                                 NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-                                               [!!(dev->rx_offloads &
-                                                 NIX_RX_OFFLOAD_CHECKSUM_F)]
-                                               [!!(dev->rx_offloads &
-                                                 NIX_RX_OFFLOAD_PTYPE_F)]
-                                               [!!(dev->rx_offloads &
-                                                 NIX_RX_OFFLOAD_RSS_F)];
+                               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->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();
 }
 
@@ -988,7 +1018,49 @@ cn9k_sso_tx_adapter_queue_del(uint8_t id, const struct rte_eventdev *event_dev,
        return cn9k_sso_updt_tx_adptr_data(event_dev);
 }
 
-static struct rte_eventdev_ops cn9k_sso_dev_ops = {
+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,
@@ -1013,6 +1085,10 @@ static struct rte_eventdev_ops cn9k_sso_dev_ops = {
 
        .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,