diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c
index 071ea5a212..92d6e9be06 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -139,9 +139,7 @@ cn10k_sso_hws_flush_events(void *hws, uint8_t queue_id, uintptr_t base,
 	while (aq_cnt || cq_ds_cnt || ds_cnt) {
 		plt_write64(req, ws->base + SSOW_LF_GWS_OP_GET_WORK0);
 		cn10k_sso_hws_get_work_empty(
-			ws, &ev,
-			(NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F |
-				NIX_RX_MULTI_SEG_F | CPT_RX_WQE_F);
+			ws, &ev, (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F | NIX_RX_MULTI_SEG_F);
 		if (fn != NULL && ev.u64 != 0)
 			fn(arg, ev);
 		if (ev.sched_type != SSO_TT_EMPTY)
@@ -323,30 +321,6 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #undef R
 	};
 
-	const event_dequeue_t sso_hws_deq_ca[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_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] = cn10k_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] = cn10k_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] = cn10k_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] = cn10k_sso_hws_deq_seg_##name,
 
@@ -372,30 +346,6 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #undef R
 	};
 
-	const event_dequeue_t sso_hws_deq_ca_seg[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_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] = cn10k_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] = cn10k_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] = cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
 	const event_dequeue_t sso_hws_reas_deq[NIX_RX_OFFLOAD_MAX] = {
 #define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_##name,
 		NIX_RX_FASTPATH_MODES
@@ -420,30 +370,6 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #undef R
 	};
 
-	const event_dequeue_t sso_hws_reas_deq_ca[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_ca_##name,
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const event_dequeue_burst_t sso_hws_reas_deq_ca_burst[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_ca_burst_##name,
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const event_dequeue_t sso_hws_reas_deq_tmo_ca[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_tmo_ca_##name,
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const event_dequeue_burst_t sso_hws_reas_deq_tmo_ca_burst[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
 	const event_dequeue_t sso_hws_reas_deq_seg[NIX_RX_OFFLOAD_MAX] = {
 #define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_seg_##name,
 
@@ -469,30 +395,6 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #undef R
 	};
 
-	const event_dequeue_t sso_hws_reas_deq_ca_seg[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_ca_seg_##name,
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const event_dequeue_burst_t sso_hws_reas_deq_ca_seg_burst[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_ca_seg_burst_##name,
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const event_dequeue_t sso_hws_reas_deq_tmo_ca_seg[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,
-		NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const event_dequeue_burst_t sso_hws_reas_deq_tmo_ca_seg_burst[NIX_RX_OFFLOAD_MAX] = {
-#define R(name, flags)[flags] = cn10k_sso_hws_reas_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] = cn10k_sso_hws_tx_adptr_enq_##name,
@@ -521,18 +423,6 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
 						       sso_hws_reas_deq_tmo_seg_burst);
 			}
-			if (dev->is_ca_internal_port) {
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
-						       sso_hws_reas_deq_ca_seg);
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
-						       sso_hws_reas_deq_ca_seg_burst);
-			}
-			if (dev->is_timeout_deq && dev->is_ca_internal_port) {
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
-						       sso_hws_reas_deq_tmo_ca_seg);
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
-						       sso_hws_reas_deq_tmo_ca_seg_burst);
-			}
 		} else {
 			CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue, sso_hws_deq_seg);
 			CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
@@ -544,17 +434,6 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
 						       sso_hws_deq_tmo_seg_burst);
 			}
-			if (dev->is_ca_internal_port) {
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue, sso_hws_deq_ca_seg);
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
-						       sso_hws_deq_ca_seg_burst);
-			}
-			if (dev->is_timeout_deq && dev->is_ca_internal_port) {
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
-						       sso_hws_deq_tmo_ca_seg);
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
-						       sso_hws_deq_tmo_ca_seg_burst);
-			}
 		}
 	} else {
 		if (dev->rx_offloads & NIX_RX_REAS_F) {
@@ -568,18 +447,6 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
 						       sso_hws_reas_deq_tmo_burst);
 			}
-			if (dev->is_ca_internal_port) {
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
-						       sso_hws_reas_deq_ca);
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
-						       sso_hws_reas_deq_ca_burst);
-			}
-			if (dev->is_timeout_deq && dev->is_ca_internal_port) {
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue,
-						       sso_hws_reas_deq_tmo_ca);
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
-						       sso_hws_reas_deq_tmo_ca_burst);
-			}
 		} else {
 			CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue, sso_hws_deq);
 			CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst, sso_hws_deq_burst);
@@ -589,16 +456,6 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
 						       sso_hws_deq_tmo_burst);
 			}
-			if (dev->is_ca_internal_port) {
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue, sso_hws_deq_ca);
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
-						       sso_hws_deq_ca_burst);
-			}
-			if (dev->is_timeout_deq && dev->is_ca_internal_port) {
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue, sso_hws_deq_tmo_ca);
-				CN10K_SET_EVDEV_DEQ_OP(dev, event_dev->dequeue_burst,
-						       sso_hws_deq_tmo_ca_burst);
-			}
 		}
 	}
 
@@ -716,8 +573,7 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port,
 		 (BIT_ULL(62) | BIT_ULL(58) | BIT_ULL(56) | BIT_ULL(54)));
 
 	cn10k_sso_hws_get_work_empty(ws, &ev,
-				     (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F |
-					     NIX_RX_MULTI_SEG_F | CPT_RX_WQE_F);
+				     (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F | NIX_RX_MULTI_SEG_F);
 	if (is_pend && ev.u64) {
 		if (flush_cb)
 			flush_cb(event_dev->data->dev_id, ev, args);
@@ -742,9 +598,7 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_dev, void *port,
 		plt_write64(BIT_ULL(16) | 1,
 			    ws->base + SSOW_LF_GWS_OP_GET_WORK0);
 		cn10k_sso_hws_get_work_empty(
-			ws, &ev,
-			(NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F |
-				NIX_RX_MULTI_SEG_F | CPT_RX_WQE_F);
+			ws, &ev, (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS_F | NIX_RX_MULTI_SEG_F);
 		if (ev.u64) {
 			if (flush_cb)
 				flush_cb(event_dev->data->dev_id, ev, args);
@@ -1072,13 +926,11 @@ cn10k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
 			    int32_t queue_pair_id,
 			    const struct rte_event_crypto_adapter_queue_conf *conf)
 {
-	struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
 	int ret;
 
 	CNXK_VALID_DEV_OR_ERR_RET(event_dev->dev, "event_cn10k");
 	CNXK_VALID_DEV_OR_ERR_RET(cdev->device, "crypto_cn10k");
 
-	dev->is_ca_internal_port = 1;
 	cn10k_sso_fp_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
 
 	ret = cnxk_crypto_adapter_qp_add(event_dev, cdev, queue_pair_id, conf);
diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h
index 06c71c6092..165dad8a20 100644
--- a/drivers/event/cnxk/cn10k_worker.h
+++ b/drivers/event/cnxk/cn10k_worker.h
@@ -154,11 +154,9 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64,
 {
 	u64[0] = (u64[0] & (0x3ull << 32)) << 6 |
 		 (u64[0] & (0x3FFull << 36)) << 4 | (u64[0] & 0xffffffff);
-	if ((flags & CPT_RX_WQE_F) &&
-	    (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_CRYPTODEV)) {
+	if (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_CRYPTODEV) {
 		u64[1] = cn10k_cpt_crypto_adapter_dequeue(u64[1]);
-	} else if ((flags & CPT_RX_WQE_F) &&
-		   (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_CRYPTODEV_VECTOR)) {
+	} else if (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_CRYPTODEV_VECTOR) {
 		u64[1] = cn10k_cpt_crypto_adapter_vector_dequeue(u64[1]);
 	} else if (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_ETHDEV) {
 		uint8_t port = CNXK_SUB_EVENT_FROM_TAG(u64[0]);
@@ -402,8 +400,6 @@ NIX_RX_FASTPATH_MODES
 	}
 
 #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,                \
@@ -425,8 +421,6 @@ NIX_RX_FASTPATH_MODES
 	}
 
 #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 SSO_CMN_DEQ_BURST(fnb, fn, flags)                                      \
 	uint16_t __rte_hot fnb(void *port, struct rte_event ev[],              \
diff --git a/drivers/event/cnxk/cn9k_eventdev.c b/drivers/event/cnxk/cn9k_eventdev.c
index 7e8339bd3a..a711a31eb2 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -351,30 +351,6 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #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
@@ -399,30 +375,6 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #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,
@@ -448,30 +400,6 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #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
@@ -496,30 +424,6 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #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,
@@ -559,19 +463,6 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 			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);
-		}
-
-		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,
@@ -582,19 +473,6 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 			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;
 
@@ -625,21 +503,6 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 					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);
@@ -652,20 +515,6 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 					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)
@@ -1130,13 +979,11 @@ cn9k_crypto_adapter_qp_add(const struct rte_eventdev *event_dev,
 			   int32_t queue_pair_id,
 			   const struct rte_event_crypto_adapter_queue_conf *conf)
 {
-	struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
 	int ret;
 
 	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);
 
 	ret = cnxk_crypto_adapter_qp_add(event_dev, cdev, queue_pair_id, conf);
diff --git a/drivers/event/cnxk/cn9k_worker.h b/drivers/event/cnxk/cn9k_worker.h
index 1ce4b044e8..988cb3acb6 100644
--- a/drivers/event/cnxk/cn9k_worker.h
+++ b/drivers/event/cnxk/cn9k_worker.h
@@ -203,8 +203,7 @@ cn9k_sso_hws_post_process(uint64_t *u64, uint64_t mbuf, const uint32_t flags,
 {
 	u64[0] = (u64[0] & (0x3ull << 32)) << 6 |
 		 (u64[0] & (0x3FFull << 36)) << 4 | (u64[0] & 0xffffffff);
-	if ((flags & CPT_RX_WQE_F) &&
-	    (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_CRYPTODEV)) {
+	if (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_CRYPTODEV) {
 		u64[1] = cn9k_cpt_crypto_adapter_dequeue(u64[1]);
 	} else if (CNXK_EVENT_TYPE_FROM_TAG(u64[0]) == RTE_EVENT_TYPE_ETHDEV) {
 		uint8_t port = CNXK_SUB_EVENT_FROM_TAG(u64[0]);
@@ -401,16 +400,6 @@ uint16_t __rte_hot cn9k_sso_hws_dual_ca_enq(void *port, struct rte_event ev[],
 	uint16_t __rte_hot cn9k_sso_hws_deq_tmo_burst_##name(                  \
 		void *port, struct rte_event ev[], uint16_t nb_events,         \
 		uint64_t timeout_ticks);                                       \
-	uint16_t __rte_hot cn9k_sso_hws_deq_ca_##name(                         \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
-	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(                  \
@@ -419,16 +408,6 @@ uint16_t __rte_hot cn9k_sso_hws_dual_ca_enq(void *port, struct rte_event ev[],
 	uint16_t __rte_hot cn9k_sso_hws_deq_tmo_seg_##name(                    \
 		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn9k_sso_hws_deq_tmo_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_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);
 
@@ -450,8 +429,6 @@ NIX_RX_FASTPATH_MODES
 	}
 
 #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,                \
@@ -473,8 +450,6 @@ NIX_RX_FASTPATH_MODES
 	}
 
 #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(                       \
@@ -487,16 +462,6 @@ NIX_RX_FASTPATH_MODES
 	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_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_ca_##name(                    \
-		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
-	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(             \
@@ -505,16 +470,6 @@ NIX_RX_FASTPATH_MODES
 	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_seg_##name(               \
 		void *port, struct rte_event *ev, uint64_t timeout_ticks);     \
 	uint16_t __rte_hot cn9k_sso_hws_dual_deq_tmo_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_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);
 
@@ -542,9 +497,6 @@ NIX_RX_FASTPATH_MODES
 	}
 
 #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,                \
@@ -574,10 +526,6 @@ NIX_RX_FASTPATH_MODES
 
 #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[],              \
diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h
index c7cbd722ab..852aeae007 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -119,8 +119,6 @@ struct cnxk_sso_evdev {
 	uint8_t gw_mode;
 	uint16_t stash_cnt;
 	struct cnxk_sso_stash *stash_parse_data;
-	/* Crypto adapter */
-	uint8_t is_ca_internal_port;
 } __rte_cache_aligned;
 
 /* Event port a.k.a GWS */
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c
deleted file mode 100644
index 7d27c5a082..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
-	SSO_DEQ_CA(cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c
deleted file mode 100644
index 56fd16c404..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
-			  cn10k_sso_hws_deq_ca_##name, flags)                  \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_burst_##name,              \
-			  cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c
deleted file mode 100644
index e01b2a38bc..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c
deleted file mode 100644
index 509da881d4..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
-			  cn10k_sso_hws_deq_ca_seg_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_seg_burst_##name,          \
-			 cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c
deleted file mode 100644
index 9851bd51b8..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c
deleted file mode 100644
index f286902297..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
-			  cn10k_sso_hws_deq_tmo_ca_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,          \
-			cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c
deleted file mode 100644
index d1252c7984..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,           \
-			   flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c
deleted file mode 100644
index 0769b89f76..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
-			  cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)          \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name,      \
-		  cn10k_sso_hws_reas_deq_tmo_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c
deleted file mode 100644
index 7d200af3ae..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
-	SSO_DEQ_CA(cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c
deleted file mode 100644
index ff09b0c2f7..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
-			  cn10k_sso_hws_deq_ca_##name, flags)                  \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_burst_##name,              \
-			  cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c
deleted file mode 100644
index 3250f627cf..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c
deleted file mode 100644
index e74a77ae8c..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
-			  cn10k_sso_hws_deq_ca_seg_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_seg_burst_##name,          \
-			cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c
deleted file mode 100644
index 8474c2dcbe..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c
deleted file mode 100644
index b5ce875657..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
-			  cn10k_sso_hws_deq_tmo_ca_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,          \
-			  cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c
deleted file mode 100644
index 1552cbbb15..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,           \
-			   flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c
deleted file mode 100644
index 88b89f1927..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
-			  cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)          \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name,      \
-		cn10k_sso_hws_reas_deq_tmo_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c
deleted file mode 100644
index 7ad43889bc..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
-	SSO_DEQ_CA(cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c
deleted file mode 100644
index 55e815c282..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
-			  cn10k_sso_hws_deq_ca_##name, flags)                  \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_burst_##name,              \
-			cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c
deleted file mode 100644
index 435f5dbe43..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_reas_deq_ca_seg_##name,                   \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c
deleted file mode 100644
index 0a3cad73e7..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
-			  cn10k_sso_hws_deq_ca_seg_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_seg_burst_##name,          \
-		cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c
deleted file mode 100644
index dede5836e2..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_reas_deq_tmo_ca_##name,                   \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c
deleted file mode 100644
index 15fa9b0fba..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
-			  cn10k_sso_hws_deq_tmo_ca_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,          \
-		cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c
deleted file mode 100644
index dd045da34f..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,           \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c
deleted file mode 100644
index 3b1ebacc5f..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
-			  cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)          \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name,      \
-		cn10k_sso_hws_reas_deq_tmo_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c
deleted file mode 100644
index c130c511b6..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
-	SSO_DEQ_CA(cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c
deleted file mode 100644
index ed511c5459..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
-			  cn10k_sso_hws_deq_ca_##name, flags)                  \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_burst_##name,              \
-			cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c
deleted file mode 100644
index 6b6305e7fd..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_reas_deq_ca_seg_##name,                   \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c
deleted file mode 100644
index 42cdcab4f8..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
-			  cn10k_sso_hws_deq_ca_seg_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_seg_burst_##name,          \
-		cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c
deleted file mode 100644
index afabd8987a..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_reas_deq_tmo_ca_##name,                   \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c
deleted file mode 100644
index d3ef670afa..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
-			  cn10k_sso_hws_deq_tmo_ca_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,          \
-		cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c
deleted file mode 100644
index 1dfda1408b..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,           \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c
deleted file mode 100644
index 3ac31df9a6..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
-			  cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)          \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name,      \
-		cn10k_sso_hws_reas_deq_tmo_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c
deleted file mode 100644
index e96a046900..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
-	SSO_DEQ_CA(cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c
deleted file mode 100644
index c3762e5002..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
-			  cn10k_sso_hws_deq_ca_##name, flags)                  \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_burst_##name,              \
-			cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c
deleted file mode 100644
index 1e3a56b02b..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_reas_deq_ca_seg_##name,                   \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c
deleted file mode 100644
index 3811cba348..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
-			  cn10k_sso_hws_deq_ca_seg_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_seg_burst_##name,          \
-		cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c
deleted file mode 100644
index 0306746304..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_reas_deq_tmo_ca_##name,                   \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c
deleted file mode 100644
index 42bf8a1dde..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
-			  cn10k_sso_hws_deq_tmo_ca_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,          \
-		cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c
deleted file mode 100644
index 791e129711..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,           \
-			flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c
deleted file mode 100644
index ca1c127b68..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
-			  cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)          \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name,      \
-		cn10k_sso_hws_reas_deq_tmo_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c
deleted file mode 100644
index e1def2b058..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
-	SSO_DEQ_CA(cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c
deleted file mode 100644
index 59ab7fc960..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
-			  cn10k_sso_hws_deq_ca_##name, flags)                  \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_burst_##name,              \
-			  cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c
deleted file mode 100644
index 5bed2e4a94..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c
deleted file mode 100644
index 05b4b39595..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
-			  cn10k_sso_hws_deq_ca_seg_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_seg_burst_##name,          \
-			cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c
deleted file mode 100644
index d962e7f146..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c
deleted file mode 100644
index 905b6afd8c..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
-			  cn10k_sso_hws_deq_tmo_ca_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,          \
-			cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c
deleted file mode 100644
index 1f8e58f82c..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,           \
-			   flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c
deleted file mode 100644
index a639f56874..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
-			  cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)          \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name,      \
-		cn10k_sso_hws_reas_deq_tmo_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c
deleted file mode 100644
index 1d32173aaf..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
-	SSO_DEQ_CA(cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c
deleted file mode 100644
index 0e5b20e391..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
-			  cn10k_sso_hws_deq_ca_##name, flags)                  \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_burst_##name,              \
-			  cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c
deleted file mode 100644
index 6d30b31241..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c
deleted file mode 100644
index b87de757b3..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
-			  cn10k_sso_hws_deq_ca_seg_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_seg_burst_##name,          \
-			cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c
deleted file mode 100644
index 48f03d87c6..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c
deleted file mode 100644
index 0e1cecfc43..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
-			  cn10k_sso_hws_deq_tmo_ca_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,          \
-			cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c
deleted file mode 100644
index 5ee30c3247..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,           \
-			   flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c
deleted file mode 100644
index f7d15bda9e..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
-			  cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)          \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name,      \
-		cn10k_sso_hws_reas_deq_tmo_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c
deleted file mode 100644
index 43ad267203..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA(cn10k_sso_hws_deq_ca_##name, flags)                         \
-	SSO_DEQ_CA(cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c
deleted file mode 100644
index a74d1a1386..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_burst_##name,                   \
-			  cn10k_sso_hws_deq_ca_##name, flags)                  \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_burst_##name,              \
-			  cn10k_sso_hws_reas_deq_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c
deleted file mode 100644
index 8dd8e30acd..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_deq_ca_seg_##name, flags)                 \
-	SSO_DEQ_CA_SEG(cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c
deleted file mode 100644
index d6f2d8fe44..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_ca_seg_burst_##name,               \
-			  cn10k_sso_hws_deq_ca_seg_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_ca_seg_burst_##name,          \
-			 cn10k_sso_hws_reas_deq_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c
deleted file mode 100644
index 08bc4ebcc5..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_deq_tmo_ca_##name, flags)                 \
-	SSO_DEQ_TMO_CA(cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c
deleted file mode 100644
index b23bc42842..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_burst_##name,               \
-			  cn10k_sso_hws_deq_tmo_ca_##name, flags)              \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_burst_##name,          \
-			 cn10k_sso_hws_reas_deq_tmo_ca_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c
deleted file mode 100644
index 040f9c2bfb..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)         \
-	SSO_DEQ_TMO_CA_SEG(cn10k_sso_hws_reas_deq_tmo_ca_seg_##name,           \
-			   flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c
deleted file mode 100644
index dcd7ce4dea..0000000000
--- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn10k_worker.h"
-
-#ifdef _ROC_API_H_
-#error "roc_api.h is included"
-#endif
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_deq_tmo_ca_seg_burst_##name,           \
-			  cn10k_sso_hws_deq_tmo_ca_seg_##name, flags)          \
-	SSO_CMN_DEQ_BURST(cn10k_sso_hws_reas_deq_tmo_ca_seg_burst_##name,      \
-		cn10k_sso_hws_reas_deq_tmo_ca_seg_##name, flags | NIX_RX_REAS_F)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_ca.c
deleted file mode 100644
index ce4e577239..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA(cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_burst.c
deleted file mode 100644
index 4f36ae2eee..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_burst_##name,                    \
-			  cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_seg.c
deleted file mode 100644
index 0d64fa1f46..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_seg.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA_SEG(cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_seg_burst.c
deleted file mode 100644
index 23e21c29c5..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_seg_burst_##name,                \
-			  cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo.c
deleted file mode 100644
index eba487394f..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_TMO_CA(cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_burst.c
deleted file mode 100644
index 1bd7ae530c..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_burst_##name,                \
-			  cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_seg.c
deleted file mode 100644
index ff004823de..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_seg_burst.c
deleted file mode 100644
index e4905b36b6..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,            \
-			  cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca.c
deleted file mode 100644
index 2f74cc105e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DUAL_DEQ_CA(cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_burst.c
deleted file mode 100644
index dcf127de92..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_burst_##name,               \
-			  cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_seg.c
deleted file mode 100644
index b06a6bc6a4..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_CA_SEG(cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_seg_burst.c
deleted file mode 100644
index 378a70bd95..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_seg_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo.c
deleted file mode 100644
index 8d734beee4..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA(cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_burst.c
deleted file mode 100644
index f6c02719d8..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_seg.c
deleted file mode 100644
index ed89253c6e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA_SEG(cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_seg_burst.c
deleted file mode 100644
index af72ed944c..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_0_15_dual_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,       \
-			  cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_0_15
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_ca.c
deleted file mode 100644
index 3ef8f438ee..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA(cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_burst.c
deleted file mode 100644
index 81d12dc553..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_burst_##name,                    \
-			  cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_seg.c
deleted file mode 100644
index 7f5e9da9eb..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_seg.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA_SEG(cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_seg_burst.c
deleted file mode 100644
index a476064ae5..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_seg_burst_##name,                \
-			  cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo.c
deleted file mode 100644
index 14305ff0f0..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_TMO_CA(cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_burst.c
deleted file mode 100644
index 8d5b19a9b4..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_burst_##name,                \
-			  cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_seg.c
deleted file mode 100644
index 35004a8ac4..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_seg_burst.c
deleted file mode 100644
index 29f1341a32..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,            \
-			  cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca.c
deleted file mode 100644
index 333920acb2..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DUAL_DEQ_CA(cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_burst.c
deleted file mode 100644
index 6ba41b8104..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_burst_##name,               \
-			  cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_seg.c
deleted file mode 100644
index bd1643e8bb..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_CA_SEG(cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_seg_burst.c
deleted file mode 100644
index ffc571942f..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_seg_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo.c
deleted file mode 100644
index ec47a20be0..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA(cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_burst.c
deleted file mode 100644
index 58aa93f85a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_seg.c
deleted file mode 100644
index 88e4b92b02..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA_SEG(cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_seg_burst.c
deleted file mode 100644
index 737a24332e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_112_127_dual_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,       \
-			  cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_112_127
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_ca.c
deleted file mode 100644
index b260fdadf0..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA(cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_burst.c
deleted file mode 100644
index ae2e48a272..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_burst_##name,                    \
-			  cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_seg.c
deleted file mode 100644
index 2258d53a4d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_seg.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA_SEG(cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_seg_burst.c
deleted file mode 100644
index 206e03ce80..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_seg_burst_##name,                \
-			  cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo.c
deleted file mode 100644
index 9c6b6dd2e6..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_TMO_CA(cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_burst.c
deleted file mode 100644
index 8318627a3d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_burst_##name,                \
-			  cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_seg.c
deleted file mode 100644
index b6d00400f6..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_seg_burst.c
deleted file mode 100644
index a1cad96f70..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,            \
-			  cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca.c
deleted file mode 100644
index 42de2be889..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DUAL_DEQ_CA(cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_burst.c
deleted file mode 100644
index 8fb19a8d33..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_burst_##name,               \
-			  cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_seg.c
deleted file mode 100644
index 6904d3c742..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_CA_SEG(cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_seg_burst.c
deleted file mode 100644
index de0e91e8bd..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_seg_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo.c
deleted file mode 100644
index 8a0bf384f8..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA(cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_burst.c
deleted file mode 100644
index ccf9a3f00e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_seg.c
deleted file mode 100644
index af4f900987..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA_SEG(cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_seg_burst.c
deleted file mode 100644
index 6dd99f72d7..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_16_31_dual_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,       \
-			  cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_16_31
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_ca.c
deleted file mode 100644
index f2ef6cc6b8..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA(cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_burst.c
deleted file mode 100644
index 313ecc7390..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_burst_##name,                    \
-			  cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_seg.c
deleted file mode 100644
index ae8cd5be6f..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_seg.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA_SEG(cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_seg_burst.c
deleted file mode 100644
index 40ecba6231..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_seg_burst_##name,                \
-			  cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo.c
deleted file mode 100644
index 10a2b6a752..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_TMO_CA(cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_burst.c
deleted file mode 100644
index fbe3a7338a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_burst_##name,                \
-			  cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_seg.c
deleted file mode 100644
index 6366b50091..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_seg_burst.c
deleted file mode 100644
index 5749a3c08f..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,            \
-			  cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca.c
deleted file mode 100644
index 2ba290970e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DUAL_DEQ_CA(cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_burst.c
deleted file mode 100644
index b2f7d142b7..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_burst_##name,               \
-			  cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_seg.c
deleted file mode 100644
index abb7093e38..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_CA_SEG(cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_seg_burst.c
deleted file mode 100644
index 086398937a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_seg_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo.c
deleted file mode 100644
index 11e03c41c6..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA(cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_burst.c
deleted file mode 100644
index 64daa1c5af..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_seg.c
deleted file mode 100644
index 5ef0cbfc27..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA_SEG(cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_seg_burst.c
deleted file mode 100644
index fc604c7e3a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_32_47_dual_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,       \
-			  cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_32_47
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_ca.c
deleted file mode 100644
index 0033b7ac8d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA(cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_burst.c
deleted file mode 100644
index 939811ac86..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_burst_##name,                    \
-			  cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_seg.c
deleted file mode 100644
index 16ddbbaa6d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_seg.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA_SEG(cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_seg_burst.c
deleted file mode 100644
index 6c2aeddb0a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_seg_burst_##name,                \
-			  cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo.c
deleted file mode 100644
index 66adc2a6c7..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_TMO_CA(cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_burst.c
deleted file mode 100644
index 7337e071c0..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_burst_##name,                \
-			  cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_seg.c
deleted file mode 100644
index eaa7bdd39d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_seg_burst.c
deleted file mode 100644
index 89b42c63b8..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,            \
-			  cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca.c
deleted file mode 100644
index e92ada449b..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DUAL_DEQ_CA(cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_burst.c
deleted file mode 100644
index a72d7e7dcf..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_burst_##name,               \
-			  cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_seg.c
deleted file mode 100644
index d299c4f2fd..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_CA_SEG(cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_seg_burst.c
deleted file mode 100644
index decf0bfcc1..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_seg_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo.c
deleted file mode 100644
index 218f72aeec..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA(cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_burst.c
deleted file mode 100644
index 8232bbdd1c..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_seg.c
deleted file mode 100644
index 4f03ca514b..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA_SEG(cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_seg_burst.c
deleted file mode 100644
index fdd8a05520..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_48_63_dual_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,       \
-			  cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_48_63
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_ca.c
deleted file mode 100644
index ad76b572dd..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA(cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_burst.c
deleted file mode 100644
index 7c98aeaff7..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_burst_##name,                    \
-			  cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_seg.c
deleted file mode 100644
index 28ce2dda66..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_seg.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA_SEG(cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_seg_burst.c
deleted file mode 100644
index 183984ca86..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_seg_burst_##name,                \
-			  cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo.c
deleted file mode 100644
index 1d89f9db5d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_TMO_CA(cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_burst.c
deleted file mode 100644
index f83435b818..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_burst_##name,                \
-			  cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_seg.c
deleted file mode 100644
index 7e721ba3d9..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_seg_burst.c
deleted file mode 100644
index b767416d9a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,            \
-			  cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca.c
deleted file mode 100644
index 22d1294310..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DUAL_DEQ_CA(cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_burst.c
deleted file mode 100644
index 4ef92f7d65..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_burst_##name,               \
-			  cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_seg.c
deleted file mode 100644
index 6132f83d51..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_CA_SEG(cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_seg_burst.c
deleted file mode 100644
index 2017f3fa87..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_seg_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo.c
deleted file mode 100644
index f72d6bcc93..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA(cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_burst.c
deleted file mode 100644
index 6d646d8c4e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_seg.c
deleted file mode 100644
index 310fd3c948..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA_SEG(cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_seg_burst.c
deleted file mode 100644
index 9e7afaf2ca..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_64_79_dual_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,       \
-			  cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_64_79
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_ca.c
deleted file mode 100644
index 67c527b143..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA(cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_burst.c
deleted file mode 100644
index 97d826458f..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_burst_##name,                    \
-			  cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_seg.c
deleted file mode 100644
index 38769c473e..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_seg.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA_SEG(cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_seg_burst.c
deleted file mode 100644
index 77d857b3d6..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_seg_burst_##name,                \
-			  cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo.c
deleted file mode 100644
index d48f314d3b..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_TMO_CA(cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_burst.c
deleted file mode 100644
index 894546b0bc..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_burst_##name,                \
-			  cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_seg.c
deleted file mode 100644
index e704ee256b..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_seg_burst.c
deleted file mode 100644
index b1fac5c5fd..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,            \
-			  cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca.c
deleted file mode 100644
index 5c4548752b..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DUAL_DEQ_CA(cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_burst.c
deleted file mode 100644
index 8c4e17f2eb..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_burst_##name,               \
-			  cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_seg.c
deleted file mode 100644
index b18af8f8b5..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_CA_SEG(cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_seg_burst.c
deleted file mode 100644
index ba58284bff..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_seg_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo.c
deleted file mode 100644
index 3f8fa2de06..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA(cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_burst.c
deleted file mode 100644
index 03027f809a..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_seg.c
deleted file mode 100644
index 27bb4f00fa..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA_SEG(cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_seg_burst.c
deleted file mode 100644
index 8cb3a07508..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_80_95_dual_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,       \
-			  cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_80_95
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_ca.c
deleted file mode 100644
index 8424824de1..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA(cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_burst.c
deleted file mode 100644
index 1cb92b3db1..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_burst_##name,                    \
-			  cn9k_sso_hws_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_seg.c
deleted file mode 100644
index ef3248cdf0..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_seg.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_CA_SEG(cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_seg_burst.c
deleted file mode 100644
index 1faf9ead39..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_ca_seg_burst_##name,                \
-			  cn9k_sso_hws_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo.c
deleted file mode 100644
index 5df139ecc2..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DEQ_TMO_CA(cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_burst.c
deleted file mode 100644
index 1ce5f30c1c..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_burst_##name,                \
-			  cn9k_sso_hws_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_seg.c
deleted file mode 100644
index def241f0dc..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DEQ_TMO_CA_SEG(cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_seg_burst.c
deleted file mode 100644
index 10f2821f63..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_deq_tmo_ca_seg_burst_##name,            \
-			  cn9k_sso_hws_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca.c
deleted file mode 100644
index d1b4378ad7..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags) SSO_DUAL_DEQ_CA(cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_burst.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_burst.c
deleted file mode 100644
index c3060bdf6c..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_burst_##name,               \
-			  cn9k_sso_hws_dual_deq_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_seg.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_seg.c
deleted file mode 100644
index 2d6e44c3e3..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_CA_SEG(cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_seg_burst.c
deleted file mode 100644
index 57923eb615..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_ca_seg_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo.c
deleted file mode 100644
index a448618adf..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA(cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_burst.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_burst.c
deleted file mode 100644
index b6d1973767..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_burst_##name,           \
-			  cn9k_sso_hws_dual_deq_tmo_ca_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_seg.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_seg.c
deleted file mode 100644
index b0b78b1be7..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_seg.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_DUAL_DEQ_TMO_CA_SEG(cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_seg_burst.c
deleted file mode 100644
index 1e95e2755d..0000000000
--- a/drivers/event/cnxk/deq/cn9k/deq_96_111_dual_ca_tmo_seg_burst.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2022 Marvell.
- */
-
-#include "cn9k_worker.h"
-#include "cnxk_eventdev.h"
-#include "cnxk_worker.h"
-
-#define R(name, flags)                                                         \
-	SSO_CMN_DEQ_BURST(cn9k_sso_hws_dual_deq_tmo_ca_seg_burst_##name,       \
-			  cn9k_sso_hws_dual_deq_tmo_ca_seg_##name, flags)
-
-NIX_RX_FASTPATH_MODES_96_111
-#undef R
diff --git a/drivers/event/cnxk/meson.build b/drivers/event/cnxk/meson.build
index d1608002b8..8f3ef74a5b 100644
--- a/drivers/event/cnxk/meson.build
+++ b/drivers/event/cnxk/meson.build
@@ -86,70 +86,6 @@ sources += files(
         'deq/cn9k/deq_80_95_tmo_seg_burst.c',
         'deq/cn9k/deq_96_111_tmo_seg_burst.c',
         'deq/cn9k/deq_112_127_tmo_seg_burst.c',
-        'deq/cn9k/deq_0_15_ca.c',
-        'deq/cn9k/deq_16_31_ca.c',
-        'deq/cn9k/deq_32_47_ca.c',
-        'deq/cn9k/deq_48_63_ca.c',
-        'deq/cn9k/deq_64_79_ca.c',
-        'deq/cn9k/deq_80_95_ca.c',
-        'deq/cn9k/deq_96_111_ca.c',
-        'deq/cn9k/deq_112_127_ca.c',
-        'deq/cn9k/deq_0_15_ca_burst.c',
-        'deq/cn9k/deq_16_31_ca_burst.c',
-        'deq/cn9k/deq_32_47_ca_burst.c',
-        'deq/cn9k/deq_48_63_ca_burst.c',
-        'deq/cn9k/deq_64_79_ca_burst.c',
-        'deq/cn9k/deq_80_95_ca_burst.c',
-        'deq/cn9k/deq_96_111_ca_burst.c',
-        'deq/cn9k/deq_112_127_ca_burst.c',
-        'deq/cn9k/deq_0_15_ca_seg.c',
-        'deq/cn9k/deq_16_31_ca_seg.c',
-        'deq/cn9k/deq_32_47_ca_seg.c',
-        'deq/cn9k/deq_48_63_ca_seg.c',
-        'deq/cn9k/deq_64_79_ca_seg.c',
-        'deq/cn9k/deq_80_95_ca_seg.c',
-        'deq/cn9k/deq_96_111_ca_seg.c',
-        'deq/cn9k/deq_112_127_ca_seg.c',
-        'deq/cn9k/deq_0_15_ca_seg_burst.c',
-        'deq/cn9k/deq_16_31_ca_seg_burst.c',
-        'deq/cn9k/deq_32_47_ca_seg_burst.c',
-        'deq/cn9k/deq_48_63_ca_seg_burst.c',
-        'deq/cn9k/deq_64_79_ca_seg_burst.c',
-        'deq/cn9k/deq_80_95_ca_seg_burst.c',
-        'deq/cn9k/deq_96_111_ca_seg_burst.c',
-        'deq/cn9k/deq_112_127_ca_seg_burst.c',
-        'deq/cn9k/deq_0_15_ca_tmo.c',
-        'deq/cn9k/deq_16_31_ca_tmo.c',
-        'deq/cn9k/deq_32_47_ca_tmo.c',
-        'deq/cn9k/deq_48_63_ca_tmo.c',
-        'deq/cn9k/deq_64_79_ca_tmo.c',
-        'deq/cn9k/deq_80_95_ca_tmo.c',
-        'deq/cn9k/deq_96_111_ca_tmo.c',
-        'deq/cn9k/deq_112_127_ca_tmo.c',
-        'deq/cn9k/deq_0_15_ca_tmo_burst.c',
-        'deq/cn9k/deq_16_31_ca_tmo_burst.c',
-        'deq/cn9k/deq_32_47_ca_tmo_burst.c',
-        'deq/cn9k/deq_48_63_ca_tmo_burst.c',
-        'deq/cn9k/deq_64_79_ca_tmo_burst.c',
-        'deq/cn9k/deq_80_95_ca_tmo_burst.c',
-        'deq/cn9k/deq_96_111_ca_tmo_burst.c',
-        'deq/cn9k/deq_112_127_ca_tmo_burst.c',
-        'deq/cn9k/deq_0_15_ca_tmo_seg.c',
-        'deq/cn9k/deq_16_31_ca_tmo_seg.c',
-        'deq/cn9k/deq_32_47_ca_tmo_seg.c',
-        'deq/cn9k/deq_48_63_ca_tmo_seg.c',
-        'deq/cn9k/deq_64_79_ca_tmo_seg.c',
-        'deq/cn9k/deq_80_95_ca_tmo_seg.c',
-        'deq/cn9k/deq_96_111_ca_tmo_seg.c',
-        'deq/cn9k/deq_112_127_ca_tmo_seg.c',
-        'deq/cn9k/deq_0_15_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_16_31_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_32_47_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_48_63_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_64_79_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_80_95_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_96_111_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_112_127_ca_tmo_seg_burst.c',
 )
 
 sources += files(
@@ -217,70 +153,6 @@ sources += files(
         'deq/cn9k/deq_80_95_dual_tmo_seg_burst.c',
         'deq/cn9k/deq_96_111_dual_tmo_seg_burst.c',
         'deq/cn9k/deq_112_127_dual_tmo_seg_burst.c',
-        'deq/cn9k/deq_0_15_dual_ca.c',
-        'deq/cn9k/deq_16_31_dual_ca.c',
-        'deq/cn9k/deq_32_47_dual_ca.c',
-        'deq/cn9k/deq_48_63_dual_ca.c',
-        'deq/cn9k/deq_64_79_dual_ca.c',
-        'deq/cn9k/deq_80_95_dual_ca.c',
-        'deq/cn9k/deq_96_111_dual_ca.c',
-        'deq/cn9k/deq_112_127_dual_ca.c',
-        'deq/cn9k/deq_0_15_dual_ca_burst.c',
-        'deq/cn9k/deq_16_31_dual_ca_burst.c',
-        'deq/cn9k/deq_32_47_dual_ca_burst.c',
-        'deq/cn9k/deq_48_63_dual_ca_burst.c',
-        'deq/cn9k/deq_64_79_dual_ca_burst.c',
-        'deq/cn9k/deq_80_95_dual_ca_burst.c',
-        'deq/cn9k/deq_96_111_dual_ca_burst.c',
-        'deq/cn9k/deq_112_127_dual_ca_burst.c',
-        'deq/cn9k/deq_0_15_dual_ca_seg.c',
-        'deq/cn9k/deq_16_31_dual_ca_seg.c',
-        'deq/cn9k/deq_32_47_dual_ca_seg.c',
-        'deq/cn9k/deq_48_63_dual_ca_seg.c',
-        'deq/cn9k/deq_64_79_dual_ca_seg.c',
-        'deq/cn9k/deq_80_95_dual_ca_seg.c',
-        'deq/cn9k/deq_96_111_dual_ca_seg.c',
-        'deq/cn9k/deq_112_127_dual_ca_seg.c',
-        'deq/cn9k/deq_0_15_dual_ca_seg_burst.c',
-        'deq/cn9k/deq_16_31_dual_ca_seg_burst.c',
-        'deq/cn9k/deq_32_47_dual_ca_seg_burst.c',
-        'deq/cn9k/deq_48_63_dual_ca_seg_burst.c',
-        'deq/cn9k/deq_64_79_dual_ca_seg_burst.c',
-        'deq/cn9k/deq_80_95_dual_ca_seg_burst.c',
-        'deq/cn9k/deq_96_111_dual_ca_seg_burst.c',
-        'deq/cn9k/deq_112_127_dual_ca_seg_burst.c',
-        'deq/cn9k/deq_0_15_dual_ca_tmo.c',
-        'deq/cn9k/deq_16_31_dual_ca_tmo.c',
-        'deq/cn9k/deq_32_47_dual_ca_tmo.c',
-        'deq/cn9k/deq_48_63_dual_ca_tmo.c',
-        'deq/cn9k/deq_64_79_dual_ca_tmo.c',
-        'deq/cn9k/deq_80_95_dual_ca_tmo.c',
-        'deq/cn9k/deq_96_111_dual_ca_tmo.c',
-        'deq/cn9k/deq_112_127_dual_ca_tmo.c',
-        'deq/cn9k/deq_0_15_dual_ca_tmo_burst.c',
-        'deq/cn9k/deq_16_31_dual_ca_tmo_burst.c',
-        'deq/cn9k/deq_32_47_dual_ca_tmo_burst.c',
-        'deq/cn9k/deq_48_63_dual_ca_tmo_burst.c',
-        'deq/cn9k/deq_64_79_dual_ca_tmo_burst.c',
-        'deq/cn9k/deq_80_95_dual_ca_tmo_burst.c',
-        'deq/cn9k/deq_96_111_dual_ca_tmo_burst.c',
-        'deq/cn9k/deq_112_127_dual_ca_tmo_burst.c',
-        'deq/cn9k/deq_0_15_dual_ca_tmo_seg.c',
-        'deq/cn9k/deq_16_31_dual_ca_tmo_seg.c',
-        'deq/cn9k/deq_32_47_dual_ca_tmo_seg.c',
-        'deq/cn9k/deq_48_63_dual_ca_tmo_seg.c',
-        'deq/cn9k/deq_64_79_dual_ca_tmo_seg.c',
-        'deq/cn9k/deq_80_95_dual_ca_tmo_seg.c',
-        'deq/cn9k/deq_96_111_dual_ca_tmo_seg.c',
-        'deq/cn9k/deq_112_127_dual_ca_tmo_seg.c',
-        'deq/cn9k/deq_0_15_dual_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_16_31_dual_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_32_47_dual_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_48_63_dual_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_64_79_dual_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_80_95_dual_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_96_111_dual_ca_tmo_seg_burst.c',
-        'deq/cn9k/deq_112_127_dual_ca_tmo_seg_burst.c',
 )
 
 sources += files(
@@ -386,70 +258,6 @@ sources += files(
         'deq/cn10k/deq_80_95_tmo_seg_burst.c',
         'deq/cn10k/deq_96_111_tmo_seg_burst.c',
         'deq/cn10k/deq_112_127_tmo_seg_burst.c',
-        'deq/cn10k/deq_0_15_ca.c',
-        'deq/cn10k/deq_16_31_ca.c',
-        'deq/cn10k/deq_32_47_ca.c',
-        'deq/cn10k/deq_48_63_ca.c',
-        'deq/cn10k/deq_64_79_ca.c',
-        'deq/cn10k/deq_80_95_ca.c',
-        'deq/cn10k/deq_96_111_ca.c',
-        'deq/cn10k/deq_112_127_ca.c',
-        'deq/cn10k/deq_0_15_ca_burst.c',
-        'deq/cn10k/deq_16_31_ca_burst.c',
-        'deq/cn10k/deq_32_47_ca_burst.c',
-        'deq/cn10k/deq_48_63_ca_burst.c',
-        'deq/cn10k/deq_64_79_ca_burst.c',
-        'deq/cn10k/deq_80_95_ca_burst.c',
-        'deq/cn10k/deq_96_111_ca_burst.c',
-        'deq/cn10k/deq_112_127_ca_burst.c',
-        'deq/cn10k/deq_0_15_ca_seg.c',
-        'deq/cn10k/deq_16_31_ca_seg.c',
-        'deq/cn10k/deq_32_47_ca_seg.c',
-        'deq/cn10k/deq_48_63_ca_seg.c',
-        'deq/cn10k/deq_64_79_ca_seg.c',
-        'deq/cn10k/deq_80_95_ca_seg.c',
-        'deq/cn10k/deq_96_111_ca_seg.c',
-        'deq/cn10k/deq_112_127_ca_seg.c',
-        'deq/cn10k/deq_0_15_ca_seg_burst.c',
-        'deq/cn10k/deq_16_31_ca_seg_burst.c',
-        'deq/cn10k/deq_32_47_ca_seg_burst.c',
-        'deq/cn10k/deq_48_63_ca_seg_burst.c',
-        'deq/cn10k/deq_64_79_ca_seg_burst.c',
-        'deq/cn10k/deq_80_95_ca_seg_burst.c',
-        'deq/cn10k/deq_96_111_ca_seg_burst.c',
-        'deq/cn10k/deq_112_127_ca_seg_burst.c',
-        'deq/cn10k/deq_0_15_ca_tmo.c',
-        'deq/cn10k/deq_16_31_ca_tmo.c',
-        'deq/cn10k/deq_32_47_ca_tmo.c',
-        'deq/cn10k/deq_48_63_ca_tmo.c',
-        'deq/cn10k/deq_64_79_ca_tmo.c',
-        'deq/cn10k/deq_80_95_ca_tmo.c',
-        'deq/cn10k/deq_96_111_ca_tmo.c',
-        'deq/cn10k/deq_112_127_ca_tmo.c',
-        'deq/cn10k/deq_0_15_ca_tmo_burst.c',
-        'deq/cn10k/deq_16_31_ca_tmo_burst.c',
-        'deq/cn10k/deq_32_47_ca_tmo_burst.c',
-        'deq/cn10k/deq_48_63_ca_tmo_burst.c',
-        'deq/cn10k/deq_64_79_ca_tmo_burst.c',
-        'deq/cn10k/deq_80_95_ca_tmo_burst.c',
-        'deq/cn10k/deq_96_111_ca_tmo_burst.c',
-        'deq/cn10k/deq_112_127_ca_tmo_burst.c',
-        'deq/cn10k/deq_0_15_ca_tmo_seg.c',
-        'deq/cn10k/deq_16_31_ca_tmo_seg.c',
-        'deq/cn10k/deq_32_47_ca_tmo_seg.c',
-        'deq/cn10k/deq_48_63_ca_tmo_seg.c',
-        'deq/cn10k/deq_64_79_ca_tmo_seg.c',
-        'deq/cn10k/deq_80_95_ca_tmo_seg.c',
-        'deq/cn10k/deq_96_111_ca_tmo_seg.c',
-        'deq/cn10k/deq_112_127_ca_tmo_seg.c',
-        'deq/cn10k/deq_0_15_ca_tmo_seg_burst.c',
-        'deq/cn10k/deq_16_31_ca_tmo_seg_burst.c',
-        'deq/cn10k/deq_32_47_ca_tmo_seg_burst.c',
-        'deq/cn10k/deq_48_63_ca_tmo_seg_burst.c',
-        'deq/cn10k/deq_64_79_ca_tmo_seg_burst.c',
-        'deq/cn10k/deq_80_95_ca_tmo_seg_burst.c',
-        'deq/cn10k/deq_96_111_ca_tmo_seg_burst.c',
-        'deq/cn10k/deq_112_127_ca_tmo_seg_burst.c',
 )
 
 sources += files(
diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h
index 9fdb5565e9..9eaaca9ba3 100644
--- a/drivers/net/cnxk/cn10k_rx.h
+++ b/drivers/net/cnxk/cn10k_rx.h
@@ -27,7 +27,6 @@
 #define NIX_RX_REAS_F	   BIT(12)
 #define NIX_RX_VWQE_F	   BIT(13)
 #define NIX_RX_MULTI_SEG_F BIT(14)
-#define CPT_RX_WQE_F	   BIT(15)
 
 #define CNXK_NIX_CQ_ENTRY_SZ 128
 #define NIX_DESCS_PER_LOOP   4
diff --git a/drivers/net/cnxk/cn9k_rx.h b/drivers/net/cnxk/cn9k_rx.h
index 0e23609df5..4d476d0a02 100644
--- a/drivers/net/cnxk/cn9k_rx.h
+++ b/drivers/net/cnxk/cn9k_rx.h
@@ -25,7 +25,6 @@
  * not used as offload flags to pick function
  */
 #define NIX_RX_MULTI_SEG_F BIT(14)
-#define CPT_RX_WQE_F	   BIT(15)
 
 #define CNXK_NIX_CQ_ENTRY_SZ 128
 #define NIX_DESCS_PER_LOOP   4
