X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fcrypto%2Fqat%2Fqat_sym_session.h;h=98985d6867477e4cea84caab1901c21faaa16b34;hb=ca041cd44fcc8b22c0e84460254596096e8fe914;hp=493036ebfbe6244c708a4f5364fd5a186bb1979a;hpb=bba31cff97e20a002ebef6bd21d94998aa5478b7;p=dpdk.git

diff --git a/drivers/crypto/qat/qat_sym_session.h b/drivers/crypto/qat/qat_sym_session.h
index 493036ebfb..98985d6867 100644
--- a/drivers/crypto/qat/qat_sym_session.h
+++ b/drivers/crypto/qat/qat_sym_session.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2015-2019 Intel Corporation
  */
 #ifndef _QAT_SYM_SESSION_H_
 #define _QAT_SYM_SESSION_H_
@@ -23,6 +23,11 @@
 /* 3DES key sizes */
 #define QAT_3DES_KEY_SZ_OPT1 24 /* Keys are independent */
 #define QAT_3DES_KEY_SZ_OPT2 16 /* K3=K1 */
+#define QAT_3DES_KEY_SZ_OPT3 8 /* K1=K2=K3 */
+
+/* 96-bit case of IV for CCP/GCM single pass algorithm */
+#define QAT_AES_GCM_SPC_IV_SIZE 12
+
 
 #define QAT_AES_HW_CONFIG_CBC_ENC(alg) \
 	ICP_QAT_HW_CIPHER_CONFIG_BUILD(ICP_QAT_HW_CIPHER_CBC_MODE, alg, \
@@ -34,7 +39,9 @@
 					ICP_QAT_HW_CIPHER_KEY_CONVERT, \
 					ICP_QAT_HW_CIPHER_DECRYPT)
 
-enum qat_crypto_proto_flag {
+#define QAT_AES_CMAC_CONST_RB 0x87
+
+enum qat_sym_proto_flag {
 	QAT_CRYPTO_PROTO_FLAG_NONE = 0,
 	QAT_CRYPTO_PROTO_FLAG_CCM = 1,
 	QAT_CRYPTO_PROTO_FLAG_GCM = 2,
@@ -43,12 +50,12 @@ enum qat_crypto_proto_flag {
 };
 
 /* Common content descriptor */
-struct qat_alg_cd {
+struct qat_sym_cd {
 	struct icp_qat_hw_cipher_algo_blk cipher;
 	struct icp_qat_hw_auth_algo_blk hash;
 } __rte_packed __rte_cache_aligned;
 
-struct qat_session {
+struct qat_sym_session {
 	enum icp_qat_fw_la_cmd_id qat_cmd;
 	enum icp_qat_hw_cipher_algo qat_cipher_alg;
 	enum icp_qat_hw_cipher_dir qat_dir;
@@ -56,7 +63,7 @@ struct qat_session {
 	enum icp_qat_hw_auth_algo qat_hash_alg;
 	enum icp_qat_hw_auth_op auth_op;
 	void *bpi_ctx;
-	struct qat_alg_cd cd;
+	struct qat_sym_cd cd;
 	uint8_t *cd_cur_ptr;
 	phys_addr_t cd_paddr;
 	struct icp_qat_fw_la_bulk_req fw_req;
@@ -73,6 +80,8 @@ struct qat_session {
 	uint16_t digest_length;
 	rte_spinlock_t lock;	/* protects this struct */
 	enum qat_device_gen min_qat_dev_gen;
+	uint8_t aes_cmac;
+	uint8_t is_single_pass;
 };
 
 int
@@ -86,27 +95,28 @@ qat_sym_session_set_parameters(struct rte_cryptodev *dev,
 		struct rte_crypto_sym_xform *xform, void *session_private);
 
 int
-qat_sym_session_configure_aead(struct rte_crypto_sym_xform *xform,
-				struct qat_session *session);
+qat_sym_session_configure_aead(struct rte_cryptodev *dev,
+				struct rte_crypto_sym_xform *xform,
+				struct qat_sym_session *session);
 
 int
 qat_sym_session_configure_cipher(struct rte_cryptodev *dev,
 		struct rte_crypto_sym_xform *xform,
-		struct qat_session *session);
+		struct qat_sym_session *session);
 
 int
 qat_sym_session_configure_auth(struct rte_cryptodev *dev,
 				struct rte_crypto_sym_xform *xform,
-				struct qat_session *session);
+				struct qat_sym_session *session);
 
 int
-qat_sym_session_aead_create_cd_cipher(struct qat_session *cd,
-						uint8_t *enckey,
+qat_sym_session_aead_create_cd_cipher(struct qat_sym_session *cd,
+						const uint8_t *enckey,
 						uint32_t enckeylen);
 
 int
-qat_sym_session_aead_create_cd_auth(struct qat_session *cdesc,
-						uint8_t *authkey,
+qat_sym_session_aead_create_cd_auth(struct qat_sym_session *cdesc,
+						const uint8_t *authkey,
 						uint32_t authkeylen,
 						uint32_t aad_length,
 						uint32_t digestsize,
@@ -121,7 +131,7 @@ qat_sym_session_get_private_size(struct rte_cryptodev *dev);
 
 void
 qat_sym_sesssion_init_common_hdr(struct icp_qat_fw_comn_req_hdr *header,
-					enum qat_crypto_proto_flag proto_flags);
+					enum qat_sym_proto_flag proto_flags);
 int
 qat_sym_validate_aes_key(int key_len, enum icp_qat_hw_cipher_algo *alg);
 int