New upstream version 18.02

[deb_dpdk.git] / drivers / mempool / dpaa2 / dpaa2_hw_mempool.c

diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
index 6df203f..2bd62e8 100644 (file)
--- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
+++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c
@@ -1,34 +1,8 @@
-/*-
- *   BSD LICENSE
+/* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2016 NXP.
+ *   Copyright 2016 NXP
  *
- *   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 Freescale Semiconductor, Inc 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.
  */
 
 #include <unistd.h>
@@ -40,7 +14,7 @@
 #include <errno.h>
 
 #include <rte_mbuf.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
@@ -65,7 +39,7 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
        struct dpaa2_bp_info *bp_info;
        struct dpbp_attr dpbp_attr;
        uint32_t bpid;
-       int ret, p_ret;
+       int ret;
 
        avail_dpbp = dpaa2_alloc_dpbp_dev();
 
@@ -78,7 +52,7 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
                ret = dpaa2_affine_qbman_swp();
                if (ret) {
                        RTE_LOG(ERR, PMD, "Failure in affining portal\n");
-                       return ret;
+                       goto err1;
                }
        }
 
@@ -86,7 +60,7 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
        if (ret != 0) {
                PMD_INIT_LOG(ERR, "Resource enable failure with"
                        " err code: %d\n", ret);
-               return ret;
+               goto err1;
        }
 
        ret = dpbp_get_attributes(&avail_dpbp->dpbp, CMD_PRI_LOW,
@@ -94,10 +68,16 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
        if (ret != 0) {
                PMD_INIT_LOG(ERR, "Resource read failure with"
                             " err code: %d\n", ret);
-               p_ret = ret;
-               ret = dpbp_disable(&avail_dpbp->dpbp, CMD_PRI_LOW,
-                                  avail_dpbp->token);
-               return p_ret;
+               goto err2;
+       }
+
+       bp_info = rte_malloc(NULL,
+                            sizeof(struct dpaa2_bp_info),
+                            RTE_CACHE_LINE_SIZE);
+       if (!bp_info) {
+               PMD_INIT_LOG(ERR, "No heap memory available for bp_info");
+               ret = -ENOMEM;
+               goto err2;
        }
 
        /* Allocate the bp_list which will be added into global_bp_list */
@@ -105,7 +85,8 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
                             RTE_CACHE_LINE_SIZE);
        if (!bp_list) {
                PMD_INIT_LOG(ERR, "No heap memory available");
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto err3;
        }
 
        /* Set parameters of buffer pool list */
@@ -127,9 +108,6 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
        rte_dpaa2_bpid_info[bpid].bp_list = bp_list;
        rte_dpaa2_bpid_info[bpid].bpid = bpid;
 
-       bp_info = rte_malloc(NULL,
-                            sizeof(struct dpaa2_bp_info),
-                            RTE_CACHE_LINE_SIZE);
        rte_memcpy(bp_info, (void *)&rte_dpaa2_bpid_info[bpid],
                   sizeof(struct dpaa2_bp_info));
        mp->pool_data = (void *)bp_info;
@@ -138,6 +116,14 @@ rte_hw_mbuf_create_pool(struct rte_mempool *mp)
 
        h_bp_list = bp_list;
        return 0;
+err3:
+       rte_free(bp_info);
+err2:
+       dpbp_disable(&avail_dpbp->dpbp, CMD_PRI_LOW, avail_dpbp->token);
+err1:
+       dpaa2_free_dpbp_dev(avail_dpbp);
+
+       return ret;
 }
 
 static void
@@ -213,7 +199,7 @@ rte_dpaa2_mbuf_release(struct rte_mempool *pool __rte_unused,
        /* convert mbuf to buffers for the remainder */
        for (i = 0; i < n ; i++) {
 #ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
-               bufs[i] = (uint64_t)rte_mempool_virt2phy(pool, obj_table[i])
+               bufs[i] = (uint64_t)rte_mempool_virt2iova(obj_table[i])
                                + meta_data_size;
 #else
                bufs[i] = (uint64_t)obj_table[i] + meta_data_size;
@@ -232,7 +218,7 @@ aligned:
                for (i = 0; i < DPAA2_MBUF_MAX_ACQ_REL; i++) {
 #ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
                        bufs[i] = (uint64_t)
-                                 rte_mempool_virt2phy(pool, obj_table[n + i])
+                                 rte_mempool_virt2iova(obj_table[n + i])
                                  + meta_data_size;
 #else
                        bufs[i] = (uint64_t)obj_table[n + i] + meta_data_size;
@@ -368,7 +354,7 @@ rte_hw_mbuf_get_count(const struct rte_mempool *mp)
 }
 
 struct rte_mempool_ops dpaa2_mpool_ops = {
-       .name = "dpaa2",
+       .name = DPAA2_MEMPOOL_OPS_NAME,
        .alloc = rte_hw_mbuf_create_pool,
        .free = rte_hw_mbuf_free_pool,
        .enqueue = rte_hw_mbuf_free_bulk,