crypto/qat: use SPDX license

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

diff --git a/drivers/crypto/qat/qat_qp.c b/drivers/crypto/qat/qat_qp.c
index 0941a58..7fea10c 100644 (file)
--- a/drivers/crypto/qat/qat_qp.c
+++ b/drivers/crypto/qat/qat_qp.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2015 Intel Corporation
+ * Copyright(c) 2015-2018 Intel Corporation
  */
 
 #include <rte_common.h>
@@ -54,8 +54,6 @@ queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
                        int socket_id)
 {
        const struct rte_memzone *mz;
-       unsigned memzone_flags = 0;
-       const struct rte_memseg *ms;
 
        PMD_INIT_FUNC_TRACE();
        mz = rte_memzone_lookup(queue_name);
@@ -78,25 +76,8 @@ queue_dma_zone_reserve(const char *queue_name, uint32_t queue_size,
 
        PMD_DRV_LOG(DEBUG, "Allocate memzone for %s, size %u on socket %u",
                                        queue_name, queue_size, socket_id);
-       ms = rte_eal_get_physmem_layout();
-       switch (ms[0].hugepage_sz) {
-       case(RTE_PGSIZE_2M):
-               memzone_flags = RTE_MEMZONE_2MB;
-       break;
-       case(RTE_PGSIZE_1G):
-               memzone_flags = RTE_MEMZONE_1GB;
-       break;
-       case(RTE_PGSIZE_16M):
-               memzone_flags = RTE_MEMZONE_16MB;
-       break;
-       case(RTE_PGSIZE_16G):
-               memzone_flags = RTE_MEMZONE_16GB;
-       break;
-       default:
-               memzone_flags = RTE_MEMZONE_SIZE_HINT_ONLY;
-       }
-       return rte_memzone_reserve_aligned(queue_name, queue_size, socket_id,
-               memzone_flags, queue_size);
+       return rte_memzone_reserve_aligned(queue_name, queue_size,
+               socket_id, RTE_MEMZONE_IOVA_CONTIG, queue_size);
 }
 
 int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
@@ -151,6 +132,11 @@ int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
        qp->op_cookies = rte_zmalloc("qat PMD op cookie pointer",
                        qp_conf->nb_descriptors * sizeof(*qp->op_cookies),
                        RTE_CACHE_LINE_SIZE);
+       if (qp->op_cookies == NULL) {
+               PMD_DRV_LOG(ERR, "Failed to alloc mem for cookie");
+               rte_free(qp);
+               return -ENOMEM;
+       }
 
        qp->mmap_bar_addr = pci_dev->mem_resource[0].addr;
        qp->inflights16 = 0;
@@ -192,7 +178,7 @@ int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
        for (i = 0; i < qp->nb_descriptors; i++) {
                if (rte_mempool_get(qp->op_cookie_pool, &qp->op_cookies[i])) {
                        PMD_DRV_LOG(ERR, "QAT PMD Cannot get op_cookie");
-                       return -EFAULT;
+                       goto create_err;
                }
 
                struct qat_crypto_op_cookie *sql_cookie =
@@ -217,6 +203,9 @@ int qat_crypto_sym_qp_setup(struct rte_cryptodev *dev, uint16_t queue_pair_id,
        return 0;
 
 create_err:
+       if (qp->op_cookie_pool)
+               rte_mempool_free(qp->op_cookie_pool);
+       rte_free(qp->op_cookies);
        rte_free(qp);
        return -EFAULT;
 }