net/bnxt: update TruFlow resource allocation numbers

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

diff --git a/drivers/crypto/qat/qat_asym_pmd.c b/drivers/crypto/qat/qat_asym_pmd.c
index cc448cd..968ec54 100644 (file)
--- a/drivers/crypto/qat/qat_asym_pmd.c
+++ b/drivers/crypto/qat/qat_asym_pmd.c
@@ -11,7 +11,7 @@
 #include "qat_sym_capabilities.h"
 #include "qat_asym_capabilities.h"
 
-uint8_t cryptodev_qat_asym_driver_id;
+uint8_t qat_asym_driver_id;
 
 static const struct rte_cryptodev_capabilities qat_gen1_asym_capabilities[] = {
        QAT_BASE_GEN1_ASYM_CAPABILITIES,
@@ -63,7 +63,7 @@ static void qat_asym_dev_info_get(struct rte_cryptodev *dev,
                                                        QAT_SERVICE_ASYMMETRIC);
                info->feature_flags = dev->feature_flags;
                info->capabilities = internals->qat_dev_capabilities;
-               info->driver_id = cryptodev_qat_asym_driver_id;
+               info->driver_id = qat_asym_driver_id;
                /* No limit of number of sessions */
                info->sym.max_nb_sessions = 0;
        }
@@ -248,9 +248,23 @@ qat_asym_dev_create(struct qat_pci_device *qat_pci_dev,
                        .private_data_size = sizeof(struct qat_asym_dev_private)
        };
        char name[RTE_CRYPTODEV_NAME_MAX_LEN];
+       char capa_memz_name[RTE_CRYPTODEV_NAME_MAX_LEN];
        struct rte_cryptodev *cryptodev;
        struct qat_asym_dev_private *internals;
 
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+               qat_pci_dev->qat_asym_driver_id =
+                               qat_asym_driver_id;
+       } else if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+               if (qat_pci_dev->qat_asym_driver_id !=
+                               qat_asym_driver_id) {
+                       QAT_LOG(ERR,
+                               "Device %s have different driver id than corresponding device in primary process",
+                               name);
+                       return -(EFAULT);
+               }
+       }
+
        snprintf(name, RTE_CRYPTODEV_NAME_MAX_LEN, "%s_%s",
                        qat_pci_dev->name, "asym");
        QAT_LOG(DEBUG, "Creating QAT ASYM device %s\n", name);
@@ -268,7 +282,7 @@ qat_asym_dev_create(struct qat_pci_device *qat_pci_dev,
                return -ENODEV;
 
        qat_dev_instance->asym_rte_dev.name = cryptodev->data->name;
-       cryptodev->driver_id = cryptodev_qat_asym_driver_id;
+       cryptodev->driver_id = qat_asym_driver_id;
        cryptodev->dev_ops = &crypto_qat_ops;
 
        cryptodev->enqueue_burst = qat_asym_pmd_enqueue_op_burst;
@@ -283,11 +297,35 @@ qat_asym_dev_create(struct qat_pci_device *qat_pci_dev,
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
+       snprintf(capa_memz_name, RTE_CRYPTODEV_NAME_MAX_LEN,
+                       "QAT_ASYM_CAPA_GEN_%d",
+                       qat_pci_dev->qat_dev_gen);
+
        internals = cryptodev->data->dev_private;
        internals->qat_dev = qat_pci_dev;
        internals->asym_dev_id = cryptodev->data->dev_id;
        internals->qat_dev_capabilities = qat_gen1_asym_capabilities;
 
+       internals->capa_mz = rte_memzone_lookup(capa_memz_name);
+       if (internals->capa_mz == NULL) {
+               internals->capa_mz = rte_memzone_reserve(capa_memz_name,
+                       sizeof(qat_gen1_asym_capabilities),
+                       rte_socket_id(), 0);
+       }
+       if (internals->capa_mz == NULL) {
+               QAT_LOG(DEBUG,
+                       "Error allocating memzone for capabilities, destroying PMD for %s",
+                       name);
+               rte_cryptodev_pmd_destroy(cryptodev);
+               memset(&qat_dev_instance->asym_rte_dev, 0,
+                       sizeof(qat_dev_instance->asym_rte_dev));
+               return -EFAULT;
+       }
+
+       memcpy(internals->capa_mz->addr, qat_gen1_asym_capabilities,
+                       sizeof(qat_gen1_asym_capabilities));
+       internals->qat_dev_capabilities = internals->capa_mz->addr;
+
        while (1) {
                if (qat_dev_cmd_param[i].name == NULL)
                        break;
@@ -312,6 +350,8 @@ qat_asym_dev_destroy(struct qat_pci_device *qat_pci_dev)
                return -ENODEV;
        if (qat_pci_dev->asym_dev == NULL)
                return 0;
+       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+               rte_memzone_free(qat_pci_dev->asym_dev->capa_mz);
 
        /* free crypto device */
        cryptodev = rte_cryptodev_pmd_get_dev(
@@ -326,4 +366,4 @@ qat_asym_dev_destroy(struct qat_pci_device *qat_pci_dev)
 static struct cryptodev_driver qat_crypto_drv;
 RTE_PMD_REGISTER_CRYPTO_DRIVER(qat_crypto_drv,
                cryptodev_qat_asym_driver,
-               cryptodev_qat_asym_driver_id);
+               qat_asym_driver_id);