From patchwork Wed Jan 25 11:31:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 122517 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1BDBF42485; Wed, 25 Jan 2023 12:31:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EF98C42D3E; Wed, 25 Jan 2023 12:31:41 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 189CD42D31 for ; Wed, 25 Jan 2023 12:31:40 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30P7tUi2023260 for ; Wed, 25 Jan 2023 03:31:40 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=XAAO06tYQCyJm6lmjrAeW8RChdPCyCjVsI/CbgPWxmM=; b=FOWhe50cxwesIDkPLPDdUFQ7604uk7cJ7JxRkjCl9qxE9iSTWtrySKhb0cbtm5Wg7aGL RrbpWxLflAby/hMkuAFAk0hIrwoR32FpzPPd5PzZVUo6YLCkh2qxhUU3WmfYz3V3zCQW 41At0c1PG4MFjiygFIXVJPyUT/c9Axk8/eqKOWIGcD0qnRKlzLnr0Gzg/PeL9bgZMCRR XnuogWipS4OpVPINIlgtdPLPVq8In4Qm2BojVNeNu2bZDZd1FH8lVHk5WPY7d/gvhhLw s1Dyc+/CbX86Zbct+r78S6Z4I0cI3f5sEQZ3AK1b4qLP+e0A3HzGB/Deqmbd5iCI4rCp TA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nb0f68vf9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 25 Jan 2023 03:31:40 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 25 Jan 2023 03:31:38 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 25 Jan 2023 03:31:38 -0800 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id E1BF33F706A; Wed, 25 Jan 2023 03:31:35 -0800 (PST) From: Rahul Bhansali To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Rahul Bhansali Subject: [PATCH v3 1/4] common/cnxk: restructure for cn10k datapath Date: Wed, 25 Jan 2023 17:01:23 +0530 Message-ID: <20230125113126.2860273-1-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221221091549.967801-1-rbhansali@marvell.com> References: <20221221091549.967801-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: n5sWVm7zjVzCwvTz9R2vZTfHAseoYEpX X-Proofpoint-ORIG-GUID: n5sWVm7zjVzCwvTz9R2vZTfHAseoYEpX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-25_06,2023-01-25_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Restructure for separate datapath functionality to reduce recompilation time. New *_dp.h are created to have macros, functions as required for datapath. Signed-off-by: Rahul Bhansali --- Changes in v3: No change. Changes in v2: Rebased to next-net-mrvl, No code changes. drivers/common/cnxk/roc_api.h | 6 +-- drivers/common/cnxk/roc_nix_inl.h | 49 ------------------------ drivers/common/cnxk/roc_nix_inl_dp.h | 57 ++++++++++++++++++++++++++++ drivers/common/cnxk/roc_npa.h | 25 ------------ drivers/common/cnxk/roc_npa_dp.h | 34 +++++++++++++++++ drivers/common/cnxk/roc_sso.h | 25 ------------ drivers/common/cnxk/roc_sso_dp.h | 33 ++++++++++++++++ 7 files changed, 127 insertions(+), 102 deletions(-) create mode 100644 drivers/common/cnxk/roc_nix_inl_dp.h create mode 100644 drivers/common/cnxk/roc_npa_dp.h create mode 100644 drivers/common/cnxk/roc_sso_dp.h -- 2.25.1 diff --git a/drivers/common/cnxk/roc_api.h b/drivers/common/cnxk/roc_api.h index 14a11321e0..9d7f5417c2 100644 --- a/drivers/common/cnxk/roc_api.h +++ b/drivers/common/cnxk/roc_api.h @@ -18,9 +18,6 @@ /* ROC Constants */ #include "roc_constants.h" -/* Constants */ -#define PLT_ETHER_ADDR_LEN 6 - /* Platform definition */ #include "roc_platform.h" @@ -54,6 +51,7 @@ #include "roc_mbox.h" /* NPA */ +#include "roc_npa_dp.h" #include "roc_npa.h" /* NPC */ @@ -63,6 +61,7 @@ #include "roc_nix.h" /* SSO */ +#include "roc_sso_dp.h" #include "roc_sso.h" /* TIM */ @@ -105,6 +104,7 @@ #include "roc_hash.h" /* NIX Inline dev */ +#include "roc_nix_inl_dp.h" #include "roc_nix_inl.h" #endif /* _ROC_API_H_ */ diff --git a/drivers/common/cnxk/roc_nix_inl.h b/drivers/common/cnxk/roc_nix_inl.h index 99d1281169..220663568e 100644 --- a/drivers/common/cnxk/roc_nix_inl.h +++ b/drivers/common/cnxk/roc_nix_inl.h @@ -40,27 +40,6 @@ (ROC_NIX_INL_ON_IPSEC_OUTB_HW_SZ + ROC_NIX_INL_ON_IPSEC_OUTB_SW_RSVD) #define ROC_NIX_INL_ON_IPSEC_OUTB_SA_SZ_LOG2 9 -/* OT INB HW area */ -#define ROC_NIX_INL_OT_IPSEC_INB_HW_SZ \ - PLT_ALIGN(sizeof(struct roc_ot_ipsec_inb_sa), ROC_ALIGN) -/* OT INB SW reserved area */ -#define ROC_NIX_INL_OT_IPSEC_INB_SW_RSVD 128 -#define ROC_NIX_INL_OT_IPSEC_INB_SA_SZ \ - (ROC_NIX_INL_OT_IPSEC_INB_HW_SZ + ROC_NIX_INL_OT_IPSEC_INB_SW_RSVD) -#define ROC_NIX_INL_OT_IPSEC_INB_SA_SZ_LOG2 10 - -/* OT OUTB HW area */ -#define ROC_NIX_INL_OT_IPSEC_OUTB_HW_SZ \ - PLT_ALIGN(sizeof(struct roc_ot_ipsec_outb_sa), ROC_ALIGN) -/* OT OUTB SW reserved area */ -#define ROC_NIX_INL_OT_IPSEC_OUTB_SW_RSVD 128 -#define ROC_NIX_INL_OT_IPSEC_OUTB_SA_SZ \ - (ROC_NIX_INL_OT_IPSEC_OUTB_HW_SZ + ROC_NIX_INL_OT_IPSEC_OUTB_SW_RSVD) -#define ROC_NIX_INL_OT_IPSEC_OUTB_SA_SZ_LOG2 9 - -/* Alignment of SA Base */ -#define ROC_NIX_INL_SA_BASE_ALIGN BIT_ULL(16) - #define ROC_NIX_INL_SA_SOFT_EXP_ERR_MAX_POLL_COUNT 25 #define ROC_NIX_SOFT_EXP_ERR_RING_MAX_ENTRY_LOG2 16 @@ -135,34 +114,6 @@ roc_nix_inl_onf_ipsec_outb_sa_sw_rsvd(void *sa) return PLT_PTR_ADD(sa, ROC_NIX_INL_ONF_IPSEC_OUTB_HW_SZ); } -static inline struct roc_ot_ipsec_inb_sa * -roc_nix_inl_ot_ipsec_inb_sa(uintptr_t base, uint64_t idx) -{ - uint64_t off = idx << ROC_NIX_INL_OT_IPSEC_INB_SA_SZ_LOG2; - - return PLT_PTR_ADD(base, off); -} - -static inline struct roc_ot_ipsec_outb_sa * -roc_nix_inl_ot_ipsec_outb_sa(uintptr_t base, uint64_t idx) -{ - uint64_t off = idx << ROC_NIX_INL_OT_IPSEC_OUTB_SA_SZ_LOG2; - - return PLT_PTR_ADD(base, off); -} - -static inline void * -roc_nix_inl_ot_ipsec_inb_sa_sw_rsvd(void *sa) -{ - return PLT_PTR_ADD(sa, ROC_NIX_INL_OT_IPSEC_INB_HW_SZ); -} - -static inline void * -roc_nix_inl_ot_ipsec_outb_sa_sw_rsvd(void *sa) -{ - return PLT_PTR_ADD(sa, ROC_NIX_INL_OT_IPSEC_OUTB_HW_SZ); -} - /* Inline device SSO Work callback */ typedef void (*roc_nix_inl_sso_work_cb_t)(uint64_t *gw, void *args, uint32_t soft_exp_event); diff --git a/drivers/common/cnxk/roc_nix_inl_dp.h b/drivers/common/cnxk/roc_nix_inl_dp.h new file mode 100644 index 0000000000..a9d8e0a705 --- /dev/null +++ b/drivers/common/cnxk/roc_nix_inl_dp.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ +#ifndef _ROC_NIX_INL_DP_H_ +#define _ROC_NIX_INL_DP_H_ + +/* OT INB HW area */ +#define ROC_NIX_INL_OT_IPSEC_INB_HW_SZ \ + PLT_ALIGN(sizeof(struct roc_ot_ipsec_inb_sa), ROC_ALIGN) +/* OT INB SW reserved area */ +#define ROC_NIX_INL_OT_IPSEC_INB_SW_RSVD 128 +#define ROC_NIX_INL_OT_IPSEC_INB_SA_SZ \ + (ROC_NIX_INL_OT_IPSEC_INB_HW_SZ + ROC_NIX_INL_OT_IPSEC_INB_SW_RSVD) +#define ROC_NIX_INL_OT_IPSEC_INB_SA_SZ_LOG2 10 + +/* OT OUTB HW area */ +#define ROC_NIX_INL_OT_IPSEC_OUTB_HW_SZ \ + PLT_ALIGN(sizeof(struct roc_ot_ipsec_outb_sa), ROC_ALIGN) + +/* OT OUTB SW reserved area */ +#define ROC_NIX_INL_OT_IPSEC_OUTB_SW_RSVD 128 +#define ROC_NIX_INL_OT_IPSEC_OUTB_SA_SZ \ + (ROC_NIX_INL_OT_IPSEC_OUTB_HW_SZ + ROC_NIX_INL_OT_IPSEC_OUTB_SW_RSVD) +#define ROC_NIX_INL_OT_IPSEC_OUTB_SA_SZ_LOG2 9 + +/* Alignment of SA Base */ +#define ROC_NIX_INL_SA_BASE_ALIGN BIT_ULL(16) + +static inline struct roc_ot_ipsec_inb_sa * +roc_nix_inl_ot_ipsec_inb_sa(uintptr_t base, uint64_t idx) +{ + uint64_t off = idx << ROC_NIX_INL_OT_IPSEC_INB_SA_SZ_LOG2; + + return PLT_PTR_ADD(base, off); +} + +static inline struct roc_ot_ipsec_outb_sa * +roc_nix_inl_ot_ipsec_outb_sa(uintptr_t base, uint64_t idx) +{ + uint64_t off = idx << ROC_NIX_INL_OT_IPSEC_OUTB_SA_SZ_LOG2; + + return PLT_PTR_ADD(base, off); +} + +static inline void * +roc_nix_inl_ot_ipsec_inb_sa_sw_rsvd(void *sa) +{ + return PLT_PTR_ADD(sa, ROC_NIX_INL_OT_IPSEC_INB_HW_SZ); +} + +static inline void * +roc_nix_inl_ot_ipsec_outb_sa_sw_rsvd(void *sa) +{ + return PLT_PTR_ADD(sa, ROC_NIX_INL_OT_IPSEC_OUTB_HW_SZ); +} + +#endif /* _ROC_NIX_INL_DP_H_ */ diff --git a/drivers/common/cnxk/roc_npa.h b/drivers/common/cnxk/roc_npa.h index 82596876f0..8f74512032 100644 --- a/drivers/common/cnxk/roc_npa.h +++ b/drivers/common/cnxk/roc_npa.h @@ -5,7 +5,6 @@ #ifndef _ROC_NPA_H_ #define _ROC_NPA_H_ -#define ROC_AURA_ID_MASK (BIT_ULL(16) - 1) #define ROC_AURA_OP_LIMIT_MASK (BIT_ULL(36) - 1) #define ROC_NPA_MAX_BLOCK_SZ (128 * 1024) @@ -39,18 +38,6 @@ roc_npa_aura_handle_gen(uint32_t aura_id, uintptr_t addr) return (uint64_t)addr | val; } -static inline uint64_t -roc_npa_aura_handle_to_aura(uint64_t aura_handle) -{ - return aura_handle & ROC_AURA_ID_MASK; -} - -static inline uintptr_t -roc_npa_aura_handle_to_base(uint64_t aura_handle) -{ - return (uintptr_t)(aura_handle & ~ROC_AURA_ID_MASK); -} - static inline uint64_t roc_npa_aura_op_alloc(uint64_t aura_handle, const int drop) { @@ -65,18 +52,6 @@ roc_npa_aura_op_alloc(uint64_t aura_handle, const int drop) return roc_atomic64_add_nosync(wdata, addr); } -static inline void -roc_npa_aura_op_free(uint64_t aura_handle, const int fabs, uint64_t iova) -{ - uint64_t reg = roc_npa_aura_handle_to_aura(aura_handle); - const uint64_t addr = - roc_npa_aura_handle_to_base(aura_handle) + NPA_LF_AURA_OP_FREE0; - if (fabs) - reg |= BIT_ULL(63); /* FABS */ - - roc_store_pair(iova, reg, addr); -} - static inline uint64_t roc_npa_aura_op_cnt_get(uint64_t aura_handle) { diff --git a/drivers/common/cnxk/roc_npa_dp.h b/drivers/common/cnxk/roc_npa_dp.h new file mode 100644 index 0000000000..92c317f205 --- /dev/null +++ b/drivers/common/cnxk/roc_npa_dp.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ + +#ifndef _ROC_NPA_DP_H_ +#define _ROC_NPA_DP_H_ + +#define ROC_AURA_ID_MASK (BIT_ULL(16) - 1) + +static inline uint64_t +roc_npa_aura_handle_to_aura(uint64_t aura_handle) +{ + return aura_handle & ROC_AURA_ID_MASK; +} + +static inline uintptr_t +roc_npa_aura_handle_to_base(uint64_t aura_handle) +{ + return (uintptr_t)(aura_handle & ~ROC_AURA_ID_MASK); +} + +static inline void +roc_npa_aura_op_free(uint64_t aura_handle, const int fabs, uint64_t iova) +{ + uint64_t reg = roc_npa_aura_handle_to_aura(aura_handle); + const uint64_t addr = + roc_npa_aura_handle_to_base(aura_handle) + NPA_LF_AURA_OP_FREE0; + if (fabs) + reg |= BIT_ULL(63); /* FABS */ + + roc_store_pair(iova, reg, addr); +} + +#endif /* _ROC_NPA_DP_H_ */ diff --git a/drivers/common/cnxk/roc_sso.h b/drivers/common/cnxk/roc_sso.h index 5075991ef7..fc6e71332f 100644 --- a/drivers/common/cnxk/roc_sso.h +++ b/drivers/common/cnxk/roc_sso.h @@ -54,31 +54,6 @@ struct roc_sso { uint8_t reserved[ROC_SSO_MEM_SZ] __plt_cache_aligned; } __plt_cache_aligned; -static __plt_always_inline uint64_t -roc_sso_hws_head_wait(uintptr_t base) -{ - uintptr_t tag_op = base + SSOW_LF_GWS_TAG; - uint64_t tag; - -#if defined(__aarch64__) - asm volatile(PLT_CPU_FEATURE_PREAMBLE - " ldr %[tag], [%[tag_op]] \n" - " tbnz %[tag], 35, done%= \n" - " sevl \n" - "rty%=: wfe \n" - " ldr %[tag], [%[tag_op]] \n" - " tbz %[tag], 35, rty%= \n" - "done%=: \n" - : [tag] "=&r"(tag) - : [tag_op] "r"(tag_op)); -#else - do { - tag = plt_read64(tag_op); - } while (!(tag & BIT_ULL(35))); -#endif - return tag; -} - /* SSO device initialization */ int __roc_api roc_sso_dev_init(struct roc_sso *roc_sso); int __roc_api roc_sso_dev_fini(struct roc_sso *roc_sso); diff --git a/drivers/common/cnxk/roc_sso_dp.h b/drivers/common/cnxk/roc_sso_dp.h new file mode 100644 index 0000000000..9d30286d2f --- /dev/null +++ b/drivers/common/cnxk/roc_sso_dp.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ + +#ifndef _ROC_SSO_DP_H_ +#define _ROC_SSO_DP_H_ + +static __plt_always_inline uint64_t +roc_sso_hws_head_wait(uintptr_t base) +{ + uintptr_t tag_op = base + SSOW_LF_GWS_TAG; + uint64_t tag; + +#if defined(__aarch64__) + asm volatile(PLT_CPU_FEATURE_PREAMBLE + " ldr %[tag], [%[tag_op]] \n" + " tbnz %[tag], 35, done%= \n" + " sevl \n" + "rty%=: wfe \n" + " ldr %[tag], [%[tag_op]] \n" + " tbz %[tag], 35, rty%= \n" + "done%=: \n" + : [tag] "=&r"(tag) + : [tag_op] "r"(tag_op)); +#else + do { + tag = plt_read64(tag_op); + } while (!(tag & BIT_ULL(35))); +#endif + return tag; +} + +#endif /* _ROC_SSO_DP_H_ */ From patchwork Wed Jan 25 11:31:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 122518 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3208B42485; Wed, 25 Jan 2023 12:31:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2141042D31; Wed, 25 Jan 2023 12:31:56 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 9F12B42D7F for ; Wed, 25 Jan 2023 12:31:54 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30P9F5ha028380 for ; Wed, 25 Jan 2023 03:31:53 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=0WZCL48rZqDramnHj8RcZj/Qta5xdReUpWX48OkgV5Y=; b=VOMnpLdfcYwafCMxZgQobRfVwvE9kxk0ubVl36OhmKu3F4LTWhjKWqL6YuID4N0QLGXS x5gNrlmkMQAIQC4pRC1cA6x1vay5RZAN6hre5lzJH/IEE69NTf34/1zrFtLuxE+PYN78 T8GDocm9pwQZ+3dwMVlwaUHaW8XSgRmyXJztNl9s7b5JQaaYG0nqE7NdZFpJo4zC1ZXp ZI0ImH9LhL5n4/1HLKJaiMLAQyfuSroS6rhQBf5L49O1xLF2OmHIlGM7VwxKc9Xx9Emo D51jTyRhawhiFo7RRlyOo6V0Fta1snl87OvVI3d26L3h7lmlc/z8FOjNGaWU8GMC7+X+ MQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3nb0hp8j0c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 25 Jan 2023 03:31:53 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 25 Jan 2023 03:31:51 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 25 Jan 2023 03:31:51 -0800 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id BBBC13F706A; Wed, 25 Jan 2023 03:31:47 -0800 (PST) From: Rahul Bhansali To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Ankur Dwivedi , Anoob Joseph , Tejasree Kondoj , "Pavan Nikhilesh" , Shijith Thotton , Radha Mohan Chintakuntla , Veerasenareddy Burru , Sathesh Edara CC: Subject: [PATCH v3 2/4] crypto/cnxk: restructure for cn10k datapath Date: Wed, 25 Jan 2023 17:01:24 +0530 Message-ID: <20230125113126.2860273-2-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125113126.2860273-1-rbhansali@marvell.com> References: <20221221091549.967801-1-rbhansali@marvell.com> <20230125113126.2860273-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 7usLL2JpCAaY6g3vGri_AcVkMIu9wHDQ X-Proofpoint-GUID: 7usLL2JpCAaY6g3vGri_AcVkMIu9wHDQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-25_06,2023-01-25_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Anoob Joseph Inclusion of roc_api.h in all files would mean any change in RoC API would result in recompilation of all cnxk drivers. Address this issue in crypto_cnxk drivers by including only the headers that are required. Signed-off-by: Anoob Joseph --- Changes in v3: Reorder patch in series for compilation fix. Changes in v2: Updated git comment subject. drivers/common/cnxk/cnxk_security.h | 3 +- drivers/common/cnxk/hw/cpt.h | 30 +++++++++++++++++++ drivers/common/cnxk/roc_ae_fpm_tables.h | 2 +- drivers/common/cnxk/roc_cpt.h | 6 +++- drivers/common/cnxk/roc_ie_ot.h | 2 ++ drivers/common/cnxk/roc_io_generic.h | 2 ++ drivers/common/cnxk/roc_mbox.h | 35 ++--------------------- drivers/common/cnxk/roc_model.h | 2 ++ drivers/common/cnxk/roc_npa.c | 2 +- drivers/common/cnxk/roc_npa.h | 13 +++++++++ drivers/common/cnxk/roc_platform.h | 7 +++++ drivers/common/cnxk/roc_sso.h | 2 ++ drivers/common/cnxk/roc_tim.h | 2 ++ drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 11 +++++-- drivers/crypto/cnxk/cn10k_ipsec.h | 3 +- drivers/crypto/cnxk/cn9k_cryptodev_ops.c | 9 ++++++ drivers/crypto/cnxk/cn9k_ipsec_la_ops.h | 2 ++ drivers/crypto/cnxk/cnxk_ae.h | 3 +- drivers/crypto/cnxk/cnxk_cryptodev.c | 1 + drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 2 ++ drivers/crypto/cnxk/cnxk_cryptodev_ops.h | 7 ++++- drivers/crypto/cnxk/cnxk_ipsec.h | 4 ++- drivers/crypto/cnxk/cnxk_sg.h | 2 ++ drivers/event/cnxk/cnxk_eventdev.c | 2 ++ drivers/event/cnxk/cnxk_eventdev.h | 5 +++- drivers/event/cnxk/cnxk_tim_evdev.c | 2 ++ drivers/event/cnxk/cnxk_tim_evdev.h | 5 +++- drivers/event/cnxk/cnxk_worker.h | 6 ++++ drivers/net/octeon_ep/meson.build | 2 ++ 29 files changed, 130 insertions(+), 44 deletions(-) -- 2.25.1 diff --git a/drivers/common/cnxk/cnxk_security.h b/drivers/common/cnxk/cnxk_security.h index 4e477ec53f..2277ce9144 100644 --- a/drivers/common/cnxk/cnxk_security.h +++ b/drivers/common/cnxk/cnxk_security.h @@ -7,7 +7,8 @@ #include #include -#include "roc_api.h" +#include "roc_ie_on.h" +#include "roc_ie_ot.h" /* Response length calculation data */ struct cnxk_ipsec_outb_rlens { diff --git a/drivers/common/cnxk/hw/cpt.h b/drivers/common/cnxk/hw/cpt.h index 30f2af3cd9..d378a4eadd 100644 --- a/drivers/common/cnxk/hw/cpt.h +++ b/drivers/common/cnxk/hw/cpt.h @@ -5,6 +5,8 @@ #ifndef __CPT_HW_H__ #define __CPT_HW_H__ +#include "roc_platform.h" + /* Register offsets */ #define CPT_COMP_NOT_DONE (0x0ull) @@ -47,8 +49,36 @@ #define CPT_AF_LFX_CTL(a) (0x27000ull | (uint64_t)(a) << 3) #define CPT_AF_LFX_CTL2(a) (0x29000ull | (uint64_t)(a) << 3) +enum cpt_eng_type { + CPT_ENG_TYPE_AE = 1, + CPT_ENG_TYPE_SE = 2, + CPT_ENG_TYPE_IE = 3, + CPT_MAX_ENG_TYPES, +}; + /* Structures definitions */ +/* CPT HW capabilities */ +union cpt_eng_caps { + uint64_t __io u; + struct { + uint64_t __io reserved_0_4 : 5; + uint64_t __io mul : 1; + uint64_t __io sha1_sha2 : 1; + uint64_t __io chacha20 : 1; + uint64_t __io zuc_snow3g : 1; + uint64_t __io sha3 : 1; + uint64_t __io aes : 1; + uint64_t __io kasumi : 1; + uint64_t __io des : 1; + uint64_t __io crc : 1; + uint64_t __io mmul : 1; + uint64_t __io reserved_15_33 : 19; + uint64_t __io pdcp_chain : 1; + uint64_t __io reserved_35_63 : 29; + }; +}; + union cpt_lf_ctl { uint64_t u; struct cpt_lf_ctl_s { diff --git a/drivers/common/cnxk/roc_ae_fpm_tables.h b/drivers/common/cnxk/roc_ae_fpm_tables.h index 1cc5b023f2..98b00bcf14 100644 --- a/drivers/common/cnxk/roc_ae_fpm_tables.h +++ b/drivers/common/cnxk/roc_ae_fpm_tables.h @@ -5,7 +5,7 @@ #ifndef _ROC_AE_FPM_TABLES_H_ #define _ROC_AE_FPM_TABLES_H_ -#include "roc_api.h" +#include "roc_platform.h" int __roc_api roc_ae_fpm_get(uint64_t *tbl); void __roc_api roc_ae_fpm_put(void); diff --git a/drivers/common/cnxk/roc_cpt.h b/drivers/common/cnxk/roc_cpt.h index 96d066dee3..2fa1abad16 100644 --- a/drivers/common/cnxk/roc_cpt.h +++ b/drivers/common/cnxk/roc_cpt.h @@ -5,7 +5,11 @@ #ifndef _ROC_CPT_H_ #define _ROC_CPT_H_ -#include "roc_api.h" +#include "hw/cpt.h" + +#include "roc_platform.h" + +struct nix_inline_ipsec_cfg; #define ROC_AE_CPT_BLOCK_TYPE1 0 #define ROC_AE_CPT_BLOCK_TYPE2 1 diff --git a/drivers/common/cnxk/roc_ie_ot.h b/drivers/common/cnxk/roc_ie_ot.h index e53ee28aff..b7fcdf9ba7 100644 --- a/drivers/common/cnxk/roc_ie_ot.h +++ b/drivers/common/cnxk/roc_ie_ot.h @@ -5,6 +5,8 @@ #ifndef __ROC_IE_OT_H__ #define __ROC_IE_OT_H__ +#include "roc_platform.h" + /* CN10K IPSEC opcodes */ #define ROC_IE_OT_MAJOR_OP_PROCESS_OUTBOUND_IPSEC 0x28UL #define ROC_IE_OT_MAJOR_OP_PROCESS_INBOUND_IPSEC 0x29UL diff --git a/drivers/common/cnxk/roc_io_generic.h b/drivers/common/cnxk/roc_io_generic.h index 42764455cc..843c18c48c 100644 --- a/drivers/common/cnxk/roc_io_generic.h +++ b/drivers/common/cnxk/roc_io_generic.h @@ -5,6 +5,8 @@ #ifndef _ROC_IO_GENERIC_H_ #define _ROC_IO_GENERIC_H_ +#include "roc_platform.h" + #define ROC_LMT_BASE_ID_GET(lmt_addr, lmt_id) (lmt_id = 0) #define ROC_LMT_CPT_BASE_ID_GET(lmt_addr, lmt_id) (lmt_id = 0) diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h index c1769567b5..0bddb1ddfd 100644 --- a/drivers/common/cnxk/roc_mbox.h +++ b/drivers/common/cnxk/roc_mbox.h @@ -9,10 +9,9 @@ #include #include -/* Device memory does not support unaligned access, instruct compiler to - * not optimize the memory access when working with mailbox memory. - */ -#define __io volatile +#include "hw/cpt.h" + +#include "roc_platform.h" /* Header which precedes all mbox messages */ struct mbox_hdr { @@ -1510,34 +1509,6 @@ struct cpt_rx_inline_lf_cfg_msg { uint32_t __io reserved; }; -enum cpt_eng_type { - CPT_ENG_TYPE_AE = 1, - CPT_ENG_TYPE_SE = 2, - CPT_ENG_TYPE_IE = 3, - CPT_MAX_ENG_TYPES, -}; - -/* CPT HW capabilities */ -union cpt_eng_caps { - uint64_t __io u; - struct { - uint64_t __io reserved_0_4 : 5; - uint64_t __io mul : 1; - uint64_t __io sha1_sha2 : 1; - uint64_t __io chacha20 : 1; - uint64_t __io zuc_snow3g : 1; - uint64_t __io sha3 : 1; - uint64_t __io aes : 1; - uint64_t __io kasumi : 1; - uint64_t __io des : 1; - uint64_t __io crc : 1; - uint64_t __io mmul : 1; - uint64_t __io reserved_15_33 : 19; - uint64_t __io pdcp_chain : 1; - uint64_t __io reserved_35_63 : 29; - }; -}; - struct cpt_caps_rsp_msg { struct mbox_msghdr hdr; uint16_t __io cpt_pf_drv_version; diff --git a/drivers/common/cnxk/roc_model.h b/drivers/common/cnxk/roc_model.h index 848609eb35..081c03915c 100644 --- a/drivers/common/cnxk/roc_model.h +++ b/drivers/common/cnxk/roc_model.h @@ -7,6 +7,8 @@ #include +#include "roc_bits.h" + extern struct roc_model *roc_model; struct roc_model { diff --git a/drivers/common/cnxk/roc_npa.c b/drivers/common/cnxk/roc_npa.c index 1a5debcf76..69c3d8d250 100644 --- a/drivers/common/cnxk/roc_npa.c +++ b/drivers/common/cnxk/roc_npa.c @@ -875,8 +875,8 @@ npa_dev_fini(struct npa_lf *lf) int npa_lf_init(struct dev *dev, struct plt_pci_device *pci_dev) { + uint16_t npa_msixoff = 0; struct idev_cfg *idev; - uint16_t npa_msixoff; struct npa_lf *lf; int rc; diff --git a/drivers/common/cnxk/roc_npa.h b/drivers/common/cnxk/roc_npa.h index 8f74512032..dd588b0322 100644 --- a/drivers/common/cnxk/roc_npa.h +++ b/drivers/common/cnxk/roc_npa.h @@ -5,6 +5,19 @@ #ifndef _ROC_NPA_H_ #define _ROC_NPA_H_ +#include + +#include "hw/npa.h" + +#include "roc_bits.h" +#include "roc_constants.h" +#if defined(__aarch64__) +#include "roc_io.h" +#else +#include "roc_io_generic.h" +#endif +#include "roc_npa_dp.h" + #define ROC_AURA_OP_LIMIT_MASK (BIT_ULL(36) - 1) #define ROC_NPA_MAX_BLOCK_SZ (128 * 1024) diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h index 8ba28e69fa..f916a5dc08 100644 --- a/drivers/common/cnxk/roc_platform.h +++ b/drivers/common/cnxk/roc_platform.h @@ -293,6 +293,13 @@ extern int cnxk_logtype_ree; } #endif +/* Device memory does not support unaligned access, instruct compiler to + * not optimize the memory access when working with mailbox memory. + */ +#ifndef __io +#define __io volatile +#endif + __rte_internal int roc_plt_init(void); diff --git a/drivers/common/cnxk/roc_sso.h b/drivers/common/cnxk/roc_sso.h index fc6e71332f..47574a4e02 100644 --- a/drivers/common/cnxk/roc_sso.h +++ b/drivers/common/cnxk/roc_sso.h @@ -5,6 +5,8 @@ #ifndef _ROC_SSO_H_ #define _ROC_SSO_H_ +#include "hw/ssow.h" + struct roc_sso_hwgrp_qos { uint16_t hwgrp; uint8_t xaq_prcnt; diff --git a/drivers/common/cnxk/roc_tim.h b/drivers/common/cnxk/roc_tim.h index 392732eae2..7dc9ae0a61 100644 --- a/drivers/common/cnxk/roc_tim.h +++ b/drivers/common/cnxk/roc_tim.h @@ -5,6 +5,8 @@ #ifndef _ROC_TIM_H_ #define _ROC_TIM_H_ +#include "roc_platform.h" + enum roc_tim_clk_src { ROC_TIM_CLK_SRC_10NS = 0, ROC_TIM_CLK_SRC_GPIO, diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c index 017b0d8907..ef0a4ea05a 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c @@ -7,6 +7,15 @@ #include #include +#include "roc_cpt.h" +#if defined(__aarch64__) +#include "roc_io.h" +#else +#include "roc_io_generic.h" +#endif +#include "roc_sso.h" +#include "roc_sso_dp.h" + #include "cn10k_cryptodev.h" #include "cn10k_cryptodev_ops.h" #include "cn10k_ipsec.h" @@ -17,8 +26,6 @@ #include "cnxk_eventdev.h" #include "cnxk_se.h" -#include "roc_api.h" - #define PKTS_PER_LOOP 32 #define PKTS_PER_STEORL 16 diff --git a/drivers/crypto/cnxk/cn10k_ipsec.h b/drivers/crypto/cnxk/cn10k_ipsec.h index 23d7a4fac4..8a93d74062 100644 --- a/drivers/crypto/cnxk/cn10k_ipsec.h +++ b/drivers/crypto/cnxk/cn10k_ipsec.h @@ -8,7 +8,8 @@ #include #include -#include "roc_api.h" +#include "roc_constants.h" +#include "roc_ie_ot.h" #include "cnxk_ipsec.h" diff --git a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c index e3784e34c9..99734bf11d 100644 --- a/drivers/crypto/cnxk/cn9k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn9k_cryptodev_ops.c @@ -8,6 +8,15 @@ #include #include +#include "roc_cpt.h" +#if defined(__aarch64__) +#include "roc_io.h" +#else +#include "roc_io_generic.h" +#endif +#include "roc_sso.h" +#include "roc_sso_dp.h" + #include "cn9k_cryptodev.h" #include "cn9k_cryptodev_ops.h" #include "cn9k_ipsec.h" diff --git a/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h b/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h index 21725404cb..9df41bf65d 100644 --- a/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h +++ b/drivers/crypto/cnxk/cn9k_ipsec_la_ops.h @@ -9,6 +9,8 @@ #include #include +#include "roc_ie.h" + #include "cn9k_ipsec.h" #include "cnxk_cryptodev_ops.h" #include "cnxk_security_ar.h" diff --git a/drivers/crypto/cnxk/cnxk_ae.h b/drivers/crypto/cnxk/cnxk_ae.h index adf719da73..698c10129e 100644 --- a/drivers/crypto/cnxk/cnxk_ae.h +++ b/drivers/crypto/cnxk/cnxk_ae.h @@ -9,7 +9,8 @@ #include #include -#include "roc_api.h" +#include "roc_ae.h" + #include "cnxk_cryptodev_ops.h" struct cnxk_ae_sess { diff --git a/drivers/crypto/cnxk/cnxk_cryptodev.c b/drivers/crypto/cnxk/cnxk_cryptodev.c index 35635f7831..a86b1cb60f 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev.c @@ -5,6 +5,7 @@ #include #include "roc_cpt.h" +#include "roc_model.h" #include "cnxk_cryptodev.h" diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c index 2e845afce9..4640edf7ff 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c @@ -6,7 +6,9 @@ #include #include +#include "roc_ae_fpm_tables.h" #include "roc_cpt.h" +#include "roc_ie_on.h" #include "cnxk_ae.h" #include "cnxk_cryptodev.h" diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h index f91ad368ea..0dfe73c976 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.h @@ -8,7 +8,12 @@ #include #include -#include "roc_api.h" +#include "hw/cpt.h" + +#include "roc_constants.h" +#include "roc_cpt.h" +#include "roc_cpt_sg.h" +#include "roc_se.h" #define CNXK_CPT_MIN_HEADROOM_REQ 32 #define CNXK_CPT_MIN_TAILROOM_REQ 102 diff --git a/drivers/crypto/cnxk/cnxk_ipsec.h b/drivers/crypto/cnxk/cnxk_ipsec.h index 0c471b2cfe..4d3ee23f61 100644 --- a/drivers/crypto/cnxk/cnxk_ipsec.h +++ b/drivers/crypto/cnxk/cnxk_ipsec.h @@ -7,7 +7,9 @@ #include #include -#include "roc_api.h" +#include "roc_cpt.h" +#include "roc_ie_on.h" +#include "roc_ie_ot.h" extern struct rte_security_ops cnxk_sec_ops; diff --git a/drivers/crypto/cnxk/cnxk_sg.h b/drivers/crypto/cnxk/cnxk_sg.h index 1dfca261cf..ead2886e99 100644 --- a/drivers/crypto/cnxk/cnxk_sg.h +++ b/drivers/crypto/cnxk/cnxk_sg.h @@ -5,6 +5,8 @@ #ifndef _CNXK_SG_H_ #define _CNXK_SG_H_ +#include "roc_cpt_sg.h" + static __rte_always_inline uint32_t fill_sg_comp(struct roc_sglist_comp *list, uint32_t i, phys_addr_t dma_addr, uint32_t size) { diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index db62d32a81..d7819a9298 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -2,6 +2,8 @@ * Copyright(C) 2021 Marvell. */ +#include "roc_npa.h" + #include "cnxk_eventdev.h" void diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h index 738e335ea4..a3b4fef9d0 100644 --- a/drivers/event/cnxk/cnxk_eventdev.h +++ b/drivers/event/cnxk/cnxk_eventdev.h @@ -19,7 +19,10 @@ #include -#include "roc_api.h" +#include "hw/sso.h" + +#include "roc_platform.h" +#include "roc_sso.h" #include "cnxk_tim_evdev.h" diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c b/drivers/event/cnxk/cnxk_tim_evdev.c index 5dd79cbd47..3e6ff2b12f 100644 --- a/drivers/event/cnxk/cnxk_tim_evdev.c +++ b/drivers/event/cnxk/cnxk_tim_evdev.c @@ -4,6 +4,8 @@ #include +#include "roc_npa.h" + #include "cnxk_eventdev.h" #include "cnxk_tim_evdev.h" diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h b/drivers/event/cnxk/cnxk_tim_evdev.h index 0c192346c7..c4ce74bfa5 100644 --- a/drivers/event/cnxk/cnxk_tim_evdev.h +++ b/drivers/event/cnxk/cnxk_tim_evdev.h @@ -16,7 +16,10 @@ #include #include -#include "roc_api.h" +#include "hw/tim.h" + +#include "roc_model.h" +#include "roc_tim.h" #define NSECPERSEC 1E9 #define USECPERSEC 1E6 diff --git a/drivers/event/cnxk/cnxk_worker.h b/drivers/event/cnxk/cnxk_worker.h index 5e5e96b1ec..0756e223f7 100644 --- a/drivers/event/cnxk/cnxk_worker.h +++ b/drivers/event/cnxk/cnxk_worker.h @@ -5,6 +5,12 @@ #ifndef __CNXK_WORKER_H__ #define __CNXK_WORKER_H__ +#if defined(__aarch64__) +#include "roc_io.h" +#else +#include "roc_io_generic.h" +#endif + #include "cnxk_eventdev.h" /* SSO Operations */ diff --git a/drivers/net/octeon_ep/meson.build b/drivers/net/octeon_ep/meson.build index a267b60290..a3bfed09ee 100644 --- a/drivers/net/octeon_ep/meson.build +++ b/drivers/net/octeon_ep/meson.build @@ -2,6 +2,8 @@ # Copyright(C) 2021 Marvell. # +deps += ['common_cnxk'] + sources = files( 'otx_ep_ethdev.c', 'otx_ep_rxtx.c', From patchwork Wed Jan 25 11:31:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 122519 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6FDCE42485; Wed, 25 Jan 2023 12:32:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6357D42D83; Wed, 25 Jan 2023 12:32:03 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id BB4A542D87 for ; Wed, 25 Jan 2023 12:32:01 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30P9F57Y028383 for ; Wed, 25 Jan 2023 03:32:01 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=SyWhCuyp0m5X87os3c0mXpIwBfUVKp422NkrRx0QRVM=; b=d4Xm4KAWoGeDPMQjfliJmKSL03v89U/anC6twCE2NccUqsk7NgDB9Ighq4GvgQ9du0xd OFA50aiYC1+cgNcn4fIth7TLGHWsJjuSAW4oA+9Q7Vvmy+1fTmINHZ8KuHUYGGS08kgZ EtYLVcSkRGsYWXDmWuyvIEzZlltzf13Vnzk+RUEOju5V6CGnZ+1zQVdg8wD1Ve/Dk5+4 zq3mrDYu5ssIhXI5vDBVBNxrpm7t8AVHA5KmgpN8V3qN8Yrd1bpTihGDWD19sp/+zRK1 KU113ve13BODQhvFiNHoglxxZDHH+GHo1W3Vq/Y8j2/quAMpjlJFtipFwmy3trBfO/AC Aw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3nb0hp8j14-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 25 Jan 2023 03:32:00 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 25 Jan 2023 03:31:58 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 25 Jan 2023 03:31:58 -0800 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 08DC83F706A; Wed, 25 Jan 2023 03:31:55 -0800 (PST) From: Rahul Bhansali To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Rahul Bhansali Subject: [PATCH v3 3/4] net/cnxk: restructure for cn10k datapath Date: Wed, 25 Jan 2023 17:01:25 +0530 Message-ID: <20230125113126.2860273-3-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125113126.2860273-1-rbhansali@marvell.com> References: <20221221091549.967801-1-rbhansali@marvell.com> <20230125113126.2860273-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: 2omBrwOWtSti9wHxalx7RAuPQ-UX2NCp X-Proofpoint-GUID: 2omBrwOWtSti9wHxalx7RAuPQ-UX2NCp X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-25_06,2023-01-25_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Restructure for separate cn10k datapath functionality to reduce recompilation time in case of any changes in control path. New cnxk_ethdev_dp.h and cn10k_rxtx.h files are created to have macros, functions as required for datapath with minimal dependency on roc changes. Signed-off-by: Rahul Bhansali --- Changes in v3: Reorder patch in series for compilation fix. Changes in v2: No changes. drivers/net/cnxk/cn10k_ethdev.h | 71 +------- drivers/net/cnxk/cn10k_rx.h | 5 +- drivers/net/cnxk/cn10k_rxtx.h | 116 ++++++++++++ drivers/net/cnxk/cn10k_tx.h | 2 +- drivers/net/cnxk/cnxk_ethdev.h | 157 +--------------- drivers/net/cnxk/cnxk_ethdev_dp.h | 167 ++++++++++++++++++ drivers/net/cnxk/rx/cn10k/rx_0_15.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_0_15_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_0_15_vec.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_0_15_vec_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_112_127.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_112_127_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_112_127_vec.c | 5 +- .../net/cnxk/rx/cn10k/rx_112_127_vec_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_16_31.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_16_31_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_16_31_vec.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_16_31_vec_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_32_47.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_32_47_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_32_47_vec.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_32_47_vec_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_48_63.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_48_63_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_48_63_vec.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_48_63_vec_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_64_79.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_64_79_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_64_79_vec.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_64_79_vec_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_80_95.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_80_95_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_80_95_vec.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_80_95_vec_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_96_111.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_96_111_mseg.c | 5 +- drivers/net/cnxk/rx/cn10k/rx_96_111_vec.c | 5 +- .../net/cnxk/rx/cn10k/rx_96_111_vec_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_0_15.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_0_15_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_0_15_vec.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_0_15_vec_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_112_127.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_112_127_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_112_127_vec.c | 5 +- .../net/cnxk/tx/cn10k/tx_112_127_vec_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_16_31.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_16_31_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_16_31_vec.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_16_31_vec_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_32_47.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_32_47_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_32_47_vec.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_32_47_vec_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_48_63.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_48_63_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_48_63_vec.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_48_63_vec_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_64_79.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_64_79_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_64_79_vec.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_64_79_vec_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_80_95.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_80_95_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_80_95_vec.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_80_95_vec_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_96_111.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_96_111_mseg.c | 5 +- drivers/net/cnxk/tx/cn10k/tx_96_111_vec.c | 5 +- .../net/cnxk/tx/cn10k/tx_96_111_vec_mseg.c | 5 +- 70 files changed, 545 insertions(+), 293 deletions(-) create mode 100644 drivers/net/cnxk/cn10k_rxtx.h create mode 100644 drivers/net/cnxk/cnxk_ethdev_dp.h -- 2.25.1 diff --git a/drivers/net/cnxk/cn10k_ethdev.h b/drivers/net/cnxk/cn10k_ethdev.h index c843ba9881..55d7f88716 100644 --- a/drivers/net/cnxk/cn10k_ethdev.h +++ b/drivers/net/cnxk/cn10k_ethdev.h @@ -6,52 +6,7 @@ #include #include - -struct cn10k_eth_txq { - uint64_t send_hdr_w0; - int64_t fc_cache_pkts; - uint64_t *fc_mem; - uintptr_t lmt_base; - rte_iova_t io_addr; - uint16_t sqes_per_sqb_log2; - int16_t nb_sqb_bufs_adj; - rte_iova_t cpt_io_addr; - uint64_t sa_base; - uint64_t *cpt_fc; - uint16_t cpt_desc; - int32_t *cpt_fc_sw; - uint64_t lso_tun_fmt; - uint64_t ts_mem; - uint64_t mark_flag : 8; - uint64_t mark_fmt : 48; - struct cnxk_eth_txq_comp tx_compl; -} __plt_cache_aligned; - -struct cn10k_eth_rxq { - uint64_t mbuf_initializer; - uintptr_t desc; - void *lookup_mem; - uintptr_t cq_door; - uint64_t wdata; - int64_t *cq_status; - uint32_t head; - uint32_t qmask; - uint32_t available; - uint16_t data_off; - uint64_t sa_base; - uint64_t lmt_base; - uint64_t meta_aura; - uint16_t rq; - struct cnxk_timesync_info *tstamp; -} __plt_cache_aligned; - -/* Private data in sw rsvd area of struct roc_ot_ipsec_inb_sa */ -struct cn10k_inb_priv_data { - void *userdata; - int reass_dynfield_off; - int reass_dynflag_bit; - struct cnxk_eth_sec_sess *eth_sec; -}; +#include /* Private data in sw rsvd area of struct roc_ot_ipsec_outb_sa */ struct cn10k_outb_priv_data { @@ -64,26 +19,6 @@ struct cn10k_outb_priv_data { uint32_t sa_idx; }; -struct cn10k_sec_sess_priv { - union { - struct { - uint32_t sa_idx; - uint8_t inb_sa : 1; - uint8_t outer_ip_ver : 1; - uint8_t mode : 1; - uint8_t roundup_byte : 5; - uint8_t roundup_len; - uint16_t partial_len : 10; - uint16_t chksum : 2; - uint16_t dec_ttl : 1; - uint16_t nixtx_off : 1; - uint16_t rsvd : 2; - }; - - uint64_t u64; - }; -} __rte_packed; - /* Rx and Tx routines */ void cn10k_eth_set_rx_function(struct rte_eth_dev *eth_dev); void cn10k_eth_set_tx_function(struct rte_eth_dev *eth_dev); @@ -95,8 +30,4 @@ void cn10k_eth_sec_ops_override(void); void cn10k_eth_sec_sso_work_cb(uint64_t *gw, void *args, uint32_t soft_exp_event); -#define LMT_OFF(lmt_addr, lmt_num, offset) \ - (void *)((uintptr_t)(lmt_addr) + \ - ((uint64_t)(lmt_num) << ROC_LMT_LINE_SIZE_LOG2) + (offset)) - #endif /* __CN10K_ETHDEV_H__ */ diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h index 38e82486ed..9fdb5565e9 100644 --- a/drivers/net/cnxk/cn10k_rx.h +++ b/drivers/net/cnxk/cn10k_rx.h @@ -4,10 +4,11 @@ #ifndef __CN10K_RX_H__ #define __CN10K_RX_H__ -#include +#include #include +#include "cn10k_rxtx.h" -#include +#define NSEC_PER_SEC 1000000000L #define NIX_RX_OFFLOAD_NONE (0) #define NIX_RX_OFFLOAD_RSS_F BIT(0) diff --git a/drivers/net/cnxk/cn10k_rxtx.h b/drivers/net/cnxk/cn10k_rxtx.h new file mode 100644 index 0000000000..c256d54307 --- /dev/null +++ b/drivers/net/cnxk/cn10k_rxtx.h @@ -0,0 +1,116 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ + +#ifndef __CN10K_RXTX_H__ +#define __CN10K_RXTX_H__ + +#include + +/* ROC Constants */ +#include "roc_constants.h" + +/* Platform definition */ +#include "roc_platform.h" + +/* IO */ +#if defined(__aarch64__) +#include "roc_io.h" +#else +#include "roc_io_generic.h" +#endif + +/* HW structure definition */ +#include "hw/cpt.h" +#include "hw/nix.h" +#include "hw/npa.h" +#include "hw/npc.h" +#include "hw/ssow.h" + +#include "roc_ie_ot.h" + +/* NPA */ +#include "roc_npa_dp.h" + +/* SSO */ +#include "roc_sso_dp.h" + +/* CPT */ +#include "roc_cpt.h" + +/* NIX Inline dev */ +#include "roc_nix_inl_dp.h" + +#include "cnxk_ethdev_dp.h" + +struct cn10k_eth_txq { + uint64_t send_hdr_w0; + int64_t fc_cache_pkts; + uint64_t *fc_mem; + uintptr_t lmt_base; + rte_iova_t io_addr; + uint16_t sqes_per_sqb_log2; + int16_t nb_sqb_bufs_adj; + rte_iova_t cpt_io_addr; + uint64_t sa_base; + uint64_t *cpt_fc; + uint16_t cpt_desc; + int32_t *cpt_fc_sw; + uint64_t lso_tun_fmt; + uint64_t ts_mem; + uint64_t mark_flag : 8; + uint64_t mark_fmt : 48; + struct cnxk_eth_txq_comp tx_compl; +} __plt_cache_aligned; + +struct cn10k_eth_rxq { + uint64_t mbuf_initializer; + uintptr_t desc; + void *lookup_mem; + uintptr_t cq_door; + uint64_t wdata; + int64_t *cq_status; + uint32_t head; + uint32_t qmask; + uint32_t available; + uint16_t data_off; + uint64_t sa_base; + uint64_t lmt_base; + uint64_t meta_aura; + uint16_t rq; + struct cnxk_timesync_info *tstamp; +} __plt_cache_aligned; + +/* Private data in sw rsvd area of struct roc_ot_ipsec_inb_sa */ +struct cn10k_inb_priv_data { + void *userdata; + int reass_dynfield_off; + int reass_dynflag_bit; + struct cnxk_eth_sec_sess *eth_sec; +}; + +struct cn10k_sec_sess_priv { + union { + struct { + uint32_t sa_idx; + uint8_t inb_sa : 1; + uint8_t outer_ip_ver : 1; + uint8_t mode : 1; + uint8_t roundup_byte : 5; + uint8_t roundup_len; + uint16_t partial_len : 10; + uint16_t chksum : 2; + uint16_t dec_ttl : 1; + uint16_t nixtx_off : 1; + uint16_t rsvd : 2; + }; + + uint64_t u64; + }; +} __rte_packed; + +#define LMT_OFF(lmt_addr, lmt_num, offset) \ + (void *)((uintptr_t)(lmt_addr) + \ + ((uint64_t)(lmt_num) << ROC_LMT_LINE_SIZE_LOG2) + (offset)) + +#endif /* __CN10K_RXTX_H__ */ diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h index c51de742ad..1c1ce9642a 100644 --- a/drivers/net/cnxk/cn10k_tx.h +++ b/drivers/net/cnxk/cn10k_tx.h @@ -5,8 +5,8 @@ #define __CN10K_TX_H__ #include - #include +#include "cn10k_rxtx.h" #define NIX_TX_OFFLOAD_NONE (0) #define NIX_TX_OFFLOAD_L3_L4_CSUM_F BIT(0) diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h index ea8c70b8b7..f0eab4244c 100644 --- a/drivers/net/cnxk/cnxk_ethdev.h +++ b/drivers/net/cnxk/cnxk_ethdev.h @@ -22,6 +22,7 @@ #include #include "roc_api.h" +#include #define CNXK_ETH_DEV_PMD_VERSION "1.0" @@ -48,19 +49,6 @@ /* LPB & SPB */ #define CNXK_NIX_NUM_POOLS_MAX 2 -/* If PTP is enabled additional SEND MEM DESC is required which - * takes 2 words, hence max 7 iova address are possible - */ -#if defined(RTE_LIBRTE_IEEE1588) -#define CNXK_NIX_TX_NB_SEG_MAX 7 -#else -#define CNXK_NIX_TX_NB_SEG_MAX 9 -#endif - -#define CNXK_NIX_TX_MSEG_SG_DWORDS \ - ((RTE_ALIGN_MUL_CEIL(CNXK_NIX_TX_NB_SEG_MAX, 3) / 3) + \ - CNXK_NIX_TX_NB_SEG_MAX) - #define CNXK_NIX_RSS_L3_L4_SRC_DST \ (RTE_ETH_RSS_L3_SRC_ONLY | RTE_ETH_RSS_L3_DST_ONLY | \ RTE_ETH_RSS_L4_SRC_ONLY | RTE_ETH_RSS_L4_DST_ONLY) @@ -111,63 +99,14 @@ #define RSS_DMAC_INDEX 5 /* Default mark value used when none is provided. */ -#define CNXK_FLOW_ACTION_FLAG_DEFAULT 0xffff #define CNXK_NIX_MTR_COUNT_MAX 73 /* 64(leaf) + 8(mid) + 1(top) */ /* Default cycle counter mask */ #define CNXK_CYCLECOUNTER_MASK 0xffffffffffffffffULL -#define CNXK_NIX_TIMESYNC_RX_OFFSET 8 - -#define PTYPE_NON_TUNNEL_WIDTH 16 -#define PTYPE_TUNNEL_WIDTH 12 -#define PTYPE_NON_TUNNEL_ARRAY_SZ BIT(PTYPE_NON_TUNNEL_WIDTH) -#define PTYPE_TUNNEL_ARRAY_SZ BIT(PTYPE_TUNNEL_WIDTH) -#define PTYPE_ARRAY_SZ \ - ((PTYPE_NON_TUNNEL_ARRAY_SZ + PTYPE_TUNNEL_ARRAY_SZ) * sizeof(uint16_t)) - -/* NIX_RX_PARSE_S's ERRCODE + ERRLEV (12 bits) */ -#define ERRCODE_ERRLEN_WIDTH 12 -#define ERR_ARRAY_SZ ((BIT(ERRCODE_ERRLEN_WIDTH)) * sizeof(uint32_t)) /* Fastpath lookup */ #define CNXK_NIX_FASTPATH_LOOKUP_MEM "cnxk_nix_fastpath_lookup_mem" -#define CNXK_NIX_UDP_TUN_BITMASK \ - ((1ull << (RTE_MBUF_F_TX_TUNNEL_VXLAN >> 45)) | \ - (1ull << (RTE_MBUF_F_TX_TUNNEL_GENEVE >> 45))) - -/* Subtype from inline outbound error event */ -#define CNXK_ETHDEV_SEC_OUTB_EV_SUB 0xFFUL - -/* SPI will be in 20 bits of tag */ -#define CNXK_ETHDEV_SPI_TAG_MASK 0xFFFFFUL - -#define CNXK_NIX_PFC_CHAN_COUNT 16 - -#define CNXK_TM_MARK_VLAN_DEI BIT_ULL(0) -#define CNXK_TM_MARK_IP_DSCP BIT_ULL(1) -#define CNXK_TM_MARK_IP_ECN BIT_ULL(2) - -#define CNXK_TM_MARK_MASK \ - (CNXK_TM_MARK_VLAN_DEI | CNXK_TM_MARK_IP_DSCP | CNXK_TM_MARK_IP_ECN) - -#define CNXK_TX_MARK_FMT_MASK (0xFFFFFFFFFFFFull) - -struct cnxk_eth_txq_comp { - uintptr_t desc_base; - uintptr_t cq_door; - int64_t *cq_status; - uint64_t wdata; - uint32_t head; - uint32_t qmask; - uint32_t nb_desc_mask; - uint32_t available; - uint32_t sqe_id; - bool ena; - struct rte_mbuf **ptr; - rte_spinlock_t ext_buf_lock; -}; - struct cnxk_fc_cfg { enum rte_eth_fc_mode mode; uint8_t rx_pause; @@ -191,15 +130,6 @@ struct cnxk_eth_qconf { uint8_t valid; }; -struct cnxk_timesync_info { - uint8_t rx_ready; - uint64_t rx_tstamp; - uint64_t rx_tstamp_dynflag; - int tstamp_dynfield_offset; - rte_iova_t tx_tstamp_iova; - uint64_t *tx_tstamp; -} __plt_cache_aligned; - struct cnxk_meter_node { #define MAX_PRV_MTR_NODES 10 TAILQ_ENTRY(cnxk_meter_node) next; @@ -711,89 +641,4 @@ int nix_priority_flow_ctrl_rq_conf(struct rte_eth_dev *eth_dev, uint16_t qid, int nix_priority_flow_ctrl_sq_conf(struct rte_eth_dev *eth_dev, uint16_t qid, uint8_t rx_pause, uint8_t tc); -/* Inlines */ -static __rte_always_inline uint64_t -cnxk_pktmbuf_detach(struct rte_mbuf *m) -{ - struct rte_mempool *mp = m->pool; - uint32_t mbuf_size, buf_len; - struct rte_mbuf *md; - uint16_t priv_size; - uint16_t refcount; - - /* Update refcount of direct mbuf */ - md = rte_mbuf_from_indirect(m); - refcount = rte_mbuf_refcnt_update(md, -1); - - priv_size = rte_pktmbuf_priv_size(mp); - mbuf_size = (uint32_t)(sizeof(struct rte_mbuf) + priv_size); - buf_len = rte_pktmbuf_data_room_size(mp); - - m->priv_size = priv_size; - m->buf_addr = (char *)m + mbuf_size; - rte_mbuf_iova_set(m, rte_mempool_virt2iova(m) + mbuf_size); - m->buf_len = (uint16_t)buf_len; - rte_pktmbuf_reset_headroom(m); - m->data_len = 0; - m->ol_flags = 0; - m->next = NULL; - m->nb_segs = 1; - - /* Now indirect mbuf is safe to free */ - rte_pktmbuf_free(m); - - if (refcount == 0) { - rte_mbuf_refcnt_set(md, 1); - md->data_len = 0; - md->ol_flags = 0; - md->next = NULL; - md->nb_segs = 1; - return 0; - } else { - return 1; - } -} - -static __rte_always_inline uint64_t -cnxk_nix_prefree_seg(struct rte_mbuf *m) -{ - if (likely(rte_mbuf_refcnt_read(m) == 1)) { - if (!RTE_MBUF_DIRECT(m)) - return cnxk_pktmbuf_detach(m); - - m->next = NULL; - m->nb_segs = 1; - return 0; - } else if (rte_mbuf_refcnt_update(m, -1) == 0) { - if (!RTE_MBUF_DIRECT(m)) - return cnxk_pktmbuf_detach(m); - - rte_mbuf_refcnt_set(m, 1); - m->next = NULL; - m->nb_segs = 1; - return 0; - } - - /* Mbuf is having refcount more than 1 so need not to be freed */ - return 1; -} - -static inline rte_mbuf_timestamp_t * -cnxk_nix_timestamp_dynfield(struct rte_mbuf *mbuf, - struct cnxk_timesync_info *info) -{ - return RTE_MBUF_DYNFIELD(mbuf, info->tstamp_dynfield_offset, - rte_mbuf_timestamp_t *); -} - -static __rte_always_inline uintptr_t -cnxk_nix_sa_base_get(uint16_t port, const void *lookup_mem) -{ - uintptr_t sa_base_tbl; - - sa_base_tbl = (uintptr_t)lookup_mem; - sa_base_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ; - return *((const uintptr_t *)sa_base_tbl + port); -} - #endif /* __CNXK_ETHDEV_H__ */ diff --git a/drivers/net/cnxk/cnxk_ethdev_dp.h b/drivers/net/cnxk/cnxk_ethdev_dp.h new file mode 100644 index 0000000000..a812c78eda --- /dev/null +++ b/drivers/net/cnxk/cnxk_ethdev_dp.h @@ -0,0 +1,167 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ +#ifndef __CNXK_ETHDEV_DP_H__ +#define __CNXK_ETHDEV_DP_H__ + +#include + +/* If PTP is enabled additional SEND MEM DESC is required which + * takes 2 words, hence max 7 iova address are possible + */ +#if defined(RTE_LIBRTE_IEEE1588) +#define CNXK_NIX_TX_NB_SEG_MAX 7 +#else +#define CNXK_NIX_TX_NB_SEG_MAX 9 +#endif + +#define CNXK_NIX_TX_MSEG_SG_DWORDS \ + ((RTE_ALIGN_MUL_CEIL(CNXK_NIX_TX_NB_SEG_MAX, 3) / 3) + \ + CNXK_NIX_TX_NB_SEG_MAX) + +/* Default mark value used when none is provided. */ +#define CNXK_FLOW_ACTION_FLAG_DEFAULT 0xffff +#define CNXK_NIX_TIMESYNC_RX_OFFSET 8 + +#define PTYPE_NON_TUNNEL_WIDTH 16 +#define PTYPE_TUNNEL_WIDTH 12 +#define PTYPE_NON_TUNNEL_ARRAY_SZ BIT(PTYPE_NON_TUNNEL_WIDTH) +#define PTYPE_TUNNEL_ARRAY_SZ BIT(PTYPE_TUNNEL_WIDTH) +#define PTYPE_ARRAY_SZ \ + ((PTYPE_NON_TUNNEL_ARRAY_SZ + PTYPE_TUNNEL_ARRAY_SZ) * sizeof(uint16_t)) + +/* NIX_RX_PARSE_S's ERRCODE + ERRLEV (12 bits) */ +#define ERRCODE_ERRLEN_WIDTH 12 +#define ERR_ARRAY_SZ ((BIT(ERRCODE_ERRLEN_WIDTH)) * sizeof(uint32_t)) + +#define CNXK_NIX_UDP_TUN_BITMASK \ + ((1ull << (RTE_MBUF_F_TX_TUNNEL_VXLAN >> 45)) | \ + (1ull << (RTE_MBUF_F_TX_TUNNEL_GENEVE >> 45))) + +/* Subtype from inline outbound error event */ +#define CNXK_ETHDEV_SEC_OUTB_EV_SUB 0xFFUL + +/* SPI will be in 20 bits of tag */ +#define CNXK_ETHDEV_SPI_TAG_MASK 0xFFFFFUL + +#define CNXK_NIX_PFC_CHAN_COUNT 16 + +#define CNXK_TM_MARK_VLAN_DEI BIT_ULL(0) +#define CNXK_TM_MARK_IP_DSCP BIT_ULL(1) +#define CNXK_TM_MARK_IP_ECN BIT_ULL(2) + +#define CNXK_TM_MARK_MASK \ + (CNXK_TM_MARK_VLAN_DEI | CNXK_TM_MARK_IP_DSCP | CNXK_TM_MARK_IP_ECN) + +#define CNXK_TX_MARK_FMT_MASK (0xFFFFFFFFFFFFull) + +struct cnxk_eth_txq_comp { + uintptr_t desc_base; + uintptr_t cq_door; + int64_t *cq_status; + uint64_t wdata; + uint32_t head; + uint32_t qmask; + uint32_t nb_desc_mask; + uint32_t available; + uint32_t sqe_id; + bool ena; + struct rte_mbuf **ptr; + rte_spinlock_t ext_buf_lock; +}; + +struct cnxk_timesync_info { + uint8_t rx_ready; + uint64_t rx_tstamp; + uint64_t rx_tstamp_dynflag; + int tstamp_dynfield_offset; + rte_iova_t tx_tstamp_iova; + uint64_t *tx_tstamp; +} __plt_cache_aligned; + +/* Inlines */ +static __rte_always_inline uint64_t +cnxk_pktmbuf_detach(struct rte_mbuf *m) +{ + struct rte_mempool *mp = m->pool; + uint32_t mbuf_size, buf_len; + struct rte_mbuf *md; + uint16_t priv_size; + uint16_t refcount; + + /* Update refcount of direct mbuf */ + md = rte_mbuf_from_indirect(m); + refcount = rte_mbuf_refcnt_update(md, -1); + + priv_size = rte_pktmbuf_priv_size(mp); + mbuf_size = (uint32_t)(sizeof(struct rte_mbuf) + priv_size); + buf_len = rte_pktmbuf_data_room_size(mp); + + m->priv_size = priv_size; + m->buf_addr = (char *)m + mbuf_size; + rte_mbuf_iova_set(m, rte_mempool_virt2iova(m) + mbuf_size); + m->buf_len = (uint16_t)buf_len; + rte_pktmbuf_reset_headroom(m); + m->data_len = 0; + m->ol_flags = 0; + m->next = NULL; + m->nb_segs = 1; + + /* Now indirect mbuf is safe to free */ + rte_pktmbuf_free(m); + + if (refcount == 0) { + rte_mbuf_refcnt_set(md, 1); + md->data_len = 0; + md->ol_flags = 0; + md->next = NULL; + md->nb_segs = 1; + return 0; + } else { + return 1; + } +} + +static __rte_always_inline uint64_t +cnxk_nix_prefree_seg(struct rte_mbuf *m) +{ + if (likely(rte_mbuf_refcnt_read(m) == 1)) { + if (!RTE_MBUF_DIRECT(m)) + return cnxk_pktmbuf_detach(m); + + m->next = NULL; + m->nb_segs = 1; + return 0; + } else if (rte_mbuf_refcnt_update(m, -1) == 0) { + if (!RTE_MBUF_DIRECT(m)) + return cnxk_pktmbuf_detach(m); + + rte_mbuf_refcnt_set(m, 1); + m->next = NULL; + m->nb_segs = 1; + return 0; + } + + /* Mbuf is having refcount more than 1 so need not to be freed */ + return 1; +} + +static inline rte_mbuf_timestamp_t * +cnxk_nix_timestamp_dynfield(struct rte_mbuf *mbuf, + struct cnxk_timesync_info *info) +{ + return RTE_MBUF_DYNFIELD(mbuf, info->tstamp_dynfield_offset, + rte_mbuf_timestamp_t *); +} + +static __rte_always_inline uintptr_t +cnxk_nix_sa_base_get(uint16_t port, const void *lookup_mem) +{ + uintptr_t sa_base_tbl; + + sa_base_tbl = (uintptr_t)lookup_mem; + sa_base_tbl += PTYPE_ARRAY_SZ + ERR_ARRAY_SZ; + return *((const uintptr_t *)sa_base_tbl + port); +} + +#endif /* __CNXK_ETHDEV_DP_H__ */ diff --git a/drivers/net/cnxk/rx/cn10k/rx_0_15.c b/drivers/net/cnxk/rx/cn10k/rx_0_15.c index 5087bad1b0..4447f4760b 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_0_15.c +++ b/drivers/net/cnxk/rx/cn10k/rx_0_15.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_##name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_reas_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_0_15_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_0_15_mseg.c index 1db51c0b2b..7fcdc99f6f 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_0_15_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_0_15_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_mseg_##name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_reas_mseg_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_0_15_vec.c b/drivers/net/cnxk/rx/cn10k/rx_0_15_vec.c index 17a7bbdfe4..c018aff2a7 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_0_15_vec.c +++ b/drivers/net/cnxk/rx/cn10k/rx_0_15_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_vec_##name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_reas_vec_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_0_15_vec_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_0_15_vec_mseg.c index c795c5a0c3..093885ef67 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_0_15_vec_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_0_15_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_vec_mseg_##name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_reas_vec_mseg_##name, \ diff --git a/drivers/net/cnxk/rx/cn10k/rx_112_127.c b/drivers/net/cnxk/rx/cn10k/rx_112_127.c index 3298313c3f..5b060dc499 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_112_127.c +++ b/drivers/net/cnxk/rx/cn10k/rx_112_127.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_##name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_reas_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_112_127_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_112_127_mseg.c index 1c4528436a..af2eb0944a 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_112_127_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_112_127_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_mseg_##name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_reas_mseg_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_112_127_vec.c b/drivers/net/cnxk/rx/cn10k/rx_112_127_vec.c index 8943cc6ea5..b451d33d59 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_112_127_vec.c +++ b/drivers/net/cnxk/rx/cn10k/rx_112_127_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_vec_##name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_reas_vec_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_112_127_vec_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_112_127_vec_mseg.c index cd16537dd7..961cf7547b 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_112_127_vec_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_112_127_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_vec_mseg_##name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_reas_vec_mseg_##name, \ diff --git a/drivers/net/cnxk/rx/cn10k/rx_16_31.c b/drivers/net/cnxk/rx/cn10k/rx_16_31.c index c65e170712..59ca07f619 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_16_31.c +++ b/drivers/net/cnxk/rx/cn10k/rx_16_31.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_##name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_reas_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_16_31_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_16_31_mseg.c index 8f2c9d1732..4a11d3907c 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_16_31_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_16_31_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_mseg_##name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_reas_mseg_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_16_31_vec.c b/drivers/net/cnxk/rx/cn10k/rx_16_31_vec.c index 809d288fdb..d2f5304ff3 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_16_31_vec.c +++ b/drivers/net/cnxk/rx/cn10k/rx_16_31_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_vec_##name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_reas_vec_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_16_31_vec_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_16_31_vec_mseg.c index d30608a0fd..274665fdc7 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_16_31_vec_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_16_31_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_vec_mseg_##name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_reas_vec_mseg_##name, \ diff --git a/drivers/net/cnxk/rx/cn10k/rx_32_47.c b/drivers/net/cnxk/rx/cn10k/rx_32_47.c index fdc0fdabaa..e6458bef89 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_32_47.c +++ b/drivers/net/cnxk/rx/cn10k/rx_32_47.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_##name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_reas_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_32_47_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_32_47_mseg.c index 9837bc6a66..0b2ce03b65 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_32_47_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_32_47_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_mseg_##name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_reas_mseg_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_32_47_vec.c b/drivers/net/cnxk/rx/cn10k/rx_32_47_vec.c index 27436ca35d..fd7b43840b 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_32_47_vec.c +++ b/drivers/net/cnxk/rx/cn10k/rx_32_47_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_vec_##name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_reas_vec_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_32_47_vec_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_32_47_vec_mseg.c index f324de9f8c..d1527224e4 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_32_47_vec_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_32_47_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_vec_mseg_##name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_reas_vec_mseg_##name, \ diff --git a/drivers/net/cnxk/rx/cn10k/rx_48_63.c b/drivers/net/cnxk/rx/cn10k/rx_48_63.c index 73fc2f9e90..610d14a25f 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_48_63.c +++ b/drivers/net/cnxk/rx/cn10k/rx_48_63.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_##name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_reas_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_48_63_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_48_63_mseg.c index 51d31a734a..6d709cdf8b 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_48_63_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_48_63_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_mseg_##name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_reas_mseg_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_48_63_vec.c b/drivers/net/cnxk/rx/cn10k/rx_48_63_vec.c index a9b7627c96..4006550699 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_48_63_vec.c +++ b/drivers/net/cnxk/rx/cn10k/rx_48_63_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_vec_##name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_reas_vec_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_48_63_vec_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_48_63_vec_mseg.c index 0088acbdce..61158ad0ca 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_48_63_vec_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_48_63_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_vec_mseg_##name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_reas_vec_mseg_##name, \ diff --git a/drivers/net/cnxk/rx/cn10k/rx_64_79.c b/drivers/net/cnxk/rx/cn10k/rx_64_79.c index fc65d8ec23..e374c9fbc0 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_64_79.c +++ b/drivers/net/cnxk/rx/cn10k/rx_64_79.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_##name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_reas_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_64_79_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_64_79_mseg.c index 5670f6a6ab..e3d06aaf27 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_64_79_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_64_79_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_mseg_##name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_reas_mseg_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_64_79_vec.c b/drivers/net/cnxk/rx/cn10k/rx_64_79_vec.c index 1911feff5c..6045c227fb 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_64_79_vec.c +++ b/drivers/net/cnxk/rx/cn10k/rx_64_79_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_vec_##name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_reas_vec_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_64_79_vec_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_64_79_vec_mseg.c index 8302f415a1..6101be67b9 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_64_79_vec_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_64_79_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_vec_mseg_##name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_reas_vec_mseg_##name, \ diff --git a/drivers/net/cnxk/rx/cn10k/rx_80_95.c b/drivers/net/cnxk/rx/cn10k/rx_80_95.c index 5d507a4f72..4b8984ccb9 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_80_95.c +++ b/drivers/net/cnxk/rx/cn10k/rx_80_95.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_##name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_reas_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_80_95_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_80_95_mseg.c index 91456ecad5..cb271c0afc 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_80_95_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_80_95_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_mseg_##name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_reas_mseg_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_80_95_vec.c b/drivers/net/cnxk/rx/cn10k/rx_80_95_vec.c index 407f7ca076..146cea33da 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_80_95_vec.c +++ b/drivers/net/cnxk/rx/cn10k/rx_80_95_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_vec_##name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_reas_vec_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_80_95_vec_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_80_95_vec_mseg.c index c2d4a3df63..bc51fc6c9c 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_80_95_vec_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_80_95_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_vec_mseg_##name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_reas_vec_mseg_##name, \ diff --git a/drivers/net/cnxk/rx/cn10k/rx_96_111.c b/drivers/net/cnxk/rx/cn10k/rx_96_111.c index 1075734360..09f6efb95d 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_96_111.c +++ b/drivers/net/cnxk/rx/cn10k/rx_96_111.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_##name, flags) \ NIX_RX_RECV(cn10k_nix_recv_pkts_reas_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_96_111_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_96_111_mseg.c index 4040a3ec1f..085e2787ac 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_96_111_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_96_111_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_mseg_##name, flags) \ NIX_RX_RECV_MSEG(cn10k_nix_recv_pkts_reas_mseg_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_96_111_vec.c b/drivers/net/cnxk/rx/cn10k/rx_96_111_vec.c index 24e888dc86..0f4e117baf 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_96_111_vec.c +++ b/drivers/net/cnxk/rx/cn10k/rx_96_111_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_vec_##name, flags) \ NIX_RX_RECV_VEC(cn10k_nix_recv_pkts_reas_vec_##name, flags | NIX_RX_REAS_F) diff --git a/drivers/net/cnxk/rx/cn10k/rx_96_111_vec_mseg.c b/drivers/net/cnxk/rx/cn10k/rx_96_111_vec_mseg.c index 8ff7e419bb..37f7f61341 100644 --- a/drivers/net/cnxk/rx/cn10k/rx_96_111_vec_mseg.c +++ b/drivers/net/cnxk/rx/cn10k/rx_96_111_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_rx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define R(name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_vec_mseg_##name, flags) \ NIX_RX_RECV_VEC_MSEG(cn10k_nix_recv_pkts_reas_vec_mseg_##name, \ diff --git a/drivers/net/cnxk/tx/cn10k/tx_0_15.c b/drivers/net/cnxk/tx/cn10k/tx_0_15.c index d2f6288878..c4495baea5 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_0_15.c +++ b/drivers/net/cnxk/tx/cn10k/tx_0_15.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) NIX_TX_XMIT(cn10k_nix_xmit_pkts_##name, sz, flags) NIX_TX_FASTPATH_MODES_0_15 diff --git a/drivers/net/cnxk/tx/cn10k/tx_0_15_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_0_15_mseg.c index 17f53f4008..ce7f59b24b 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_0_15_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_0_15_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_MSEG(cn10k_nix_xmit_pkts_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_0_15_vec.c b/drivers/net/cnxk/tx/cn10k/tx_0_15_vec.c index 4d3936ddcc..dffc40974e 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_0_15_vec.c +++ b/drivers/net/cnxk/tx/cn10k/tx_0_15_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC(cn10k_nix_xmit_pkts_vec_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_0_15_vec_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_0_15_vec_mseg.c index 032d2190c1..d0e8042815 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_0_15_vec_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_0_15_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC_MSEG(cn10k_nix_xmit_pkts_vec_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_112_127.c b/drivers/net/cnxk/tx/cn10k/tx_112_127.c index 0cf2d3553e..81fd139fc6 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_112_127.c +++ b/drivers/net/cnxk/tx/cn10k/tx_112_127.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) NIX_TX_XMIT(cn10k_nix_xmit_pkts_##name, sz, flags) NIX_TX_FASTPATH_MODES_112_127 diff --git a/drivers/net/cnxk/tx/cn10k/tx_112_127_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_112_127_mseg.c index 08b7809af6..9129c5c330 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_112_127_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_112_127_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_MSEG(cn10k_nix_xmit_pkts_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_112_127_vec.c b/drivers/net/cnxk/tx/cn10k/tx_112_127_vec.c index 9e2f1d7db3..df6e9ed680 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_112_127_vec.c +++ b/drivers/net/cnxk/tx/cn10k/tx_112_127_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC(cn10k_nix_xmit_pkts_vec_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_112_127_vec_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_112_127_vec_mseg.c index 9797de238f..c144e71232 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_112_127_vec_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_112_127_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC_MSEG(cn10k_nix_xmit_pkts_vec_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_16_31.c b/drivers/net/cnxk/tx/cn10k/tx_16_31.c index bf243c6855..41e77c48e7 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_16_31.c +++ b/drivers/net/cnxk/tx/cn10k/tx_16_31.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) NIX_TX_XMIT(cn10k_nix_xmit_pkts_##name, sz, flags) NIX_TX_FASTPATH_MODES_16_31 diff --git a/drivers/net/cnxk/tx/cn10k/tx_16_31_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_16_31_mseg.c index dde27f0944..527b009c4b 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_16_31_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_16_31_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_MSEG(cn10k_nix_xmit_pkts_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_16_31_vec.c b/drivers/net/cnxk/tx/cn10k/tx_16_31_vec.c index cae2ab8af5..36eca00f1d 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_16_31_vec.c +++ b/drivers/net/cnxk/tx/cn10k/tx_16_31_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC(cn10k_nix_xmit_pkts_vec_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_16_31_vec_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_16_31_vec_mseg.c index 0b5d9e47d1..8bd3311de6 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_16_31_vec_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_16_31_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC_MSEG(cn10k_nix_xmit_pkts_vec_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_32_47.c b/drivers/net/cnxk/tx/cn10k/tx_32_47.c index dde45c024e..7dcd9a4fb7 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_32_47.c +++ b/drivers/net/cnxk/tx/cn10k/tx_32_47.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) NIX_TX_XMIT(cn10k_nix_xmit_pkts_##name, sz, flags) NIX_TX_FASTPATH_MODES_32_47 diff --git a/drivers/net/cnxk/tx/cn10k/tx_32_47_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_32_47_mseg.c index 257c392f27..987667951f 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_32_47_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_32_47_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_MSEG(cn10k_nix_xmit_pkts_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_32_47_vec.c b/drivers/net/cnxk/tx/cn10k/tx_32_47_vec.c index 7a833022f7..e5edce2f0c 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_32_47_vec.c +++ b/drivers/net/cnxk/tx/cn10k/tx_32_47_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC(cn10k_nix_xmit_pkts_vec_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_32_47_vec_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_32_47_vec_mseg.c index c66edbc211..e9f940ddb1 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_32_47_vec_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_32_47_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC_MSEG(cn10k_nix_xmit_pkts_vec_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_48_63.c b/drivers/net/cnxk/tx/cn10k/tx_48_63.c index a42bac3fca..7bc735bd80 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_48_63.c +++ b/drivers/net/cnxk/tx/cn10k/tx_48_63.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) NIX_TX_XMIT(cn10k_nix_xmit_pkts_##name, sz, flags) NIX_TX_FASTPATH_MODES_48_63 diff --git a/drivers/net/cnxk/tx/cn10k/tx_48_63_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_48_63_mseg.c index 9aece25db7..6a1d0a3e69 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_48_63_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_48_63_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_MSEG(cn10k_nix_xmit_pkts_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_48_63_vec.c b/drivers/net/cnxk/tx/cn10k/tx_48_63_vec.c index 1b854e5d87..95e5a1663b 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_48_63_vec.c +++ b/drivers/net/cnxk/tx/cn10k/tx_48_63_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC(cn10k_nix_xmit_pkts_vec_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_48_63_vec_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_48_63_vec_mseg.c index 18389c309f..d46587b5b0 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_48_63_vec_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_48_63_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC_MSEG(cn10k_nix_xmit_pkts_vec_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_64_79.c b/drivers/net/cnxk/tx/cn10k/tx_64_79.c index 9638ec04e8..0819c770c0 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_64_79.c +++ b/drivers/net/cnxk/tx/cn10k/tx_64_79.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) NIX_TX_XMIT(cn10k_nix_xmit_pkts_##name, sz, flags) NIX_TX_FASTPATH_MODES_64_79 diff --git a/drivers/net/cnxk/tx/cn10k/tx_64_79_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_64_79_mseg.c index e002c72d58..45af7e8687 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_64_79_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_64_79_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_MSEG(cn10k_nix_xmit_pkts_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_64_79_vec.c b/drivers/net/cnxk/tx/cn10k/tx_64_79_vec.c index 762ff4da49..8247564779 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_64_79_vec.c +++ b/drivers/net/cnxk/tx/cn10k/tx_64_79_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC(cn10k_nix_xmit_pkts_vec_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_64_79_vec_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_64_79_vec_mseg.c index 794cbe8650..58426c976a 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_64_79_vec_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_64_79_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC_MSEG(cn10k_nix_xmit_pkts_vec_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_80_95.c b/drivers/net/cnxk/tx/cn10k/tx_80_95.c index a4cdf3bb18..d690633724 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_80_95.c +++ b/drivers/net/cnxk/tx/cn10k/tx_80_95.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) NIX_TX_XMIT(cn10k_nix_xmit_pkts_##name, sz, flags) NIX_TX_FASTPATH_MODES_80_95 diff --git a/drivers/net/cnxk/tx/cn10k/tx_80_95_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_80_95_mseg.c index 114e90b1f9..5b01eded11 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_80_95_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_80_95_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_MSEG(cn10k_nix_xmit_pkts_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_80_95_vec.c b/drivers/net/cnxk/tx/cn10k/tx_80_95_vec.c index c9bb93b4c6..0f6545a33e 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_80_95_vec.c +++ b/drivers/net/cnxk/tx/cn10k/tx_80_95_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC(cn10k_nix_xmit_pkts_vec_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_80_95_vec_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_80_95_vec_mseg.c index c0c7c02a27..ad1f0ce4df 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_80_95_vec_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_80_95_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC_MSEG(cn10k_nix_xmit_pkts_vec_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_96_111.c b/drivers/net/cnxk/tx/cn10k/tx_96_111.c index 3244322164..2688e502e2 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_96_111.c +++ b/drivers/net/cnxk/tx/cn10k/tx_96_111.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) NIX_TX_XMIT(cn10k_nix_xmit_pkts_##name, sz, flags) NIX_TX_FASTPATH_MODES_96_111 diff --git a/drivers/net/cnxk/tx/cn10k/tx_96_111_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_96_111_mseg.c index cc8182da2d..c18b4ba7da 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_96_111_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_96_111_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_MSEG(cn10k_nix_xmit_pkts_mseg_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_96_111_vec.c b/drivers/net/cnxk/tx/cn10k/tx_96_111_vec.c index 422d2e4e1c..94ffcb74a8 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_96_111_vec.c +++ b/drivers/net/cnxk/tx/cn10k/tx_96_111_vec.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC(cn10k_nix_xmit_pkts_vec_##name, sz, flags) diff --git a/drivers/net/cnxk/tx/cn10k/tx_96_111_vec_mseg.c b/drivers/net/cnxk/tx/cn10k/tx_96_111_vec_mseg.c index dbefae02e0..ad1d124968 100644 --- a/drivers/net/cnxk/tx/cn10k/tx_96_111_vec_mseg.c +++ b/drivers/net/cnxk/tx/cn10k/tx_96_111_vec_mseg.c @@ -2,9 +2,12 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_ethdev.h" #include "cn10k_tx.h" +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif + #define T(name, sz, flags) \ NIX_TX_XMIT_VEC_MSEG(cn10k_nix_xmit_pkts_vec_mseg_##name, sz, flags) From patchwork Wed Jan 25 11:31:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 122520 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2A0F742485; Wed, 25 Jan 2023 12:32:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 183A342D8B; Wed, 25 Jan 2023 12:32:17 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 23CB342D89 for ; Wed, 25 Jan 2023 12:32:14 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30PBQ9Em019625 for ; Wed, 25 Jan 2023 03:32:14 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=+30S7ZA6WN42cd7Qf673G4vNXXfUlO1z+uk+Uzf6edE=; b=iZlP8vjufImrnhOnsXjyrOHeHwPn7Oo/4nNh/WeG+2sI1vo39+H2/gqPaxO/E/T+ogQz LjmgzoQZtZis9+MoCMY4OJKhOB1elIEj3ZbG5ntNhkl53FG1D+FXc/BNQuEi3TkhCbAg czAzj3FIqqQHf7ne3oHgavfoZX1q4Y2V8200CTot4xgwziFazX+S9TCQ/FYQD98IxsX8 +cwuBnvkObSBXnD8IWv72nEwZ29OLGmJxHnDJ3jgHu4QuNwCYiq9L075fgjx3uZoavIN Dq/MxlEvZMafJk20lU2ti6tYILunYWhSv8Le/qt6hQOtyRtA1mrQP+f6MCIdGxj8BT1L VA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3nb0hp8j2f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 25 Jan 2023 03:32:13 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 25 Jan 2023 03:32:06 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 25 Jan 2023 03:32:06 -0800 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 0AD6E3F7088; Wed, 25 Jan 2023 03:32:02 -0800 (PST) From: Rahul Bhansali To: , Ankur Dwivedi , Anoob Joseph , Tejasree Kondoj , "Pavan Nikhilesh" , Shijith Thotton CC: , Rahul Bhansali Subject: [PATCH v3 4/4] event/cnxk: restructure for cn10k datapath Date: Wed, 25 Jan 2023 17:01:26 +0530 Message-ID: <20230125113126.2860273-4-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125113126.2860273-1-rbhansali@marvell.com> References: <20221221091549.967801-1-rbhansali@marvell.com> <20230125113126.2860273-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: il1e-5pgnrgOa3XAYd_Xu_7j8hxrPfjl X-Proofpoint-GUID: il1e-5pgnrgOa3XAYd_Xu_7j8hxrPfjl X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-25_06,2023-01-25_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Restructure for separate cn10k datapath functionality to reduce recompilation time in case of any changes in control path. New *_dp.h files are created to have macros, functions as required for datapath with minimal dependency on roc changes. Separates Tx and Rx datapath files to save recompilation time for independent changes. In case of Roc changes independent to datapath, the overall recompilation time is reduced from ~6 mins to ~17 secs. Signed-off-by: Rahul Bhansali --- Changes in v3: Reorder patch in series for compilation fix. Changes in v2: No changes. .../crypto/cnxk/cn10k_cryptodev_event_dp.h | 13 + drivers/crypto/cnxk/cn10k_cryptodev_ops.c | 2 + drivers/crypto/cnxk/cn10k_cryptodev_ops.h | 4 - drivers/event/cnxk/cn10k_eventdev.c | 3 + drivers/event/cnxk/cn10k_eventdev.h | 28 ++ drivers/event/cnxk/cn10k_tx_worker.h | 254 ++++++++++++++ drivers/event/cnxk/cn10k_worker.c | 71 ++++ drivers/event/cnxk/cn10k_worker.h | 327 +----------------- drivers/event/cnxk/cnxk_eventdev.c | 1 + drivers/event/cnxk/cnxk_eventdev.h | 44 +-- drivers/event/cnxk/cnxk_eventdev_dp.h | 33 ++ drivers/event/cnxk/cnxk_eventdev_selftest.c | 1 + drivers/event/cnxk/cnxk_eventdev_stats.c | 1 + drivers/event/cnxk/cnxk_worker.h | 3 +- drivers/event/cnxk/deq/cn10k/deq_0_15.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c | 6 +- .../event/cnxk/deq/cn10k/deq_0_15_ca_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_0_15_ca_seg.c | 6 +- .../cnxk/deq/cn10k/deq_0_15_ca_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_0_15_ca_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_0_15_ca_tmo_seg.c | 6 +- .../deq/cn10k/deq_0_15_ca_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c | 6 +- .../event/cnxk/deq/cn10k/deq_0_15_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c | 6 +- .../event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c | 6 +- .../cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_112_127.c | 6 +- .../event/cnxk/deq/cn10k/deq_112_127_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c | 6 +- .../cnxk/deq/cn10k/deq_112_127_ca_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_112_127_ca_seg.c | 6 +- .../cnxk/deq/cn10k/deq_112_127_ca_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_112_127_ca_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_112_127_ca_tmo_seg.c | 6 +- .../deq/cn10k/deq_112_127_ca_tmo_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_112_127_dual.c | 6 +- .../event/cnxk/deq/cn10k/deq_112_127_seg.c | 6 +- .../cnxk/deq/cn10k/deq_112_127_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_112_127_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_112_127_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_112_127_tmo_seg.c | 6 +- .../deq/cn10k/deq_112_127_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_16_31.c | 6 +- .../event/cnxk/deq/cn10k/deq_16_31_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c | 6 +- .../event/cnxk/deq/cn10k/deq_16_31_ca_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_16_31_ca_seg.c | 6 +- .../cnxk/deq/cn10k/deq_16_31_ca_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_16_31_ca_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_16_31_ca_tmo_seg.c | 6 +- .../deq/cn10k/deq_16_31_ca_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c | 6 +- .../cnxk/deq/cn10k/deq_16_31_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_16_31_tmo_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c | 6 +- .../cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_32_47.c | 6 +- .../event/cnxk/deq/cn10k/deq_32_47_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c | 6 +- .../event/cnxk/deq/cn10k/deq_32_47_ca_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_32_47_ca_seg.c | 6 +- .../cnxk/deq/cn10k/deq_32_47_ca_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_32_47_ca_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_32_47_ca_tmo_seg.c | 6 +- .../deq/cn10k/deq_32_47_ca_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c | 6 +- .../cnxk/deq/cn10k/deq_32_47_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_32_47_tmo_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c | 6 +- .../cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_48_63.c | 6 +- .../event/cnxk/deq/cn10k/deq_48_63_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c | 6 +- .../event/cnxk/deq/cn10k/deq_48_63_ca_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_48_63_ca_seg.c | 6 +- .../cnxk/deq/cn10k/deq_48_63_ca_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_48_63_ca_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_48_63_ca_tmo_seg.c | 6 +- .../deq/cn10k/deq_48_63_ca_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c | 6 +- .../cnxk/deq/cn10k/deq_48_63_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_48_63_tmo_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c | 6 +- .../cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_64_79.c | 6 +- .../event/cnxk/deq/cn10k/deq_64_79_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c | 6 +- .../event/cnxk/deq/cn10k/deq_64_79_ca_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_64_79_ca_seg.c | 6 +- .../cnxk/deq/cn10k/deq_64_79_ca_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_64_79_ca_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_64_79_ca_tmo_seg.c | 6 +- .../deq/cn10k/deq_64_79_ca_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c | 6 +- .../cnxk/deq/cn10k/deq_64_79_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_64_79_tmo_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c | 6 +- .../cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_80_95.c | 6 +- .../event/cnxk/deq/cn10k/deq_80_95_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c | 6 +- .../event/cnxk/deq/cn10k/deq_80_95_ca_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_80_95_ca_seg.c | 6 +- .../cnxk/deq/cn10k/deq_80_95_ca_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_80_95_ca_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_80_95_ca_tmo_seg.c | 6 +- .../deq/cn10k/deq_80_95_ca_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c | 6 +- .../cnxk/deq/cn10k/deq_80_95_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_80_95_tmo_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c | 6 +- .../cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_96_111.c | 6 +- .../event/cnxk/deq/cn10k/deq_96_111_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c | 6 +- .../cnxk/deq/cn10k/deq_96_111_ca_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_96_111_ca_seg.c | 6 +- .../cnxk/deq/cn10k/deq_96_111_ca_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_96_111_ca_tmo_burst.c | 6 +- .../cnxk/deq/cn10k/deq_96_111_ca_tmo_seg.c | 6 +- .../deq/cn10k/deq_96_111_ca_tmo_seg_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_96_111_dual.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c | 6 +- .../cnxk/deq/cn10k/deq_96_111_seg_burst.c | 6 +- drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c | 6 +- .../cnxk/deq/cn10k/deq_96_111_tmo_burst.c | 6 +- .../event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c | 6 +- .../cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_0_15.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_112_127.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_16_31.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_32_47.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_48_63.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_64_79.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_80_95.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_96_111.c | 6 +- drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c | 6 +- 166 files changed, 1039 insertions(+), 658 deletions(-) create mode 100644 drivers/crypto/cnxk/cn10k_cryptodev_event_dp.h create mode 100644 drivers/event/cnxk/cn10k_eventdev.h create mode 100644 drivers/event/cnxk/cn10k_tx_worker.h create mode 100644 drivers/event/cnxk/cnxk_eventdev_dp.h -- 2.25.1 diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_event_dp.h b/drivers/crypto/cnxk/cn10k_cryptodev_event_dp.h new file mode 100644 index 0000000000..a4be9f2890 --- /dev/null +++ b/drivers/crypto/cnxk/cn10k_cryptodev_event_dp.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ + +#ifndef _CN10K_CRYPTODEV_EVENT_DP_H_ +#define _CN10K_CRYPTODEV_EVENT_DP_H_ + +__rte_internal +uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1); +__rte_internal +uintptr_t cn10k_cpt_crypto_adapter_vector_dequeue(uintptr_t get_work1); + +#endif /* _CN10K_CRYPTODEV_EVENT_DP_H_ */ diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c index ef0a4ea05a..06b42c215d 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.c @@ -18,6 +18,8 @@ #include "cn10k_cryptodev.h" #include "cn10k_cryptodev_ops.h" +#include "cn10k_cryptodev_event_dp.h" +#include "cn10k_eventdev.h" #include "cn10k_ipsec.h" #include "cn10k_ipsec_la_ops.h" #include "cnxk_ae.h" diff --git a/drivers/crypto/cnxk/cn10k_cryptodev_ops.h b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h index 43a1314138..befbfcdfad 100644 --- a/drivers/crypto/cnxk/cn10k_cryptodev_ops.h +++ b/drivers/crypto/cnxk/cn10k_cryptodev_ops.h @@ -22,9 +22,5 @@ uint16_t __rte_hot cn10k_cpt_sg_ver1_crypto_adapter_enqueue(void *ws, struct rte __rte_internal uint16_t __rte_hot cn10k_cpt_sg_ver2_crypto_adapter_enqueue(void *ws, struct rte_event ev[], uint16_t nb_events); -__rte_internal -uintptr_t cn10k_cpt_crypto_adapter_dequeue(uintptr_t get_work1); -__rte_internal -uintptr_t cn10k_cpt_crypto_adapter_vector_dequeue(uintptr_t get_work1); #endif /* _CN10K_CRYPTODEV_OPS_H_ */ diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c index 30c922b5fc..2921d51a1a 100644 --- a/drivers/event/cnxk/cn10k_eventdev.c +++ b/drivers/event/cnxk/cn10k_eventdev.c @@ -2,7 +2,10 @@ * Copyright(C) 2021 Marvell. */ +#include "cn10k_tx_worker.h" #include "cn10k_worker.h" +#include "cn10k_ethdev.h" +#include "cn10k_cryptodev_ops.h" #include "cnxk_eventdev.h" #include "cnxk_worker.h" diff --git a/drivers/event/cnxk/cn10k_eventdev.h b/drivers/event/cnxk/cn10k_eventdev.h new file mode 100644 index 0000000000..5fb6f0a6f2 --- /dev/null +++ b/drivers/event/cnxk/cn10k_eventdev.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ + +#ifndef __CN10K_EVENTDEV_H__ +#define __CN10K_EVENTDEV_H__ + +struct cn10k_sso_hws { + uint64_t base; + uint64_t gw_rdata; + void *lookup_mem; + uint32_t gw_wdata; + uint8_t swtag_req; + uint8_t hws_id; + /* PTP timestamp */ + struct cnxk_timesync_info **tstamp; + uint64_t meta_aura; + /* Add Work Fastpath data */ + uint64_t xaq_lmt __rte_cache_aligned; + uint64_t *fc_mem; + uintptr_t grp_base; + /* Tx Fastpath data */ + uintptr_t lmt_base __rte_cache_aligned; + uint64_t lso_tun_fmt; + uint8_t tx_adptr_data[]; +} __rte_cache_aligned; + +#endif /* __CN10K_EVENTDEV_H__ */ diff --git a/drivers/event/cnxk/cn10k_tx_worker.h b/drivers/event/cnxk/cn10k_tx_worker.h new file mode 100644 index 0000000000..c18786a14c --- /dev/null +++ b/drivers/event/cnxk/cn10k_tx_worker.h @@ -0,0 +1,254 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ + +#ifndef __CN10K_TX_WORKER_H__ +#define __CN10K_TX_WORKER_H__ + +#include "cn10k_tx.h" +#include "cn10k_eventdev.h" +#include "cnxk_eventdev_dp.h" +#include + +/* CN10K Tx event fastpath */ + +static __rte_always_inline struct cn10k_eth_txq * +cn10k_sso_hws_xtract_meta(struct rte_mbuf *m, const uint64_t *txq_data) +{ + return (struct cn10k_eth_txq + *)(txq_data[(txq_data[m->port] >> 48) + + rte_event_eth_tx_adapter_txq_get(m)] & + (BIT_ULL(48) - 1)); +} + +static __rte_always_inline void +cn10k_sso_txq_fc_wait(const struct cn10k_eth_txq *txq) +{ + while ((uint64_t)txq->nb_sqb_bufs_adj <= + __atomic_load_n(txq->fc_mem, __ATOMIC_RELAXED)) + ; +} + +static __rte_always_inline int32_t +cn10k_sso_sq_depth(const struct cn10k_eth_txq *txq) +{ + return (txq->nb_sqb_bufs_adj - + __atomic_load_n((int16_t *)txq->fc_mem, __ATOMIC_RELAXED)) + << txq->sqes_per_sqb_log2; +} + +static __rte_always_inline uint16_t +cn10k_sso_tx_one(struct cn10k_sso_hws *ws, struct rte_mbuf *m, uint64_t *cmd, + uint16_t lmt_id, uintptr_t lmt_addr, uint8_t sched_type, + const uint64_t *txq_data, const uint32_t flags) +{ + uint8_t lnum = 0, loff = 0, shft = 0; + uint16_t ref_cnt = m->refcnt; + struct cn10k_eth_txq *txq; + uintptr_t laddr; + uint16_t segdw; + uintptr_t pa; + bool sec; + + txq = cn10k_sso_hws_xtract_meta(m, txq_data); + if (cn10k_sso_sq_depth(txq) <= 0) + return 0; + + if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F && txq->tx_compl.ena) + handle_tx_completion_pkts(txq, 1, 1); + + cn10k_nix_tx_skeleton(txq, cmd, flags, 0); + /* Perform header writes before barrier + * for TSO + */ + if (flags & NIX_TX_OFFLOAD_TSO_F) + cn10k_nix_xmit_prepare_tso(m, flags); + + cn10k_nix_xmit_prepare(txq, m, cmd, flags, txq->lso_tun_fmt, &sec, + txq->mark_flag, txq->mark_fmt); + + laddr = lmt_addr; + /* Prepare CPT instruction and get nixtx addr if + * it is for CPT on same lmtline. + */ + if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec) + cn10k_nix_prep_sec(m, cmd, &laddr, lmt_addr, &lnum, &loff, + &shft, txq->sa_base, flags); + + /* Move NIX desc to LMT/NIXTX area */ + cn10k_nix_xmit_mv_lmt_base(laddr, cmd, flags); + + if (flags & NIX_TX_MULTI_SEG_F) + segdw = cn10k_nix_prepare_mseg(txq, m, (uint64_t *)laddr, flags); + else + segdw = cn10k_nix_tx_ext_subs(flags) + 2; + + cn10k_nix_xmit_prepare_tstamp(txq, laddr, m->ol_flags, segdw, flags); + if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec) + pa = txq->cpt_io_addr | 3 << 4; + else + pa = txq->io_addr | ((segdw - 1) << 4); + + if (!CNXK_TAG_IS_HEAD(ws->gw_rdata) && !sched_type) + ws->gw_rdata = roc_sso_hws_head_wait(ws->base); + + cn10k_sso_txq_fc_wait(txq); + if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec) + cn10k_nix_sec_fc_wait_one(txq); + + roc_lmt_submit_steorl(lmt_id, pa); + + if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { + if (ref_cnt > 1) + rte_io_wmb(); + } + return 1; +} + +static __rte_always_inline uint16_t +cn10k_sso_vwqe_split_tx(struct cn10k_sso_hws *ws, struct rte_mbuf **mbufs, + uint16_t nb_mbufs, uint64_t *cmd, + const uint64_t *txq_data, const uint32_t flags) +{ + uint16_t count = 0, port, queue, ret = 0, last_idx = 0; + struct cn10k_eth_txq *txq; + int32_t space; + int i; + + port = mbufs[0]->port; + queue = rte_event_eth_tx_adapter_txq_get(mbufs[0]); + for (i = 0; i < nb_mbufs; i++) { + if (port != mbufs[i]->port || + queue != rte_event_eth_tx_adapter_txq_get(mbufs[i])) { + if (count) { + txq = (struct cn10k_eth_txq + *)(txq_data[(txq_data[port] >> + 48) + + queue] & + (BIT_ULL(48) - 1)); + /* Transmit based on queue depth */ + space = cn10k_sso_sq_depth(txq); + if (space < count) + goto done; + cn10k_nix_xmit_pkts_vector( + txq, (uint64_t *)ws, &mbufs[last_idx], + count, cmd, flags | NIX_TX_VWQE_F); + ret += count; + count = 0; + } + port = mbufs[i]->port; + queue = rte_event_eth_tx_adapter_txq_get(mbufs[i]); + last_idx = i; + } + count++; + } + if (count) { + txq = (struct cn10k_eth_txq + *)(txq_data[(txq_data[port] >> 48) + queue] & + (BIT_ULL(48) - 1)); + /* Transmit based on queue depth */ + space = cn10k_sso_sq_depth(txq); + if (space < count) + goto done; + cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws, + &mbufs[last_idx], count, cmd, + flags | NIX_TX_VWQE_F); + ret += count; + } +done: + return ret; +} + +static __rte_always_inline uint16_t +cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev, + uint64_t *cmd, const uint64_t *txq_data, + const uint32_t flags) +{ + struct cn10k_eth_txq *txq; + struct rte_mbuf *m; + uintptr_t lmt_addr; + uint16_t lmt_id; + + lmt_addr = ws->lmt_base; + ROC_LMT_BASE_ID_GET(lmt_addr, lmt_id); + + if (ev->event_type & RTE_EVENT_TYPE_VECTOR) { + struct rte_mbuf **mbufs = ev->vec->mbufs; + uint64_t meta = *(uint64_t *)ev->vec; + uint16_t offset, nb_pkts, left; + int32_t space; + + nb_pkts = meta & 0xFFFF; + offset = (meta >> 16) & 0xFFF; + if (meta & BIT(31)) { + txq = (struct cn10k_eth_txq + *)(txq_data[(txq_data[meta >> 32] >> + 48) + + (meta >> 48)] & + (BIT_ULL(48) - 1)); + + /* Transmit based on queue depth */ + space = cn10k_sso_sq_depth(txq); + if (space <= 0) + return 0; + nb_pkts = nb_pkts < space ? nb_pkts : (uint16_t)space; + cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws, + mbufs + offset, nb_pkts, cmd, + flags | NIX_TX_VWQE_F); + } else { + nb_pkts = cn10k_sso_vwqe_split_tx(ws, mbufs + offset, + nb_pkts, cmd, + txq_data, flags); + } + left = (meta & 0xFFFF) - nb_pkts; + + if (!left) { + rte_mempool_put(rte_mempool_from_obj(ev->vec), ev->vec); + } else { + *(uint64_t *)ev->vec = + (meta & ~0xFFFFFFFUL) | + (((uint32_t)nb_pkts + offset) << 16) | left; + } + rte_prefetch0(ws); + return !left; + } + + m = ev->mbuf; + return cn10k_sso_tx_one(ws, m, cmd, lmt_id, lmt_addr, ev->sched_type, + txq_data, flags); +} + +#define T(name, sz, flags) \ + uint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_##name( \ + void *port, struct rte_event ev[], uint16_t nb_events); \ + uint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_seg_##name( \ + void *port, struct rte_event ev[], uint16_t nb_events); + +NIX_TX_FASTPATH_MODES +#undef T + +#define SSO_TX(fn, sz, flags) \ + uint16_t __rte_hot fn(void *port, struct rte_event ev[], \ + uint16_t nb_events) \ + { \ + struct cn10k_sso_hws *ws = port; \ + uint64_t cmd[sz]; \ + RTE_SET_USED(nb_events); \ + return cn10k_sso_hws_event_tx( \ + ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data, \ + flags); \ + } + +#define SSO_TX_SEG(fn, sz, flags) \ + uint16_t __rte_hot fn(void *port, struct rte_event ev[], \ + uint16_t nb_events) \ + { \ + uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2]; \ + struct cn10k_sso_hws *ws = port; \ + RTE_SET_USED(nb_events); \ + return cn10k_sso_hws_event_tx( \ + ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data, \ + (flags) | NIX_TX_MULTI_SEG_F); \ + } + +#endif diff --git a/drivers/event/cnxk/cn10k_worker.c b/drivers/event/cnxk/cn10k_worker.c index 4581c41233..562d2fca13 100644 --- a/drivers/event/cnxk/cn10k_worker.c +++ b/drivers/event/cnxk/cn10k_worker.c @@ -6,6 +6,77 @@ #include "cnxk_eventdev.h" #include "cnxk_worker.h" +/* SSO Operations */ + +static __rte_always_inline uint8_t +cn10k_sso_hws_new_event(struct cn10k_sso_hws *ws, const struct rte_event *ev) +{ + const uint32_t tag = (uint32_t)ev->event; + const uint8_t new_tt = ev->sched_type; + const uint64_t event_ptr = ev->u64; + const uint16_t grp = ev->queue_id; + + rte_atomic_thread_fence(__ATOMIC_ACQ_REL); + if (ws->xaq_lmt <= *ws->fc_mem) + return 0; + + cnxk_sso_hws_add_work(event_ptr, tag, new_tt, ws->grp_base + (grp << 12)); + return 1; +} + +static __rte_always_inline void +cn10k_sso_hws_fwd_swtag(struct cn10k_sso_hws *ws, const struct rte_event *ev) +{ + const uint32_t tag = (uint32_t)ev->event; + const uint8_t new_tt = ev->sched_type; + const uint8_t cur_tt = CNXK_TT_FROM_TAG(ws->gw_rdata); + + /* CNXK model + * cur_tt/new_tt SSO_TT_ORDERED SSO_TT_ATOMIC SSO_TT_UNTAGGED + * + * SSO_TT_ORDERED norm norm untag + * SSO_TT_ATOMIC norm norm untag + * SSO_TT_UNTAGGED norm norm NOOP + */ + + if (new_tt == SSO_TT_UNTAGGED) { + if (cur_tt != SSO_TT_UNTAGGED) + cnxk_sso_hws_swtag_untag(ws->base + SSOW_LF_GWS_OP_SWTAG_UNTAG); + } else { + cnxk_sso_hws_swtag_norm(tag, new_tt, ws->base + SSOW_LF_GWS_OP_SWTAG_NORM); + } + ws->swtag_req = 1; +} + +static __rte_always_inline void +cn10k_sso_hws_fwd_group(struct cn10k_sso_hws *ws, const struct rte_event *ev, + const uint16_t grp) +{ + const uint32_t tag = (uint32_t)ev->event; + const uint8_t new_tt = ev->sched_type; + + plt_write64(ev->u64, ws->base + SSOW_LF_GWS_OP_UPD_WQP_GRP1); + cnxk_sso_hws_swtag_desched(tag, new_tt, grp, ws->base + SSOW_LF_GWS_OP_SWTAG_DESCHED); +} + +static __rte_always_inline void +cn10k_sso_hws_forward_event(struct cn10k_sso_hws *ws, + const struct rte_event *ev) +{ + const uint8_t grp = ev->queue_id; + + /* Group hasn't changed, Use SWTAG to forward the event */ + if (CNXK_GRP_FROM_TAG(ws->gw_rdata) == grp) + cn10k_sso_hws_fwd_swtag(ws, ev); + else + /* + * Group has been changed for group based work pipelining, + * Use deschedule/add_work operation to transfer the event to + * new group/core + */ + cn10k_sso_hws_fwd_group(ws, ev, grp); +} + uint16_t __rte_hot cn10k_sso_hws_enq(void *port, const struct rte_event *ev) { diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h index 332a2e27c2..2bea1f6ca6 100644 --- a/drivers/event/cnxk/cn10k_worker.h +++ b/drivers/event/cnxk/cn10k_worker.h @@ -5,91 +5,13 @@ #ifndef __CN10K_WORKER_H__ #define __CN10K_WORKER_H__ -#include - -#include "cn10k_cryptodev_ops.h" -#include "cnxk_ethdev.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" - -#include "cn10k_ethdev.h" +#include +#include "cn10k_cryptodev_event_dp.h" #include "cn10k_rx.h" -#include "cn10k_tx.h" - -/* SSO Operations */ - -static __rte_always_inline uint8_t -cn10k_sso_hws_new_event(struct cn10k_sso_hws *ws, const struct rte_event *ev) -{ - const uint32_t tag = (uint32_t)ev->event; - const uint8_t new_tt = ev->sched_type; - const uint64_t event_ptr = ev->u64; - const uint16_t grp = ev->queue_id; - - rte_atomic_thread_fence(__ATOMIC_ACQ_REL); - if (ws->xaq_lmt <= *ws->fc_mem) - return 0; - - cnxk_sso_hws_add_work(event_ptr, tag, new_tt, - ws->grp_base + (grp << 12)); - return 1; -} - -static __rte_always_inline void -cn10k_sso_hws_fwd_swtag(struct cn10k_sso_hws *ws, const struct rte_event *ev) -{ - const uint32_t tag = (uint32_t)ev->event; - const uint8_t new_tt = ev->sched_type; - const uint8_t cur_tt = CNXK_TT_FROM_TAG(ws->gw_rdata); - - /* CNXK model - * cur_tt/new_tt SSO_TT_ORDERED SSO_TT_ATOMIC SSO_TT_UNTAGGED - * - * SSO_TT_ORDERED norm norm untag - * SSO_TT_ATOMIC norm norm untag - * SSO_TT_UNTAGGED norm norm NOOP - */ - - if (new_tt == SSO_TT_UNTAGGED) { - if (cur_tt != SSO_TT_UNTAGGED) - cnxk_sso_hws_swtag_untag(ws->base + - SSOW_LF_GWS_OP_SWTAG_UNTAG); - } else { - cnxk_sso_hws_swtag_norm(tag, new_tt, - ws->base + SSOW_LF_GWS_OP_SWTAG_NORM); - } - ws->swtag_req = 1; -} - -static __rte_always_inline void -cn10k_sso_hws_fwd_group(struct cn10k_sso_hws *ws, const struct rte_event *ev, - const uint16_t grp) -{ - const uint32_t tag = (uint32_t)ev->event; - const uint8_t new_tt = ev->sched_type; - - plt_write64(ev->u64, ws->base + SSOW_LF_GWS_OP_UPD_WQP_GRP1); - cnxk_sso_hws_swtag_desched(tag, new_tt, grp, - ws->base + SSOW_LF_GWS_OP_SWTAG_DESCHED); -} +#include "cnxk_worker.h" +#include "cn10k_eventdev.h" -static __rte_always_inline void -cn10k_sso_hws_forward_event(struct cn10k_sso_hws *ws, - const struct rte_event *ev) -{ - const uint8_t grp = ev->queue_id; - - /* Group hasn't changed, Use SWTAG to forward the event */ - if (CNXK_GRP_FROM_TAG(ws->gw_rdata) == grp) - cn10k_sso_hws_fwd_swtag(ws, ev); - else - /* - * Group has been changed for group based work pipelining, - * Use deschedule/add_work operation to transfer the event to - * new group/core - */ - cn10k_sso_hws_fwd_group(ws, ev, grp); -} +/* CN10K Rx event fastpath */ static __rte_always_inline void cn10k_wqe_to_mbuf(uint64_t wqe, const uint64_t __mbuf, uint8_t port_id, @@ -517,243 +439,4 @@ NIX_RX_FASTPATH_MODES return fn(port, ev, timeout_ticks); \ } -static __rte_always_inline struct cn10k_eth_txq * -cn10k_sso_hws_xtract_meta(struct rte_mbuf *m, const uint64_t *txq_data) -{ - return (struct cn10k_eth_txq - *)(txq_data[(txq_data[m->port] >> 48) + - rte_event_eth_tx_adapter_txq_get(m)] & - (BIT_ULL(48) - 1)); -} - -static __rte_always_inline void -cn10k_sso_txq_fc_wait(const struct cn10k_eth_txq *txq) -{ - while ((uint64_t)txq->nb_sqb_bufs_adj <= - __atomic_load_n(txq->fc_mem, __ATOMIC_RELAXED)) - ; -} - -static __rte_always_inline int32_t -cn10k_sso_sq_depth(const struct cn10k_eth_txq *txq) -{ - return (txq->nb_sqb_bufs_adj - - __atomic_load_n((int16_t *)txq->fc_mem, __ATOMIC_RELAXED)) - << txq->sqes_per_sqb_log2; -} - -static __rte_always_inline uint16_t -cn10k_sso_tx_one(struct cn10k_sso_hws *ws, struct rte_mbuf *m, uint64_t *cmd, - uint16_t lmt_id, uintptr_t lmt_addr, uint8_t sched_type, - const uint64_t *txq_data, const uint32_t flags) -{ - uint8_t lnum = 0, loff = 0, shft = 0; - uint16_t ref_cnt = m->refcnt; - struct cn10k_eth_txq *txq; - uintptr_t laddr; - uint16_t segdw; - uintptr_t pa; - bool sec; - - txq = cn10k_sso_hws_xtract_meta(m, txq_data); - if (cn10k_sso_sq_depth(txq) <= 0) - return 0; - - if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F && txq->tx_compl.ena) - handle_tx_completion_pkts(txq, 1, 1); - - cn10k_nix_tx_skeleton(txq, cmd, flags, 0); - /* Perform header writes before barrier - * for TSO - */ - if (flags & NIX_TX_OFFLOAD_TSO_F) - cn10k_nix_xmit_prepare_tso(m, flags); - - cn10k_nix_xmit_prepare(txq, m, cmd, flags, txq->lso_tun_fmt, &sec, - txq->mark_flag, txq->mark_fmt); - - laddr = lmt_addr; - /* Prepare CPT instruction and get nixtx addr if - * it is for CPT on same lmtline. - */ - if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec) - cn10k_nix_prep_sec(m, cmd, &laddr, lmt_addr, &lnum, &loff, - &shft, txq->sa_base, flags); - - /* Move NIX desc to LMT/NIXTX area */ - cn10k_nix_xmit_mv_lmt_base(laddr, cmd, flags); - - if (flags & NIX_TX_MULTI_SEG_F) - segdw = cn10k_nix_prepare_mseg(txq, m, (uint64_t *)laddr, flags); - else - segdw = cn10k_nix_tx_ext_subs(flags) + 2; - - cn10k_nix_xmit_prepare_tstamp(txq, laddr, m->ol_flags, segdw, flags); - if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec) - pa = txq->cpt_io_addr | 3 << 4; - else - pa = txq->io_addr | ((segdw - 1) << 4); - - if (!CNXK_TAG_IS_HEAD(ws->gw_rdata) && !sched_type) - ws->gw_rdata = roc_sso_hws_head_wait(ws->base); - - cn10k_sso_txq_fc_wait(txq); - if (flags & NIX_TX_OFFLOAD_SECURITY_F && sec) - cn10k_nix_sec_fc_wait_one(txq); - - roc_lmt_submit_steorl(lmt_id, pa); - - if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) { - if (ref_cnt > 1) - rte_io_wmb(); - } - return 1; -} - -static __rte_always_inline uint16_t -cn10k_sso_vwqe_split_tx(struct cn10k_sso_hws *ws, struct rte_mbuf **mbufs, - uint16_t nb_mbufs, uint64_t *cmd, - const uint64_t *txq_data, const uint32_t flags) -{ - uint16_t count = 0, port, queue, ret = 0, last_idx = 0; - struct cn10k_eth_txq *txq; - int32_t space; - int i; - - port = mbufs[0]->port; - queue = rte_event_eth_tx_adapter_txq_get(mbufs[0]); - for (i = 0; i < nb_mbufs; i++) { - if (port != mbufs[i]->port || - queue != rte_event_eth_tx_adapter_txq_get(mbufs[i])) { - if (count) { - txq = (struct cn10k_eth_txq - *)(txq_data[(txq_data[port] >> - 48) + - queue] & - (BIT_ULL(48) - 1)); - /* Transmit based on queue depth */ - space = cn10k_sso_sq_depth(txq); - if (space < count) - goto done; - cn10k_nix_xmit_pkts_vector( - txq, (uint64_t *)ws, &mbufs[last_idx], - count, cmd, flags | NIX_TX_VWQE_F); - ret += count; - count = 0; - } - port = mbufs[i]->port; - queue = rte_event_eth_tx_adapter_txq_get(mbufs[i]); - last_idx = i; - } - count++; - } - if (count) { - txq = (struct cn10k_eth_txq - *)(txq_data[(txq_data[port] >> 48) + queue] & - (BIT_ULL(48) - 1)); - /* Transmit based on queue depth */ - space = cn10k_sso_sq_depth(txq); - if (space < count) - goto done; - cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws, - &mbufs[last_idx], count, cmd, - flags | NIX_TX_VWQE_F); - ret += count; - } -done: - return ret; -} - -static __rte_always_inline uint16_t -cn10k_sso_hws_event_tx(struct cn10k_sso_hws *ws, struct rte_event *ev, - uint64_t *cmd, const uint64_t *txq_data, - const uint32_t flags) -{ - struct cn10k_eth_txq *txq; - struct rte_mbuf *m; - uintptr_t lmt_addr; - uint16_t lmt_id; - - lmt_addr = ws->lmt_base; - ROC_LMT_BASE_ID_GET(lmt_addr, lmt_id); - - if (ev->event_type & RTE_EVENT_TYPE_VECTOR) { - struct rte_mbuf **mbufs = ev->vec->mbufs; - uint64_t meta = *(uint64_t *)ev->vec; - uint16_t offset, nb_pkts, left; - int32_t space; - - nb_pkts = meta & 0xFFFF; - offset = (meta >> 16) & 0xFFF; - if (meta & BIT(31)) { - txq = (struct cn10k_eth_txq - *)(txq_data[(txq_data[meta >> 32] >> - 48) + - (meta >> 48)] & - (BIT_ULL(48) - 1)); - - /* Transmit based on queue depth */ - space = cn10k_sso_sq_depth(txq); - if (space <= 0) - return 0; - nb_pkts = nb_pkts < space ? nb_pkts : (uint16_t)space; - cn10k_nix_xmit_pkts_vector(txq, (uint64_t *)ws, - mbufs + offset, nb_pkts, cmd, - flags | NIX_TX_VWQE_F); - } else { - nb_pkts = cn10k_sso_vwqe_split_tx(ws, mbufs + offset, - nb_pkts, cmd, - txq_data, flags); - } - left = (meta & 0xFFFF) - nb_pkts; - - if (!left) { - rte_mempool_put(rte_mempool_from_obj(ev->vec), ev->vec); - } else { - *(uint64_t *)ev->vec = - (meta & ~0xFFFFFFFUL) | - (((uint32_t)nb_pkts + offset) << 16) | left; - } - rte_prefetch0(ws); - return !left; - } - - m = ev->mbuf; - return cn10k_sso_tx_one(ws, m, cmd, lmt_id, lmt_addr, ev->sched_type, - txq_data, flags); -} - -#define T(name, sz, flags) \ - uint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_##name( \ - void *port, struct rte_event ev[], uint16_t nb_events); \ - uint16_t __rte_hot cn10k_sso_hws_tx_adptr_enq_seg_##name( \ - void *port, struct rte_event ev[], uint16_t nb_events); - -NIX_TX_FASTPATH_MODES -#undef T - -#define SSO_TX(fn, sz, flags) \ - uint16_t __rte_hot fn(void *port, struct rte_event ev[], \ - uint16_t nb_events) \ - { \ - struct cn10k_sso_hws *ws = port; \ - uint64_t cmd[sz]; \ - RTE_SET_USED(nb_events); \ - return cn10k_sso_hws_event_tx( \ - ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data, \ - flags); \ - } - -#define SSO_TX_SEG(fn, sz, flags) \ - uint16_t __rte_hot fn(void *port, struct rte_event ev[], \ - uint16_t nb_events) \ - { \ - uint64_t cmd[(sz) + CNXK_NIX_TX_MSEG_SG_DWORDS - 2]; \ - struct cn10k_sso_hws *ws = port; \ - RTE_SET_USED(nb_events); \ - return cn10k_sso_hws_event_tx( \ - ws, &ev[0], cmd, (const uint64_t *)ws->tx_adptr_data, \ - (flags) | NIX_TX_MULTI_SEG_F); \ - } - #endif diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index d7819a9298..11bcd792ba 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -5,6 +5,7 @@ #include "roc_npa.h" #include "cnxk_eventdev.h" +#include "cnxk_eventdev_dp.h" void cnxk_sso_info_get(struct cnxk_sso_evdev *dev, diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h index a3b4fef9d0..d93fdcda25 100644 --- a/drivers/event/cnxk/cnxk_eventdev.h +++ b/drivers/event/cnxk/cnxk_eventdev.h @@ -19,7 +19,7 @@ #include -#include "hw/sso.h" +#include "cnxk_eventdev_dp.h" #include "roc_platform.h" #include "roc_sso.h" @@ -36,28 +36,6 @@ #define USEC2NSEC(__us) ((__us)*1E3) #define NSEC2TICK(__ns, __freq) (((__ns) * (__freq)) / 1E9) -#define CNXK_SSO_MAX_HWGRP (RTE_EVENT_MAX_QUEUES_PER_DEV + 1) -#define CNXK_SSO_FC_NAME "cnxk_evdev_xaq_fc" -#define CNXK_SSO_MZ_NAME "cnxk_evdev_mz" -#define CNXK_SSO_XAQ_CACHE_CNT (0x7) -#define CNXK_SSO_XAQ_SLACK (8) -#define CNXK_SSO_WQE_SG_PTR (9) -#define CNXK_SSO_WQE_LAYR_PTR (5) -#define CNXK_SSO_PRIORITY_CNT (0x8) -#define CNXK_SSO_WEIGHT_MAX (0x3f) -#define CNXK_SSO_WEIGHT_MIN (0x3) -#define CNXK_SSO_WEIGHT_CNT (CNXK_SSO_WEIGHT_MAX - CNXK_SSO_WEIGHT_MIN + 1) -#define CNXK_SSO_AFFINITY_CNT (0x10) - -#define CNXK_TT_FROM_TAG(x) (((x) >> 32) & SSO_TT_EMPTY) -#define CNXK_TT_FROM_EVENT(x) (((x) >> 38) & SSO_TT_EMPTY) -#define CNXK_EVENT_TYPE_FROM_TAG(x) (((x) >> 28) & 0xf) -#define CNXK_SUB_EVENT_FROM_TAG(x) (((x) >> 20) & 0xff) -#define CNXK_CLR_SUB_EVENT(x) (~(0xffull << 20) & x) -#define CNXK_GRP_FROM_TAG(x) (((x) >> 36) & 0x3ff) -#define CNXK_SWTAG_PEND(x) (BIT_ULL(62) & x) -#define CNXK_TAG_IS_HEAD(x) (BIT_ULL(35) & x) - #define CN9K_SSOW_GET_BASE_ADDR(_GW) ((_GW)-SSOW_LF_GWS_OP_GET_WORK0) #define CN10K_GW_MODE_NONE 0 @@ -136,26 +114,6 @@ struct cnxk_sso_evdev { uint8_t is_ca_internal_port; } __rte_cache_aligned; -struct cn10k_sso_hws { - uint64_t base; - uint64_t gw_rdata; - void *lookup_mem; - uint32_t gw_wdata; - uint8_t swtag_req; - uint8_t hws_id; - /* PTP timestamp */ - struct cnxk_timesync_info **tstamp; - uint64_t meta_aura; - /* Add Work Fastpath data */ - uint64_t xaq_lmt __rte_cache_aligned; - uint64_t *fc_mem; - uintptr_t grp_base; - /* Tx Fastpath data */ - uintptr_t lmt_base __rte_cache_aligned; - uint64_t lso_tun_fmt; - uint8_t tx_adptr_data[]; -} __rte_cache_aligned; - /* Event port a.k.a GWS */ struct cn9k_sso_hws { uint64_t base; diff --git a/drivers/event/cnxk/cnxk_eventdev_dp.h b/drivers/event/cnxk/cnxk_eventdev_dp.h new file mode 100644 index 0000000000..d011c8ca64 --- /dev/null +++ b/drivers/event/cnxk/cnxk_eventdev_dp.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Marvell. + */ + +#ifndef __CNXK_EVENTDEV_DP_H__ +#define __CNXK_EVENTDEV_DP_H__ + +#include "hw/sso.h" + +#define CNXK_SSO_MAX_HWGRP (RTE_EVENT_MAX_QUEUES_PER_DEV + 1) +#define CNXK_SSO_FC_NAME "cnxk_evdev_xaq_fc" +#define CNXK_SSO_MZ_NAME "cnxk_evdev_mz" +#define CNXK_SSO_XAQ_CACHE_CNT (0x7) +#define CNXK_SSO_XAQ_SLACK (8) +#define CNXK_SSO_WQE_SG_PTR (9) +#define CNXK_SSO_WQE_LAYR_PTR (5) +#define CNXK_SSO_PRIORITY_CNT (0x8) +#define CNXK_SSO_WEIGHT_MAX (0x3f) +#define CNXK_SSO_WEIGHT_MIN (0x3) +#define CNXK_SSO_WEIGHT_CNT (CNXK_SSO_WEIGHT_MAX - CNXK_SSO_WEIGHT_MIN + 1) +#define CNXK_SSO_AFFINITY_CNT (0x10) + + +#define CNXK_TT_FROM_TAG(x) (((x) >> 32) & SSO_TT_EMPTY) +#define CNXK_TT_FROM_EVENT(x) (((x) >> 38) & SSO_TT_EMPTY) +#define CNXK_EVENT_TYPE_FROM_TAG(x) (((x) >> 28) & 0xf) +#define CNXK_SUB_EVENT_FROM_TAG(x) (((x) >> 20) & 0xff) +#define CNXK_CLR_SUB_EVENT(x) (~(0xffull << 20) & x) +#define CNXK_GRP_FROM_TAG(x) (((x) >> 36) & 0x3ff) +#define CNXK_SWTAG_PEND(x) (BIT_ULL(62) & x) +#define CNXK_TAG_IS_HEAD(x) (BIT_ULL(35) & x) + +#endif /* __CNXK_EVENTDEV_DP_H__ */ diff --git a/drivers/event/cnxk/cnxk_eventdev_selftest.c b/drivers/event/cnxk/cnxk_eventdev_selftest.c index 3aa6f081a7..577c99bacb 100644 --- a/drivers/event/cnxk/cnxk_eventdev_selftest.c +++ b/drivers/event/cnxk/cnxk_eventdev_selftest.c @@ -19,6 +19,7 @@ #include #include "cnxk_eventdev.h" +#include "cnxk_eventdev_dp.h" #define NUM_PACKETS (1024) #define MAX_EVENTS (1024) diff --git a/drivers/event/cnxk/cnxk_eventdev_stats.c b/drivers/event/cnxk/cnxk_eventdev_stats.c index 715ca9cd8f..a8a87a06e4 100644 --- a/drivers/event/cnxk/cnxk_eventdev_stats.c +++ b/drivers/event/cnxk/cnxk_eventdev_stats.c @@ -3,6 +3,7 @@ */ #include "cnxk_eventdev.h" +#include "cnxk_eventdev_dp.h" struct cnxk_sso_xstats_name { const char name[RTE_EVENT_DEV_XSTATS_NAME_SIZE]; diff --git a/drivers/event/cnxk/cnxk_worker.h b/drivers/event/cnxk/cnxk_worker.h index 0756e223f7..22d90afba2 100644 --- a/drivers/event/cnxk/cnxk_worker.h +++ b/drivers/event/cnxk/cnxk_worker.h @@ -11,7 +11,8 @@ #include "roc_io_generic.h" #endif -#include "cnxk_eventdev.h" +#include "cnxk_eventdev_dp.h" +#include "hw/ssow.h" /* SSO Operations */ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15.c b/drivers/event/cnxk/deq/cn10k/deq_0_15.c index 4da801c9b2..b715c22b8f 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ(cn10k_sso_hws_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c index 4f0ce44f85..33820eb711 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c index 7b9cec09db..7d27c5a082 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 55cb3a47e3..56fd16c404 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 1d427ea19f..e01b2a38bc 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index a4ceb2cbc9..509da881d4 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 3cd179933f..9851bd51b8 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_ca_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 6433093e5c..f286902297 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 42fc7fd2f3..d1252c7984 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 94a5522e77..0769b89f76 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c index a6bdf73a32..50252c79ca 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_dual.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c index 87d708adf0..4c2b60972a 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c index c3c5793240..cf3a44a7be 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c index 84e39deefc..a92c3e23ed 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c index c19da1b97b..d8547c15ac 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c index 595b2d06ec..8acbf3f4d6 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c index 9af8d6e128..3d0beb378a 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_0_15_tmo_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127.c b/drivers/event/cnxk/deq/cn10k/deq_112_127.c index 9d6a0d53a7..0ce82d195e 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ(cn10k_sso_hws_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c index b959e2d9e1..313530dd5d 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c index d31cfdfd5e..7d200af3ae 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 333ef3f8a9..ff09b0c2f7 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index f3a26618bf..3250f627cf 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index f16fd04393..e74a77ae8c 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index eeac9e34af..8474c2dcbe 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_ca_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 73fa822782..b5ce875657 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index a5746fa649..1552cbbb15 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 032265533f..88b89f1927 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c index 68f82747c1..8a51f357f3 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_dual.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c index 398e5a3e1c..07823f065f 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c index fc04345f7e..48b3cd8a85 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c index 071ec8f621..7c3022f69f 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c index b476eff143..1e224137b1 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c index 42e6eb3a7f..b42a87e8c5 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c index e1080e2e82..dc3e7e9e69 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_112_127_tmo_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31.c b/drivers/event/cnxk/deq/cn10k/deq_16_31.c index 27c2952758..ff09a106ea 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ(cn10k_sso_hws_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c index f3a41992b5..4b270ca51f 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c index 93e33f5b5c..7ad43889bc 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index b829aa0fc8..55e815c282 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index a7e96d41b3..435f5dbe43 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index ab9acd4637..0a3cad73e7 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 312fbc6334..dede5836e2 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_ca_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 1f5b96cbb6..15fa9b0fba 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index fb0b6cf696..dd045da34f 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 4d13be7a11..3b1ebacc5f 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c index 669ff42a98..f5dfd67901 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_dual.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c index 019afcbcc7..ec86587bdf 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c index 0c3a14b413..20051682de 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c index f76f0d85e7..dc3a52bb7f 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c index b2c1411d34..a3c52d0075 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c index 1bcf8526bb..0d1b713206 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c index d68cc46d67..2a1cd255b1 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_16_31_tmo_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47.c b/drivers/event/cnxk/deq/cn10k/deq_32_47.c index 817edb648d..3bcd49a68f 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ(cn10k_sso_hws_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c index 362fb67040..e20f60c372 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c index 875e442796..c130c511b6 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 9410e48642..ed511c5459 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index d45fe712b0..6b6305e7fd 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index c0439536aa..42cdcab4f8 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index da010b0021..afabd8987a 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_ca_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 5da95b21c7..d3ef670afa 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 65af91363f..1dfda1408b 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index cff7e40fda..3ac31df9a6 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c index 235fceb609..dc98e18d9a 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_dual.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c index 73771753da..154107219e 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c index df0a69dc7a..8bd9464636 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c index 3d05fb3005..37f2985fb3 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c index f5a6ce587a..9711381cf1 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c index 1afb09b708..6ee76356d5 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c index b6e568bba3..4f7a4580df 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_32_47_tmo_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63.c b/drivers/event/cnxk/deq/cn10k/deq_48_63.c index ecb36b4f56..3f20dea608 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ(cn10k_sso_hws_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c index 5d83ef8ae2..b2f8661a07 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c index e5783d18bd..e96a046900 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index e4355853cc..c3762e5002 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 269ead74cb..1e3a56b02b 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index b64625425a..3811cba348 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index b7f8f67738..0306746304 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_ca_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 9a9cff9e14..42bf8a1dde 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index fffcad0c38..791e129711 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 347dabd042..ca1c127b68 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c index 3f6e10e816..9bdac3e284 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_dual.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c index e3078d2816..019ff941c6 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c index d262937a99..e408d55b0b 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c index 59d5cf190d..73ba2dd7ff 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c index ed9e6b70b7..734925e40d 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c index 40c679ace6..b112e09846 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c index 8c2f6bb171..8a85a33317 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_48_63_tmo_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79.c b/drivers/event/cnxk/deq/cn10k/deq_64_79.c index 6c3aa83c66..e13fdc3456 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ(cn10k_sso_hws_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c index ea553303fb..225c2c325a 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c index b201b8a642..e1def2b058 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index b8e9bdbbd6..59ab7fc960 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index f3bccc222f..5bed2e4a94 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 0057d6e891..05b4b39595 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 216c54c515..d962e7f146 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_ca_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index e17cf532a3..905b6afd8c 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index d9186112c0..1f8e58f82c 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 4272ff2a59..a639f56874 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c index 843aaa19ca..bbe38f9163 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_dual.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c index 78ed7e2468..610bff2f1b 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c index d5613699bb..2dd3cce7e2 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c index 3d54bc4f1e..f57700b740 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c index 2cfa40f4c9..9388d36620 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c index f385acf5db..7d0eeb7bb9 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c index d093cdf027..03b6898f5d 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_64_79_tmo_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95.c b/drivers/event/cnxk/deq/cn10k/deq_80_95.c index d41d10b470..6f678aa8f1 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ(cn10k_sso_hws_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c index 541770db63..49ad628924 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c index 85253c20cd..1d32173aaf 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index d624789f44..0e5b20e391 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index b9cd213bf0..6d30b31241 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index ac152703a5..b87de757b3 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 16b16e6a63..48f03d87c6 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_ca_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index df284b78f9..0e1cecfc43 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index c890c504c1..5ee30c3247 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 6af6918dbe..f7d15bda9e 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c index 00e32a3aa6..b9676a9f07 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_dual.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c index 8a4549a5d9..9ea971438d 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c index 4f8a2fd846..549808ac8e 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c index cc0f53f786..499dbe54de 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c index dff2aa84d2..f385950b06 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c index da6a596a6a..379eb7bf8c 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c index cf09f3e600..8e43cae326 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_80_95_tmo_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111.c b/drivers/event/cnxk/deq/cn10k/deq_96_111.c index a7a3f8302c..dc45350973 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ(cn10k_sso_hws_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c index 5eb2ca77b0..c14d4da750 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c index 0e97b764dc..43ad267203 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index f23317bbd4..a74d1a1386 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index be3178c5b5..8dd8e30acd 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index b0e2a106e0..d6f2d8fe44 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 60d0a5ac59..08bc4ebcc5 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_ca_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 5f9479dd52..b23bc42842 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ 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 index 769e784718..040f9c2bfb 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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) \ 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 index 53ec7c0a41..dcd7ce4dea 100644 --- 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 @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c index c262a92ac4..4fb603a91b 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_dual.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DUAL_DEQ(cn10k_sso_hws_dual_deq_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c index a54fb2f72b..c10fbb5f46 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_SEG(cn10k_sso_hws_deq_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c index 013abbad1e..5d8febc64e 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_CMN_DEQ_SEG_BURST(cn10k_sso_hws_deq_seg_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c index 39d19f4381..37f4f0cc74 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO(cn10k_sso_hws_deq_tmo_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c index 4cc80dd4c9..84760d1e00 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_burst_##name, \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c index a689042470..8fe43b44d0 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define R(name, flags) \ SSO_DEQ_TMO_SEG(cn10k_sso_hws_deq_tmo_seg_##name, flags) \ diff --git a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c index a3aba85cd3..1a440456f3 100644 --- a/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c +++ b/drivers/event/cnxk/deq/cn10k/deq_96_111_tmo_seg_burst.c @@ -3,8 +3,10 @@ */ #include "cn10k_worker.h" -#include "cnxk_eventdev.h" -#include "cnxk_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_seg_burst_##name, \ diff --git a/drivers/event/cnxk/tx/cn10k/tx_0_15.c b/drivers/event/cnxk/tx/cn10k/tx_0_15.c index bae3a62eac..4e5322ba6d 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_0_15.c +++ b/drivers/event/cnxk/tx/cn10k/tx_0_15.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c b/drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c index 0ffd0e50f7..912c64d819 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c +++ b/drivers/event/cnxk/tx/cn10k/tx_0_15_seg.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) \ SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_112_127.c b/drivers/event/cnxk/tx/cn10k/tx_112_127.c index 02c9ab1ae1..4ba0b7f802 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_112_127.c +++ b/drivers/event/cnxk/tx/cn10k/tx_112_127.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c b/drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c index b0abd8b328..6be641113e 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c +++ b/drivers/event/cnxk/tx/cn10k/tx_112_127_seg.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) \ SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_16_31.c b/drivers/event/cnxk/tx/cn10k/tx_16_31.c index cd6b1b56f8..673d2d9d22 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_16_31.c +++ b/drivers/event/cnxk/tx/cn10k/tx_16_31.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c b/drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c index 52cbe5932f..b7512e2eb1 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c +++ b/drivers/event/cnxk/tx/cn10k/tx_16_31_seg.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) \ SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_32_47.c b/drivers/event/cnxk/tx/cn10k/tx_32_47.c index 5dd3aad0f3..25a92c114e 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_32_47.c +++ b/drivers/event/cnxk/tx/cn10k/tx_32_47.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c b/drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c index a8e73445ff..495c335183 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c +++ b/drivers/event/cnxk/tx/cn10k/tx_32_47_seg.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) \ SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_48_63.c b/drivers/event/cnxk/tx/cn10k/tx_48_63.c index 8cd5c663d7..e2762e87d8 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_48_63.c +++ b/drivers/event/cnxk/tx/cn10k/tx_48_63.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c b/drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c index 71efca9478..c3d898fcae 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c +++ b/drivers/event/cnxk/tx/cn10k/tx_48_63_seg.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) \ SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_64_79.c b/drivers/event/cnxk/tx/cn10k/tx_64_79.c index 36aea254e5..d9b7f2167f 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_64_79.c +++ b/drivers/event/cnxk/tx/cn10k/tx_64_79.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c b/drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c index 918f9b6d3b..3a28e0eee7 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c +++ b/drivers/event/cnxk/tx/cn10k/tx_64_79_seg.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) \ SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_80_95.c b/drivers/event/cnxk/tx/cn10k/tx_80_95.c index e400c1546e..a95b00d270 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_80_95.c +++ b/drivers/event/cnxk/tx/cn10k/tx_80_95.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c b/drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c index 21a76b59fb..f0264ee701 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c +++ b/drivers/event/cnxk/tx/cn10k/tx_80_95_seg.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) \ SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_96_111.c b/drivers/event/cnxk/tx/cn10k/tx_96_111.c index 6679b9aa28..519ec1623f 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_96_111.c +++ b/drivers/event/cnxk/tx/cn10k/tx_96_111.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) SSO_TX(cn10k_sso_hws_tx_adptr_enq_##name, sz, flags) diff --git a/drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c b/drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c index 9430a92fc3..1e6383fdf7 100644 --- a/drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c +++ b/drivers/event/cnxk/tx/cn10k/tx_96_111_seg.c @@ -2,7 +2,11 @@ * Copyright(C) 2022 Marvell. */ -#include "cn10k_worker.h" +#include "cn10k_tx_worker.h" + +#ifdef _ROC_API_H_ +#error "roc_api.h is included" +#endif #define T(name, sz, flags) \ SSO_TX_SEG(cn10k_sso_hws_tx_adptr_enq_seg_##name, sz, flags)