]> git.droids-corp.org - dpdk.git/commitdiff
crypto/qat: unify symmetric functions
authorKai Ji <kai.ji@intel.com>
Wed, 23 Feb 2022 00:50:02 +0000 (08:50 +0800)
committerAkhil Goyal <gakhil@marvell.com>
Wed, 23 Feb 2022 08:59:16 +0000 (09:59 +0100)
This patch removes qat_sym_pmd.c and integrates all the functions into
qat_sym.c. The unified/integrated qat sym crypto pmd functions should
make them easier to maintain.

Signed-off-by: Kai Ji <kai.ji@intel.com>
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
drivers/common/qat/meson.build
drivers/common/qat/qat_device.c
drivers/common/qat/qat_qp.c
drivers/crypto/qat/qat_crypto.h
drivers/crypto/qat/qat_sym.c
drivers/crypto/qat/qat_sym.h
drivers/crypto/qat/qat_sym_hw_dp.c
drivers/crypto/qat/qat_sym_pmd.c [deleted file]
drivers/crypto/qat/qat_sym_pmd.h [deleted file]
drivers/crypto/qat/qat_sym_session.c

index af92271a752ecdd05d426a916f9d24be29c3ba48..1bf6896a7e3e53055b2939ed781209c01fb47679 100644 (file)
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017-2018 Intel Corporation
+# Copyright(c) 2017-2022 Intel Corporation
 
 if is_windows
     build = false
@@ -73,7 +73,7 @@ if qat_compress
 endif
 
 if qat_crypto
-    foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
+    foreach f: ['qat_sym.c', 'qat_sym_session.c',
             'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c', 'qat_crypto.c',
             'dev/qat_sym_pmd_gen1.c',
             'dev/qat_asym_pmd_gen1.c',
index 1f870d689a1a586dca34e7b8ca09214e9fd9c25b..6824d97050e3ca4c5bf7d4703013884b14c9c2f4 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2020 Intel Corporation
+ * Copyright(c) 2018-2022 Intel Corporation
  */
 
 #include <rte_string_fns.h>
@@ -8,7 +8,7 @@
 
 #include "qat_device.h"
 #include "adf_transport_access_macros.h"
-#include "qat_sym_pmd.h"
+#include "qat_sym.h"
 #include "qat_comp_pmd.h"
 #include "adf_pf2vf_msg.h"
 #include "qat_pf2vf.h"
index 7f2fdc53ce10ff413f270764bca8b205e2b6728c..b36ffa6f6d956757d5f697ef1c905c0f464b7bd3 100644 (file)
@@ -838,7 +838,8 @@ qat_dequeue_op_burst(void *qp, void **ops,
 
                if (tmp_qp->service_type == QAT_SERVICE_SYMMETRIC)
                        qat_sym_process_response(ops, resp_msg,
-                               tmp_qp->op_cookies[head >> rx_queue->trailz]);
+                               tmp_qp->op_cookies[head >> rx_queue->trailz],
+                               NULL);
                else if (tmp_qp->service_type == QAT_SERVICE_COMPRESSION)
                        nb_fw_responses = qat_comp_process_response(
                                ops, resp_msg,
index 5ca76fcaa6cab3b79a24ffd27817a68edfb26047..c01266f81c918a5841a0500962df8413ba8c9b8a 100644 (file)
 extern uint8_t qat_sym_driver_id;
 extern uint8_t qat_asym_driver_id;
 
-/** helper macro to set cryptodev capability range **/
+/**
+ * helper macro to set cryptodev capability range
+ * <n: name> <l: min > <r: max> <i: increment> <v: value>
+ **/
 #define CAP_RNG(n, l, r, i) .n = {.min = l, .max = r, .increment = i}
 
 #define CAP_RNG_ZERO(n) .n = {.min = 0, .max = 0, .increment = 0}
index 83bf55c9337ab99588789280fe2b367ac81e5dfa..aad4b243b7122a0d2403b741483d38d1d989a5da 100644 (file)
@@ -17,6 +17,27 @@ uint8_t qat_sym_driver_id;
 
 struct qat_crypto_gen_dev_ops qat_sym_gen_dev_ops[QAT_N_GENS];
 
+void
+qat_sym_init_op_cookie(void *op_cookie)
+{
+       struct qat_sym_op_cookie *cookie = op_cookie;
+
+       cookie->qat_sgl_src_phys_addr =
+                       rte_mempool_virt2iova(cookie) +
+                       offsetof(struct qat_sym_op_cookie,
+                       qat_sgl_src);
+
+       cookie->qat_sgl_dst_phys_addr =
+                       rte_mempool_virt2iova(cookie) +
+                       offsetof(struct qat_sym_op_cookie,
+                       qat_sgl_dst);
+
+       cookie->opt.spc_gmac.cd_phys_addr =
+                       rte_mempool_virt2iova(cookie) +
+                       offsetof(struct qat_sym_op_cookie,
+                       opt.spc_gmac.cd_cipher);
+}
+
 static inline void
 set_cipher_iv(uint16_t iv_length, uint16_t iv_offset,
                struct icp_qat_fw_la_cipher_req_params *cipher_param,
index e3ec7f0de4cc070ff7793c81309477623e57b21f..f4ff2ce4cd7139ea4da2f656ee88d9b947beab2e 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2018 Intel Corporation
+ * Copyright(c) 2015-2022 Intel Corporation
  */
 
 #ifndef _QAT_SYM_H_
@@ -15,7 +15,7 @@
 
 #include "qat_common.h"
 #include "qat_sym_session.h"
-#include "qat_sym_pmd.h"
+#include "qat_crypto.h"
 #include "qat_logs.h"
 
 #define BYTE_LENGTH    8
  */
 #define BPI_MAX_ENCR_IV_LEN ICP_QAT_HW_AES_BLK_SZ
 
+/** Intel(R) QAT Symmetric Crypto PMD name */
+#define CRYPTODEV_NAME_QAT_SYM_PMD     crypto_qat
+
+/* Internal capabilities */
+#define QAT_SYM_CAP_MIXED_CRYPTO       (1 << 0)
+#define QAT_SYM_CAP_VALID              (1 << 31)
+
+/**
+ * Macro to add a sym capability
+ * helper function to add an sym capability
+ * <n: name> <b: block size> <k: key size> <d: digest size>
+ * <a: aad_size> <i: iv_size>
+ **/
+#define QAT_SYM_PLAIN_AUTH_CAP(n, b, d)                                        \
+       {                                                               \
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
+               {.sym = {                                               \
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,        \
+                       {.auth = {                                      \
+                               .algo = RTE_CRYPTO_AUTH_##n,            \
+                               b, d                                    \
+                       }, }                                            \
+               }, }                                                    \
+       }
+
+#define QAT_SYM_AUTH_CAP(n, b, k, d, a, i)                             \
+       {                                                               \
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
+               {.sym = {                                               \
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,        \
+                       {.auth = {                                      \
+                               .algo = RTE_CRYPTO_AUTH_##n,            \
+                               b, k, d, a, i                           \
+                       }, }                                            \
+               }, }                                                    \
+       }
+
+#define QAT_SYM_AEAD_CAP(n, b, k, d, a, i)                             \
+       {                                                               \
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
+               {.sym = {                                               \
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,        \
+                       {.aead = {                                      \
+                               .algo = RTE_CRYPTO_AEAD_##n,            \
+                               b, k, d, a, i                           \
+                       }, }                                            \
+               }, }                                                    \
+       }
+
+#define QAT_SYM_CIPHER_CAP(n, b, k, i)                                 \
+       {                                                               \
+               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
+               {.sym = {                                               \
+                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,      \
+                       {.cipher = {                                    \
+                               .algo = RTE_CRYPTO_CIPHER_##n,          \
+                               b, k, i                                 \
+                       }, }                                            \
+               }, }                                                    \
+       }
+
 /*
  * Maximum number of SGL entries
  */
@@ -54,6 +115,22 @@ struct qat_sym_op_cookie {
        } opt;
 };
 
+struct qat_sym_dp_ctx {
+       struct qat_sym_session *session;
+       uint32_t tail;
+       uint32_t head;
+       uint16_t cached_enqueue;
+       uint16_t cached_dequeue;
+};
+
+uint16_t
+qat_sym_enqueue_burst(void *qp, struct rte_crypto_op **ops,
+               uint16_t nb_ops);
+
+uint16_t
+qat_sym_dequeue_burst(void *qp, struct rte_crypto_op **ops,
+               uint16_t nb_ops);
+
 int
 qat_sym_build_request(void *in_op, uint8_t *out_msg,
                void *op_cookie, enum qat_device_gen qat_dev_gen);
@@ -213,17 +290,11 @@ qat_sym_preprocess_requests(void **ops, uint16_t nb_ops)
                }
        }
 }
-#else
-
-static inline void
-qat_sym_preprocess_requests(void **ops __rte_unused,
-                               uint16_t nb_ops __rte_unused)
-{
-}
 #endif
 
-static inline void
-qat_sym_process_response(void **op, uint8_t *resp, void *op_cookie)
+static __rte_always_inline int
+qat_sym_process_response(void **op, uint8_t *resp, void *op_cookie,
+               uint64_t *dequeue_err_count __rte_unused)
 {
        struct icp_qat_fw_comn_resp *resp_msg =
                        (struct icp_qat_fw_comn_resp *)resp;
@@ -282,6 +353,12 @@ qat_sym_process_response(void **op, uint8_t *resp, void *op_cookie)
        }
 
        *op = (void *)rx_op;
+
+       /*
+        * return 1 as dequeue op only move on to the next op
+        * if one was ready to return to API
+        */
+       return 1;
 }
 
 int
@@ -293,6 +370,52 @@ qat_sym_configure_dp_ctx(struct rte_cryptodev *dev, uint16_t qp_id,
 int
 qat_sym_get_dp_ctx_size(struct rte_cryptodev *dev);
 
+void
+qat_sym_init_op_cookie(void *cookie);
+
+#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
+static __rte_always_inline void
+qat_sym_debug_log_dump(struct icp_qat_fw_la_bulk_req *qat_req,
+               struct qat_sym_session *ctx,
+               struct rte_crypto_vec *vec, uint32_t vec_len,
+               struct rte_crypto_va_iova_ptr *cipher_iv,
+               struct rte_crypto_va_iova_ptr *auth_iv,
+               struct rte_crypto_va_iova_ptr *aad,
+               struct rte_crypto_va_iova_ptr *digest)
+{
+       uint32_t i;
+
+       QAT_DP_HEXDUMP_LOG(DEBUG, "qat_req:", qat_req,
+                       sizeof(struct icp_qat_fw_la_bulk_req));
+       for (i = 0; i < vec_len; i++)
+               QAT_DP_HEXDUMP_LOG(DEBUG, "src_data:", vec[i].base, vec[i].len);
+       if (cipher_iv && ctx->cipher_iv.length > 0)
+               QAT_DP_HEXDUMP_LOG(DEBUG, "cipher iv:", cipher_iv->va,
+                               ctx->cipher_iv.length);
+       if (auth_iv && ctx->auth_iv.length > 0)
+               QAT_DP_HEXDUMP_LOG(DEBUG, "auth iv:", auth_iv->va,
+                               ctx->auth_iv.length);
+       if (aad && ctx->aad_len > 0)
+               QAT_DP_HEXDUMP_LOG(DEBUG, "aad:", aad->va,
+                               ctx->aad_len);
+       if (digest && ctx->digest_length > 0)
+               QAT_DP_HEXDUMP_LOG(DEBUG, "digest:", digest->va,
+                               ctx->digest_length);
+}
+#else
+static __rte_always_inline void
+qat_sym_debug_log_dump(struct icp_qat_fw_la_bulk_req *qat_req __rte_unused,
+               struct qat_sym_session *ctx __rte_unused,
+               struct rte_crypto_vec *vec __rte_unused,
+               uint32_t vec_len __rte_unused,
+               struct rte_crypto_va_iova_ptr *cipher_iv __rte_unused,
+               struct rte_crypto_va_iova_ptr *auth_iv __rte_unused,
+               struct rte_crypto_va_iova_ptr *aad __rte_unused,
+               struct rte_crypto_va_iova_ptr *digest __rte_unused)
+{
+}
+#endif
+
 #else
 
 static inline void
@@ -307,5 +430,5 @@ qat_sym_process_response(void **op __rte_unused, uint8_t *resp __rte_unused,
 {
 }
 
-#endif
+#endif /* BUILD_QAT_SYM */
 #endif /* _QAT_SYM_H_ */
index 792ad2b2134b05590930b2c47cf9d4b4ed453cb1..5322faff4440d23693a93a730e8ffd13f0f91265 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2020 Intel Corporation
+ * Copyright(c) 2022 Intel Corporation
  */
 
 #include <cryptodev_pmd.h>
@@ -9,18 +9,9 @@
 #include "icp_qat_fw_la.h"
 
 #include "qat_sym.h"
-#include "qat_sym_pmd.h"
 #include "qat_sym_session.h"
 #include "qat_qp.h"
 
-struct qat_sym_dp_ctx {
-       struct qat_sym_session *session;
-       uint32_t tail;
-       uint32_t head;
-       uint16_t cached_enqueue;
-       uint16_t cached_dequeue;
-};
-
 static __rte_always_inline int32_t
 qat_sym_dp_parse_data_vec(struct qat_qp *qp, struct icp_qat_fw_la_bulk_req *req,
                struct rte_crypto_vec *data, uint16_t n_data_vecs)
diff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c
deleted file mode 100644 (file)
index 63ab9a5..0000000
+++ /dev/null
@@ -1,251 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2018 Intel Corporation
- */
-
-#include <rte_bus_pci.h>
-#include <rte_common.h>
-#include <rte_dev.h>
-#include <rte_malloc.h>
-#include <rte_pci.h>
-#include <cryptodev_pmd.h>
-#ifdef RTE_LIB_SECURITY
-#include <rte_security_driver.h>
-#endif
-
-#include "qat_logs.h"
-#include "qat_crypto.h"
-#include "qat_sym.h"
-#include "qat_sym_session.h"
-#include "qat_sym_pmd.h"
-
-#define MIXED_CRYPTO_MIN_FW_VER 0x04090000
-
-extern uint8_t qat_sym_driver_id;
-
-extern struct qat_crypto_gen_dev_ops qat_sym_gen_dev_ops[QAT_N_GENS];
-
-void
-qat_sym_init_op_cookie(void *op_cookie)
-{
-       struct qat_sym_op_cookie *cookie = op_cookie;
-
-       cookie->qat_sgl_src_phys_addr =
-                       rte_mempool_virt2iova(cookie) +
-                       offsetof(struct qat_sym_op_cookie,
-                       qat_sgl_src);
-
-       cookie->qat_sgl_dst_phys_addr =
-                       rte_mempool_virt2iova(cookie) +
-                       offsetof(struct qat_sym_op_cookie,
-                       qat_sgl_dst);
-
-       cookie->opt.spc_gmac.cd_phys_addr =
-                       rte_mempool_virt2iova(cookie) +
-                       offsetof(struct qat_sym_op_cookie,
-                       opt.spc_gmac.cd_cipher);
-}
-
-static uint16_t
-qat_sym_pmd_enqueue_op_burst(void *qp, struct rte_crypto_op **ops,
-               uint16_t nb_ops)
-{
-       return qat_enqueue_op_burst(qp, NULL, (void **)ops, nb_ops);
-}
-
-static uint16_t
-qat_sym_pmd_dequeue_op_burst(void *qp, struct rte_crypto_op **ops,
-               uint16_t nb_ops)
-{
-       return qat_dequeue_op_burst(qp, (void **)ops, NULL, nb_ops);
-}
-
-/* An rte_driver is needed in the registration of both the device and the driver
- * with cryptodev.
- * The actual qat pci's rte_driver can't be used as its name represents
- * the whole pci device with all services. Think of this as a holder for a name
- * for the crypto part of the pci device.
- */
-static const char qat_sym_drv_name[] = RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD);
-static const struct rte_driver cryptodev_qat_sym_driver = {
-       .name = qat_sym_drv_name,
-       .alias = qat_sym_drv_name
-};
-
-int
-qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
-               struct qat_dev_cmd_param *qat_dev_cmd_param __rte_unused)
-{
-       int i = 0, ret = 0;
-       struct qat_device_info *qat_dev_instance =
-                       &qat_pci_devs[qat_pci_dev->qat_dev_id];
-       struct rte_cryptodev_pmd_init_params init_params = {
-               .name = "",
-               .socket_id = qat_dev_instance->pci_dev->device.numa_node,
-               .private_data_size = sizeof(struct qat_cryptodev_private)
-       };
-       char name[RTE_CRYPTODEV_NAME_MAX_LEN];
-       char capa_memz_name[RTE_CRYPTODEV_NAME_MAX_LEN];
-       struct rte_cryptodev *cryptodev;
-       struct qat_cryptodev_private *internals;
-       struct qat_capabilities_info capa_info;
-       const struct rte_cryptodev_capabilities *capabilities;
-       const struct qat_crypto_gen_dev_ops *gen_dev_ops =
-               &qat_sym_gen_dev_ops[qat_pci_dev->qat_dev_gen];
-       uint64_t capa_size;
-
-       snprintf(name, RTE_CRYPTODEV_NAME_MAX_LEN, "%s_%s",
-                       qat_pci_dev->name, "sym");
-       QAT_LOG(DEBUG, "Creating QAT SYM device %s", name);
-
-       if (gen_dev_ops->cryptodev_ops == NULL) {
-               QAT_LOG(ERR, "Device %s does not support symmetric crypto",
-                               name);
-               return -EFAULT;
-       }
-
-       /*
-        * All processes must use same driver id so they can share sessions.
-        * Store driver_id so we can validate that all processes have the same
-        * value, typically they have, but could differ if binaries built
-        * separately.
-        */
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               qat_pci_dev->qat_sym_driver_id =
-                               qat_sym_driver_id;
-       } else if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
-               if (qat_pci_dev->qat_sym_driver_id !=
-                               qat_sym_driver_id) {
-                       QAT_LOG(ERR,
-                               "Device %s have different driver id than corresponding device in primary process",
-                               name);
-                       return -(EFAULT);
-               }
-       }
-
-       /* Populate subset device to use in cryptodev device creation */
-       qat_dev_instance->sym_rte_dev.driver = &cryptodev_qat_sym_driver;
-       qat_dev_instance->sym_rte_dev.numa_node =
-                       qat_dev_instance->pci_dev->device.numa_node;
-       qat_dev_instance->sym_rte_dev.devargs = NULL;
-
-       cryptodev = rte_cryptodev_pmd_create(name,
-                       &(qat_dev_instance->sym_rte_dev), &init_params);
-
-       if (cryptodev == NULL)
-               return -ENODEV;
-
-       qat_dev_instance->sym_rte_dev.name = cryptodev->data->name;
-       cryptodev->driver_id = qat_sym_driver_id;
-       cryptodev->dev_ops = gen_dev_ops->cryptodev_ops;
-
-       cryptodev->enqueue_burst = qat_sym_pmd_enqueue_op_burst;
-       cryptodev->dequeue_burst = qat_sym_pmd_dequeue_op_burst;
-
-       cryptodev->feature_flags = gen_dev_ops->get_feature_flags(qat_pci_dev);
-
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return 0;
-
-#ifdef RTE_LIB_SECURITY
-       if (gen_dev_ops->create_security_ctx) {
-               cryptodev->security_ctx =
-                       gen_dev_ops->create_security_ctx((void *)cryptodev);
-               if (cryptodev->security_ctx == NULL) {
-                       QAT_LOG(ERR, "rte_security_ctx memory alloc failed");
-                       ret = -ENOMEM;
-                       goto error;
-               }
-
-               cryptodev->feature_flags |= RTE_CRYPTODEV_FF_SECURITY;
-               QAT_LOG(INFO, "Device %s rte_security support enabled", name);
-       } else
-               QAT_LOG(INFO, "Device %s rte_security support disabled", name);
-
-#endif
-       snprintf(capa_memz_name, RTE_CRYPTODEV_NAME_MAX_LEN,
-                       "QAT_SYM_CAPA_GEN_%d",
-                       qat_pci_dev->qat_dev_gen);
-
-       internals = cryptodev->data->dev_private;
-       internals->qat_dev = qat_pci_dev;
-       internals->service_type = QAT_SERVICE_SYMMETRIC;
-       internals->dev_id = cryptodev->data->dev_id;
-
-       capa_info = gen_dev_ops->get_capabilities(qat_pci_dev);
-       capabilities = capa_info.data;
-       capa_size = capa_info.size;
-
-       internals->capa_mz = rte_memzone_lookup(capa_memz_name);
-       if (internals->capa_mz == NULL) {
-               internals->capa_mz = rte_memzone_reserve(capa_memz_name,
-                               capa_size, rte_socket_id(), 0);
-               if (internals->capa_mz == NULL) {
-                       QAT_LOG(DEBUG,
-                               "Error allocating capability memzon for %s",
-                               name);
-                       ret = -EFAULT;
-                       goto error;
-               }
-       }
-
-       memcpy(internals->capa_mz->addr, capabilities, capa_size);
-       internals->qat_dev_capabilities = internals->capa_mz->addr;
-
-       while (1) {
-               if (qat_dev_cmd_param[i].name == NULL)
-                       break;
-               if (!strcmp(qat_dev_cmd_param[i].name, SYM_ENQ_THRESHOLD_NAME))
-                       internals->min_enq_burst_threshold =
-                                       qat_dev_cmd_param[i].val;
-               i++;
-       }
-
-       qat_pci_dev->sym_dev = internals;
-       QAT_LOG(DEBUG, "Created QAT SYM device %s as cryptodev instance %d",
-                       cryptodev->data->name, internals->dev_id);
-
-       rte_cryptodev_pmd_probing_finish(cryptodev);
-
-       return 0;
-
-error:
-#ifdef RTE_LIB_SECURITY
-       rte_free(cryptodev->security_ctx);
-       cryptodev->security_ctx = NULL;
-#endif
-       rte_cryptodev_pmd_destroy(cryptodev);
-       memset(&qat_dev_instance->sym_rte_dev, 0,
-               sizeof(qat_dev_instance->sym_rte_dev));
-
-       return ret;
-}
-
-int
-qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev)
-{
-       struct rte_cryptodev *cryptodev;
-
-       if (qat_pci_dev == NULL)
-               return -ENODEV;
-       if (qat_pci_dev->sym_dev == NULL)
-               return 0;
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               rte_memzone_free(qat_pci_dev->sym_dev->capa_mz);
-
-       /* free crypto device */
-       cryptodev = rte_cryptodev_pmd_get_dev(qat_pci_dev->sym_dev->dev_id);
-#ifdef RTE_LIB_SECURITY
-       rte_free(cryptodev->security_ctx);
-       cryptodev->security_ctx = NULL;
-#endif
-       rte_cryptodev_pmd_destroy(cryptodev);
-       qat_pci_devs[qat_pci_dev->qat_dev_id].sym_rte_dev.name = NULL;
-       qat_pci_dev->sym_dev = NULL;
-
-       return 0;
-}
-
-static struct cryptodev_driver qat_crypto_drv;
-RTE_PMD_REGISTER_CRYPTO_DRIVER(qat_crypto_drv,
-               cryptodev_qat_sym_driver,
-               qat_sym_driver_id);
diff --git a/drivers/crypto/qat/qat_sym_pmd.h b/drivers/crypto/qat/qat_sym_pmd.h
deleted file mode 100644 (file)
index 59fbdef..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2018 Intel Corporation
- */
-
-#ifndef _QAT_SYM_PMD_H_
-#define _QAT_SYM_PMD_H_
-
-#ifdef BUILD_QAT_SYM
-
-#include <rte_ether.h>
-#include <rte_cryptodev.h>
-#ifdef RTE_LIB_SECURITY
-#include <rte_security.h>
-#endif
-
-#include "qat_crypto.h"
-#include "qat_device.h"
-
-/** Intel(R) QAT Symmetric Crypto PMD name */
-#define CRYPTODEV_NAME_QAT_SYM_PMD     crypto_qat
-
-/* Internal capabilities */
-#define QAT_SYM_CAP_MIXED_CRYPTO       (1 << 0)
-#define QAT_SYM_CAP_VALID              (1 << 31)
-
-/**
- * Macro to add a sym capability
- * helper function to add an sym capability
- * <n: name> <b: block size> <k: key size> <d: digest size>
- * <a: aad_size> <i: iv_size>
- **/
-#define QAT_SYM_PLAIN_AUTH_CAP(n, b, d)                                        \
-       {                                                               \
-               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
-               {.sym = {                                               \
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,        \
-                       {.auth = {                                      \
-                               .algo = RTE_CRYPTO_AUTH_##n,            \
-                               b, d                                    \
-                       }, }                                            \
-               }, }                                                    \
-       }
-
-#define QAT_SYM_AUTH_CAP(n, b, k, d, a, i)                             \
-       {                                                               \
-               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
-               {.sym = {                                               \
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,        \
-                       {.auth = {                                      \
-                               .algo = RTE_CRYPTO_AUTH_##n,            \
-                               b, k, d, a, i                           \
-                       }, }                                            \
-               }, }                                                    \
-       }
-
-#define QAT_SYM_AEAD_CAP(n, b, k, d, a, i)                             \
-       {                                                               \
-               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
-               {.sym = {                                               \
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,        \
-                       {.aead = {                                      \
-                               .algo = RTE_CRYPTO_AEAD_##n,            \
-                               b, k, d, a, i                           \
-                       }, }                                            \
-               }, }                                                    \
-       }
-
-#define QAT_SYM_CIPHER_CAP(n, b, k, i)                                 \
-       {                                                               \
-               .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,                     \
-               {.sym = {                                               \
-                       .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,      \
-                       {.cipher = {                                    \
-                               .algo = RTE_CRYPTO_CIPHER_##n,          \
-                               b, k, i                                 \
-                       }, }                                            \
-               }, }                                                    \
-       }
-
-extern uint8_t qat_sym_driver_id;
-
-extern struct qat_crypto_gen_dev_ops qat_sym_gen_dev_ops[];
-
-int
-qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
-               struct qat_dev_cmd_param *qat_dev_cmd_param);
-
-int
-qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev);
-
-void
-qat_sym_init_op_cookie(void *op_cookie);
-
-#endif
-#endif /* _QAT_SYM_PMD_H_ */
index 3a880096c4c65d942f8b49a1ee96f2c9d577a0c8..9d6a19c0bee758817a9874cad8261ea260817597 100644 (file)
@@ -20,7 +20,7 @@
 
 #include "qat_logs.h"
 #include "qat_sym_session.h"
-#include "qat_sym_pmd.h"
+#include "qat_sym.h"
 
 /* SHA1 - 20 bytes - Initialiser state can be found in FIPS stds 180-2 */
 static const uint8_t sha1InitialState[] = {