From 858797bbcd9c6e36fb9d283a88edcd0bb89d5d67 Mon Sep 17 00:00:00 2001 From: Tejasree Kondoj Date: Thu, 16 Jul 2020 14:09:25 +0530 Subject: [PATCH] net/octeontx2: move security session struct to crypto PMD This patch moves otx2_sec_session structure to otx2_security.h to make it common for inline and lookaside protocol modes of rte_security Signed-off-by: Tejasree Kondoj Acked-by: Anoob Joseph Acked-by: Akhil Goyal --- drivers/crypto/octeontx2/otx2_security.h | 20 ++++++++++++++++++++ drivers/net/octeontx2/otx2_ethdev_sec.c | 1 + drivers/net/octeontx2/otx2_ethdev_sec.h | 10 ---------- drivers/net/octeontx2/otx2_ethdev_sec_tx.h | 1 + 4 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 drivers/crypto/octeontx2/otx2_security.h diff --git a/drivers/crypto/octeontx2/otx2_security.h b/drivers/crypto/octeontx2/otx2_security.h new file mode 100644 index 0000000000..9790c709d6 --- /dev/null +++ b/drivers/crypto/octeontx2/otx2_security.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (C) 2020 Marvell International Ltd. + */ + +#ifndef __OTX2_SECURITY_H__ +#define __OTX2_SECURITY_H__ + +#include "otx2_ethdev_sec.h" + +union otx2_sec_session_ipsec { + struct otx2_sec_session_ipsec_ip ip; +}; + +struct otx2_sec_session { + union otx2_sec_session_ipsec ipsec; + void *userdata; + /**< Userdata registered by the application */ +} __rte_cache_aligned; + +#endif /* __OTX2_SECURITY_H__ */ diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.c b/drivers/net/octeontx2/otx2_ethdev_sec.c index 5f6140f70b..c2ad32cf0c 100644 --- a/drivers/net/octeontx2/otx2_ethdev_sec.c +++ b/drivers/net/octeontx2/otx2_ethdev_sec.c @@ -19,6 +19,7 @@ #include "otx2_ethdev_sec.h" #include "otx2_ipsec_fp.h" #include "otx2_sec_idev.h" +#include "otx2_security.h" #define AH_HDR_LEN 12 #define AES_GCM_IV_LEN 8 diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.h b/drivers/net/octeontx2/otx2_ethdev_sec.h index e24358a05a..22025d0d0c 100644 --- a/drivers/net/octeontx2/otx2_ethdev_sec.h +++ b/drivers/net/octeontx2/otx2_ethdev_sec.h @@ -116,16 +116,6 @@ struct otx2_sec_session_ipsec_ip { struct otx2_cpt_qp *qp; }; -struct otx2_sec_session_ipsec { - struct otx2_sec_session_ipsec_ip ip; -}; - -struct otx2_sec_session { - struct otx2_sec_session_ipsec ipsec; - void *userdata; - /**< Userdata registered by the application */ -} __rte_cache_aligned; - int otx2_eth_sec_ctx_create(struct rte_eth_dev *eth_dev); void otx2_eth_sec_ctx_destroy(struct rte_eth_dev *eth_dev); diff --git a/drivers/net/octeontx2/otx2_ethdev_sec_tx.h b/drivers/net/octeontx2/otx2_ethdev_sec_tx.h index 2e35a8c773..f8130ca624 100644 --- a/drivers/net/octeontx2/otx2_ethdev_sec_tx.h +++ b/drivers/net/octeontx2/otx2_ethdev_sec_tx.h @@ -9,6 +9,7 @@ #include #include "otx2_ethdev_sec.h" +#include "otx2_security.h" struct otx2_ipsec_fp_out_hdr { uint32_t ip_id; -- 2.20.1