New upstream version 17.08

[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 2fb285c..33f9eed 100644 (file)
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c
@@ -2,7 +2,7 @@
  *   BSD LICENSE
  *
  *   Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright (c) 2016 NXP. All rights reserved.
+ *   Copyright 2016 NXP.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -53,29 +53,20 @@
 #include "portal/dpaa2_hw_pvt.h"
 #include "portal/dpaa2_hw_dpio.h"
 
-TAILQ_HEAD(dpbp_device_list, dpaa2_dpbp_dev);
-static struct dpbp_device_list *dpbp_dev_list; /*!< DPBP device list */
+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 */
 
-int
-dpaa2_create_dpbp_device(
-               int dpbp_id)
+static int
+dpaa2_create_dpbp_device(struct fslmc_vfio_device *vdev __rte_unused,
+                        struct vfio_device_info *obj_info __rte_unused,
+                        int dpbp_id)
 {
        struct dpaa2_dpbp_dev *dpbp_node;
        int ret;
 
-       if (!dpbp_dev_list) {
-               dpbp_dev_list = malloc(sizeof(struct dpbp_device_list));
-               if (!dpbp_dev_list) {
-                       PMD_INIT_LOG(ERR, "Memory alloc failed in DPBP list\n");
-                       return -1;
-               }
-               /* Initialize the DPBP List */
-               TAILQ_INIT(dpbp_dev_list);
-       }
-
        /* Allocate DPAA2 dpbp handle */
-       dpbp_node = (struct dpaa2_dpbp_dev *)
-                       malloc(sizeof(struct dpaa2_dpbp_dev));
+       dpbp_node = rte_malloc(NULL, sizeof(struct dpaa2_dpbp_dev), 0);
        if (!dpbp_node) {
                PMD_INIT_LOG(ERR, "Memory allocation failed for DPBP Device");
                return -1;
@@ -88,7 +79,7 @@ dpaa2_create_dpbp_device(
        if (ret) {
                PMD_INIT_LOG(ERR, "Resource alloc failure with err code: %d",
                             ret);
-               free(dpbp_node);
+               rte_free(dpbp_node);
                return -1;
        }
 
@@ -98,16 +89,16 @@ dpaa2_create_dpbp_device(
                PMD_INIT_LOG(ERR, "Failure cleaning dpbp device with"
                                        " error code %d\n", ret);
                dpbp_close(&dpbp_node->dpbp, CMD_PRI_LOW, dpbp_node->token);
-               free(dpbp_node);
+               rte_free(dpbp_node);
                return -1;
        }
 
        dpbp_node->dpbp_id = dpbp_id;
        rte_atomic16_init(&dpbp_node->in_use);
 
-       TAILQ_INSERT_HEAD(dpbp_dev_list, dpbp_node, next);
+       TAILQ_INSERT_TAIL(&dpbp_dev_list, dpbp_node, next);
 
-       PMD_INIT_LOG(DEBUG, "Buffer pool resource initialized %d", dpbp_id);
+       PMD_INIT_LOG(DEBUG, "DPAA2: Added [dpbp.%d]", dpbp_id);
 
        return 0;
 }
@@ -117,7 +108,7 @@ struct dpaa2_dpbp_dev *dpaa2_alloc_dpbp_dev(void)
        struct dpaa2_dpbp_dev *dpbp_dev = NULL;
 
        /* Get DPBP dev handle from list using index */
-       TAILQ_FOREACH(dpbp_dev, dpbp_dev_list, next) {
+       TAILQ_FOREACH(dpbp_dev, &dpbp_dev_list, next) {
                if (dpbp_dev && rte_atomic16_test_and_set(&dpbp_dev->in_use))
                        break;
        }
@@ -130,10 +121,17 @@ void dpaa2_free_dpbp_dev(struct dpaa2_dpbp_dev *dpbp)
        struct dpaa2_dpbp_dev *dpbp_dev = NULL;
 
        /* Match DPBP handle and mark it free */
-       TAILQ_FOREACH(dpbp_dev, dpbp_dev_list, next) {
+       TAILQ_FOREACH(dpbp_dev, &dpbp_dev_list, next) {
                if (dpbp_dev == dpbp) {
                        rte_atomic16_dec(&dpbp_dev->in_use);
                        return;
                }
        }
 }
+
+static struct rte_dpaa2_object rte_dpaa2_dpbp_obj = {
+       .object_id = DPAA2_MC_DPBP_DEVID,
+       .create = dpaa2_create_dpbp_device,
+};
+
+RTE_PMD_REGISTER_DPAA2_OBJECT(dpbp, rte_dpaa2_dpbp_obj);