net/hns3: fix copyright date

[dpdk.git] / drivers / crypto / qat / qat_sym_pmd.c

diff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c
index f6f9f5b..93666fd 100644 (file)
--- a/drivers/crypto/qat/qat_sym_pmd.c
+++ b/drivers/crypto/qat/qat_sym_pmd.c
@@ -8,7 +8,7 @@
 #include <rte_malloc.h>
 #include <rte_pci.h>
 #include <rte_cryptodev_pmd.h>
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 #include <rte_security_driver.h>
 #endif
 
@@ -35,10 +35,11 @@ static const struct rte_cryptodev_capabilities qat_gen2_sym_capabilities[] = {
 static const struct rte_cryptodev_capabilities qat_gen3_sym_capabilities[] = {
        QAT_BASE_GEN1_SYM_CAPABILITIES,
        QAT_EXTRA_GEN2_SYM_CAPABILITIES,
+       QAT_EXTRA_GEN3_SYM_CAPABILITIES,
        RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
 };
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static const struct rte_cryptodev_capabilities
                                        qat_security_sym_capabilities[] = {
        QAT_SECURITY_SYM_CAPABILITIES,
@@ -180,7 +181,6 @@ static int qat_sym_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
        }
 
        qat_qp_conf.hw = qp_hw_data;
-       qat_qp_conf.build_request = qat_sym_build_request;
        qat_qp_conf.cookie_size = sizeof(struct qat_sym_op_cookie);
        qat_qp_conf.nb_descriptors = qp_conf->nb_descriptors;
        qat_qp_conf.socket_id = socket_id;
@@ -258,10 +258,14 @@ static struct rte_cryptodev_ops crypto_qat_ops = {
                /* Crypto related operations */
                .sym_session_get_size   = qat_sym_session_get_private_size,
                .sym_session_configure  = qat_sym_session_configure,
-               .sym_session_clear      = qat_sym_session_clear
+               .sym_session_clear      = qat_sym_session_clear,
+
+               /* Raw data-path API related operations */
+               .sym_get_raw_dp_ctx_size = qat_sym_get_dp_ctx_size,
+               .sym_configure_raw_dp_ctx = qat_sym_configure_dp_ctx,
 };
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
 static const struct rte_security_capability *
 qat_security_cap_get(void *device __rte_unused)
 {
@@ -309,7 +313,7 @@ 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;
+       int i = 0, ret = 0;
        struct qat_device_info *qat_dev_instance =
                        &qat_pci_devs[qat_pci_dev->qat_dev_id];
 
@@ -326,6 +330,10 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
        const struct rte_cryptodev_capabilities *capabilities;
        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);
+
        /*
         * 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
@@ -345,14 +353,6 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
                }
        }
 
-#ifdef RTE_LIBRTE_SECURITY
-       struct rte_security_ctx *security_instance;
-#endif
-
-       snprintf(name, RTE_CRYPTODEV_NAME_MAX_LEN, "%s_%s",
-                       qat_pci_dev->name, "sym");
-       QAT_LOG(DEBUG, "Creating QAT SYM device %s", name);
-
        /* 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 =
@@ -381,7 +381,7 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
                        RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT |
                        RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
                        RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED |
-                       RTE_CRYPTODEV_FF_SECURITY;
+                       RTE_CRYPTODEV_FF_SYM_RAW_DP;
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
@@ -390,20 +390,22 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
                        "QAT_SYM_CAPA_GEN_%d",
                        qat_pci_dev->qat_dev_gen);
 
-#ifdef RTE_LIBRTE_SECURITY
+#ifdef RTE_LIB_SECURITY
+       struct rte_security_ctx *security_instance;
        security_instance = rte_malloc("qat_sec",
                                sizeof(struct rte_security_ctx),
                                RTE_CACHE_LINE_SIZE);
        if (security_instance == NULL) {
                QAT_LOG(ERR, "rte_security_ctx memory alloc failed");
-               rte_cryptodev_pmd_destroy(cryptodev);
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto error;
        }
 
        security_instance->device = (void *)cryptodev;
        security_instance->ops = &security_qat_ops;
        security_instance->sess_cnt = 0;
        cryptodev->security_ctx = security_instance;
+       cryptodev->feature_flags |= RTE_CRYPTODEV_FF_SECURITY;
 #endif
 
        internals = cryptodev->data->dev_private;
@@ -427,10 +429,8 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
                QAT_LOG(DEBUG,
                        "QAT gen %d capabilities unknown",
                        qat_pci_dev->qat_dev_gen);
-               rte_cryptodev_pmd_destroy(cryptodev);
-               memset(&qat_dev_instance->sym_rte_dev, 0,
-                       sizeof(qat_dev_instance->sym_rte_dev));
-               return -(EINVAL);
+               ret = -(EINVAL);
+               goto error;
        }
 
        internals->capa_mz = rte_memzone_lookup(capa_memz_name);
@@ -441,12 +441,11 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
        }
        if (internals->capa_mz == NULL) {
                QAT_LOG(DEBUG,
-                       "Error allocating memzone for capabilities, destroying PMD for %s",
+                       "Error allocating memzone for capabilities, destroying "
+                       "PMD for %s",
                        name);
-               rte_cryptodev_pmd_destroy(cryptodev);
-               memset(&qat_dev_instance->sym_rte_dev, 0,
-                       sizeof(qat_dev_instance->sym_rte_dev));
-               return -EFAULT;
+               ret = -EFAULT;
+               goto error;
        }
 
        memcpy(internals->capa_mz->addr, capabilities, capa_size);
@@ -466,6 +465,17 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev,
                        cryptodev->data->name, internals->sym_dev_id);
 
        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
@@ -482,8 +492,9 @@ qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev)
 
        /* free crypto device */
        cryptodev = rte_cryptodev_pmd_get_dev(qat_pci_dev->sym_dev->sym_dev_id);
-#ifdef RTE_LIBRTE_SECURITY
+#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;