New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / bus / fslmc / portal / dpaa2_hw_dpbp.c

diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
index 334e1f5..db49d63 100644 (file)
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.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>
@@ -45,7 +19,8 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
+#include <rte_mbuf_pool_ops.h>
 
 #include <fslmc_logs.h>
 #include <rte_fslmc.h>
@@ -53,6 +28,13 @@
 #include "portal/dpaa2_hw_pvt.h"
 #include "portal/dpaa2_hw_dpio.h"
 
+/* List of all the memseg information locally maintained in dpaa2 driver. This
+ * is to optimize the PA_to_VA searches until a better mechanism (algo) is
+ * available.
+ */
+struct dpaa2_memseg_list rte_dpaa2_memsegs
+       = TAILQ_HEAD_INITIALIZER(rte_dpaa2_memsegs);
+
 TAILQ_HEAD(dpbp_dev_list, dpaa2_dpbp_dev);
 static struct dpbp_dev_list dpbp_dev_list
        = TAILQ_HEAD_INITIALIZER(dpbp_dev_list); /*!< DPBP device list */
@@ -64,11 +46,12 @@ dpaa2_create_dpbp_device(int vdev_fd __rte_unused,
 {
        struct dpaa2_dpbp_dev *dpbp_node;
        int ret;
+       static int register_once;
 
        /* Allocate DPAA2 dpbp handle */
        dpbp_node = rte_malloc(NULL, sizeof(struct dpaa2_dpbp_dev), 0);
        if (!dpbp_node) {
-               PMD_INIT_LOG(ERR, "Memory allocation failed for DPBP Device");
+               DPAA2_BUS_ERR("Memory allocation failed for DPBP Device");
                return -1;
        }
 
@@ -77,8 +60,8 @@ dpaa2_create_dpbp_device(int vdev_fd __rte_unused,
        ret = dpbp_open(&dpbp_node->dpbp,
                        CMD_PRI_LOW, dpbp_id, &dpbp_node->token);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Resource alloc failure with err code: %d",
-                            ret);
+               DPAA2_BUS_ERR("Unable to open buffer pool object: err(%d)",
+                             ret);
                rte_free(dpbp_node);
                return -1;
        }
@@ -86,8 +69,8 @@ dpaa2_create_dpbp_device(int vdev_fd __rte_unused,
        /* Clean the device first */
        ret = dpbp_reset(&dpbp_node->dpbp, CMD_PRI_LOW, dpbp_node->token);
        if (ret) {
-               PMD_INIT_LOG(ERR, "Failure cleaning dpbp device with"
-                                       " error code %d\n", ret);
+               DPAA2_BUS_ERR("Unable to reset buffer pool device. err(%d)",
+                             ret);
                dpbp_close(&dpbp_node->dpbp, CMD_PRI_LOW, dpbp_node->token);
                rte_free(dpbp_node);
                return -1;
@@ -98,7 +81,10 @@ dpaa2_create_dpbp_device(int vdev_fd __rte_unused,
 
        TAILQ_INSERT_TAIL(&dpbp_dev_list, dpbp_node, next);
 
-       RTE_LOG(DEBUG, PMD, "DPAA2: Added [dpbp.%d]\n", dpbp_id);
+       if (!register_once) {
+               rte_mbuf_set_platform_mempool_ops(DPAA2_MEMPOOL_OPS_NAME);
+               register_once = 1;
+       }
 
        return 0;
 }