From: Anoob Joseph <ano...@marvell.com>
CTX defines are common for all cases using CPT CTX.
Signed-off-by: Anoob Joseph <ano...@marvell.com>
---
drivers/common/cnxk/cnxk_security.h | 1 +
drivers/common/cnxk/roc_cpt.h | 16 ++++++++++++++++
drivers/common/cnxk/roc_ie_ot.h | 16 ----------------
drivers/net/cnxk/cn10k_rxtx.h | 4 ++--
drivers/net/cnxk/cn20k_rxtx.h | 4 ++--
5 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/common/cnxk/cnxk_security.h
b/drivers/common/cnxk/cnxk_security.h
index cd78b283f0..8ede6c88a3 100644
--- a/drivers/common/cnxk/cnxk_security.h
+++ b/drivers/common/cnxk/cnxk_security.h
@@ -7,6 +7,7 @@
#include <rte_crypto.h>
#include <rte_security.h>
+#include "roc_cpt.h"
#include "roc_ie_on.h"
#include "roc_ie_ot.h"
diff --git a/drivers/common/cnxk/roc_cpt.h b/drivers/common/cnxk/roc_cpt.h
index 0b9c933925..70129531eb 100644
--- a/drivers/common/cnxk/roc_cpt.h
+++ b/drivers/common/cnxk/roc_cpt.h
@@ -104,6 +104,22 @@
#define ROC_CPT_RES_ALIGN 16
+/* Context units in bytes */
+#define ROC_CTX_UNIT_8B 8
+#define ROC_CTX_UNIT_128B 128
+#define ROC_CTX_MAX_CKEY_LEN 32
+#define ROC_CTX_MAX_OPAD_IPAD_LEN 128
+
+/* Anti reply window size supported */
+#define ROC_AR_WIN_SIZE_MIN 64
+#define ROC_AR_WIN_SIZE_MAX 4096
+#define ROC_LOG_MIN_AR_WIN_SIZE_M1 5
+
+/* u64 array size to fit anti replay window bits */
+#define ROC_AR_WINBITS_SZ
\
+ (PLT_ALIGN_CEIL(ROC_AR_WIN_SIZE_MAX, BITS_PER_LONG_LONG) / \
+ BITS_PER_LONG_LONG)
+
enum {
ROC_CPT_REVISION_ID_83XX = 0,
ROC_CPT_REVISION_ID_96XX_B0 = 1,
diff --git a/drivers/common/cnxk/roc_ie_ot.h b/drivers/common/cnxk/roc_ie_ot.h
index 26616be901..932d3b6131 100644
--- a/drivers/common/cnxk/roc_ie_ot.h
+++ b/drivers/common/cnxk/roc_ie_ot.h
@@ -155,22 +155,6 @@ roc_ie_ot_ucc_is_success(uint8_t ucc)
return (ucc >= uc_base);
}
-/* Context units in bytes */
-#define ROC_CTX_UNIT_8B 8
-#define ROC_CTX_UNIT_128B 128
-#define ROC_CTX_MAX_CKEY_LEN 32
-#define ROC_CTX_MAX_OPAD_IPAD_LEN 128
-
-/* Anti reply window size supported */
-#define ROC_AR_WIN_SIZE_MIN 64
-#define ROC_AR_WIN_SIZE_MAX 4096
-#define ROC_LOG_MIN_AR_WIN_SIZE_M1 5
-
-/* u64 array size to fit anti replay window bits */
-#define ROC_AR_WINBITS_SZ
\
- (PLT_ALIGN_CEIL(ROC_AR_WIN_SIZE_MAX, BITS_PER_LONG_LONG) / \
- BITS_PER_LONG_LONG)
-
#define ROC_IPSEC_ERR_RING_MAX_ENTRY 65536
union roc_ot_ipsec_err_ring_head {
diff --git a/drivers/net/cnxk/cn10k_rxtx.h b/drivers/net/cnxk/cn10k_rxtx.h
index 9861aa6571..98f9e2efa3 100644
--- a/drivers/net/cnxk/cn10k_rxtx.h
+++ b/drivers/net/cnxk/cn10k_rxtx.h
@@ -27,8 +27,6 @@
#include "hw/npc.h"
#include "hw/ssow.h"
-#include "roc_ie_ot.h"
-
/* NPA */
#include "roc_npa_dp.h"
@@ -38,6 +36,8 @@
/* CPT */
#include "roc_cpt.h"
+#include "roc_ie_ot.h"
+
/* NIX Inline dev */
#include "roc_nix_inl_dp.h"
diff --git a/drivers/net/cnxk/cn20k_rxtx.h b/drivers/net/cnxk/cn20k_rxtx.h
index 4a8f194eb8..7aa06444e2 100644
--- a/drivers/net/cnxk/cn20k_rxtx.h
+++ b/drivers/net/cnxk/cn20k_rxtx.h
@@ -27,8 +27,6 @@
#include "hw/npc.h"
#include "hw/ssow.h"
-#include "roc_ie_ot.h"
-
/* NPA */
#include "roc_npa_dp.h"
@@ -38,6 +36,8 @@
/* CPT */
#include "roc_cpt.h"
+#include "roc_ie_ot.h"
+
/* NIX Inline dev */
#include "roc_nix_inl_dp.h"
--
2.34.1
