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 814ba17..7fea10c 100644 (file)
--- a/drivers/crypto/qat/qat_qp.c
+++ b/drivers/crypto/qat/qat_qp.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2015 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2018 Intel Corporation
  */
 
 #include <rte_common.h>
@@ -83,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);
@@ -107,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,
@@ -180,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;
@@ -221,21 +178,19 @@ 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 =
                                qp->op_cookies[i];
 
                sql_cookie->qat_sgl_src_phys_addr =
-                               rte_mempool_virt2phy(qp->op_cookie_pool,
-                               sql_cookie) +
+                               rte_mempool_virt2iova(sql_cookie) +
                                offsetof(struct qat_crypto_op_cookie,
                                qat_sgl_list_src);
 
                sql_cookie->qat_sgl_dst_phys_addr =
-                               rte_mempool_virt2phy(qp->op_cookie_pool,
-                               sql_cookie) +
+                               rte_mempool_virt2iova(sql_cookie) +
                                offsetof(struct qat_crypto_op_cookie,
                                qat_sgl_list_dst);
        }
@@ -248,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;
 }
@@ -373,7 +331,7 @@ qat_queue_create(struct rte_cryptodev *dev, struct qat_queue *queue,
        }
 
        queue->base_addr = (char *)qp_mz->addr;
-       queue->base_phys_addr = qp_mz->phys_addr;
+       queue->base_phys_addr = qp_mz->iova;
        if (qat_qp_check_queue_alignment(queue->base_phys_addr,
                        queue_size_bytes)) {
                PMD_DRV_LOG(ERR, "Invalid alignment on queue create "