crypto/octeontx2: add lookaside SA context definitions

This patch adds lookaside IPsec SA context definitions.

Signed-off-by: Vamsi Attunuru <vattunuru@marvell.com>
Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.h b/drivers/crypto/octeontx2/otx2_cryptodev_sec.h
new file mode 100644 (file)
index 0000000..253f62d
--- /dev/null
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_sec.h
@@ -0,0 +1,58 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2020 Marvell International Ltd.
+ */
+
+#ifndef __OTX2_CRYPTODEV_SEC_H__
+#define __OTX2_CRYPTODEV_SEC_H__
+
+#include "otx2_ipsec_po.h"
+
+struct otx2_sec_session_ipsec_lp {
+       RTE_STD_C11
+       union {
+               /* Inbound SA */
+               struct otx2_ipsec_po_in_sa in_sa;
+               /* Outbound SA */
+               struct otx2_ipsec_po_out_sa out_sa;
+       };
+
+       uint64_t ucmd_w3;
+       union {
+               uint64_t ucmd_w0;
+               struct {
+                       uint16_t ucmd_dlen;
+                       uint16_t ucmd_param2;
+                       uint16_t ucmd_param1;
+                       uint16_t ucmd_opcode;
+               };
+       };
+
+       uint8_t partial_len;
+       uint8_t roundup_len;
+       uint8_t roundup_byte;
+       uint16_t ip_id;
+       union {
+               uint64_t esn;
+               struct {
+                       uint32_t seq_lo;
+                       uint32_t seq_hi;
+               };
+       };
+
+       /** Context length in 8-byte words */
+       size_t ctx_len;
+       /** Auth IV offset in bytes */
+       uint16_t auth_iv_offset;
+       /** IV offset in bytes */
+       uint16_t iv_offset;
+       /** AAD length */
+       uint16_t aad_length;
+       /** MAC len in bytes */
+       uint8_t mac_len;
+       /** IV length in bytes */
+       uint8_t iv_length;
+       /** Auth IV length in bytes */
+       uint8_t auth_iv_length;
+};
+
+#endif /* __OTX2_CRYPTODEV_SEC_H__ */

diff --git a/drivers/crypto/octeontx2/otx2_ipsec_po.h b/drivers/crypto/octeontx2/otx2_ipsec_po.h
new file mode 100644 (file)
index 0000000..217dfea
--- /dev/null
+++ b/drivers/crypto/octeontx2/otx2_ipsec_po.h
@@ -0,0 +1,110 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2020 Marvell International Ltd.
+ */
+
+#ifndef __OTX2_IPSEC_PO_H__
+#define __OTX2_IPSEC_PO_H__
+
+#include <rte_crypto_sym.h>
+#include <rte_ip.h>
+#include <rte_security.h>
+
+union otx2_ipsec_po_bit_perfect_iv {
+       uint8_t aes_iv[16];
+       uint8_t des_iv[8];
+       struct {
+               uint8_t nonce[4];
+               uint8_t iv[8];
+               uint8_t counter[4];
+       } gcm;
+};
+
+struct otx2_ipsec_po_traffic_selector {
+       rte_be16_t src_port[2];
+       rte_be16_t dst_port[2];
+       RTE_STD_C11
+       union {
+               struct {
+                       rte_be32_t src_addr[2];
+                       rte_be32_t dst_addr[2];
+               } ipv4;
+               struct {
+                       uint8_t src_addr[32];
+                       uint8_t dst_addr[32];
+               } ipv6;
+       };
+};
+
+struct otx2_ipsec_po_sa_ctl {
+       rte_be32_t spi          : 32;
+       uint64_t exp_proto_inter_frag : 8;
+       uint64_t rsvd_42_40   : 3;
+       uint64_t esn_en       : 1;
+       uint64_t rsvd_45_44   : 2;
+       uint64_t encap_type   : 2;
+       uint64_t enc_type     : 3;
+       uint64_t rsvd_48      : 1;
+       uint64_t auth_type    : 4;
+       uint64_t valid        : 1;
+       uint64_t direction    : 1;
+       uint64_t outer_ip_ver : 1;
+       uint64_t inner_ip_ver : 1;
+       uint64_t ipsec_mode   : 1;
+       uint64_t ipsec_proto  : 1;
+       uint64_t aes_key_len  : 2;
+};
+
+struct otx2_ipsec_po_in_sa {
+       /* w0 */
+       struct otx2_ipsec_po_sa_ctl ctl;
+
+       /* w1-w4 */
+       uint8_t cipher_key[32];
+
+       /* w5-w6 */
+       union otx2_ipsec_po_bit_perfect_iv iv;
+
+       /* w7 */
+       uint32_t esn_hi;
+       uint32_t esn_low;
+
+       /* w8 */
+       uint8_t udp_encap[8];
+
+       /* w9-w23 */
+       struct {
+               uint8_t hmac_key[48];
+               struct otx2_ipsec_po_traffic_selector selector;
+       } aes_gcm;
+};
+
+struct otx2_ipsec_po_ip_template {
+       RTE_STD_C11
+       union {
+               uint8_t raw[252];
+               struct rte_ipv4_hdr ipv4_hdr;
+               struct rte_ipv6_hdr ipv6_hdr;
+       };
+};
+
+struct otx2_ipsec_po_out_sa {
+       /* w0 */
+       struct otx2_ipsec_po_sa_ctl ctl;
+
+       /* w1-w4 */
+       uint8_t cipher_key[32];
+
+       /* w5-w6 */
+       union otx2_ipsec_po_bit_perfect_iv iv;
+
+       /* w7 */
+       uint32_t esn_hi;
+       uint32_t esn_low;
+
+       /* w8-w39 */
+       struct otx2_ipsec_po_ip_template template;
+       uint16_t udp_src;
+       uint16_t udp_dst;
+};
+
+#endif /* __OTX2_IPSEC_PO_H__ */

diff --git a/drivers/crypto/octeontx2/otx2_security.h b/drivers/crypto/octeontx2/otx2_security.h
index 9790c70..9b4fe26 100644 (file)
--- a/drivers/crypto/octeontx2/otx2_security.h
+++ b/drivers/crypto/octeontx2/otx2_security.h
@@ -5,10 +5,12 @@
 #ifndef __OTX2_SECURITY_H__
 #define __OTX2_SECURITY_H__
 
+#include "otx2_cryptodev_sec.h"
 #include "otx2_ethdev_sec.h"
 
 union otx2_sec_session_ipsec {
        struct otx2_sec_session_ipsec_ip ip;
+       struct otx2_sec_session_ipsec_lp lp;
 };
 
 struct otx2_sec_session {

diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.h b/drivers/net/octeontx2/otx2_ethdev_sec.h
index 22025d0..298b00b 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev_sec.h
+++ b/drivers/net/octeontx2/otx2_ethdev_sec.h
@@ -8,6 +8,7 @@
 #include <rte_ethdev.h>
 
 #include "otx2_ipsec_fp.h"
+#include "otx2_ipsec_po.h"
 
 #define OTX2_CPT_RES_ALIGN             16
 #define OTX2_NIX_SEND_DESC_ALIGN       16