event/dpaa2: support destroy

[dpdk.git] / drivers / event / dpaa2 / dpaa2_eventdev.c

diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index a89d1be..9255de1 100644 (file)
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- *
- *   Copyright 2017 NXP
- *
+ * Copyright 2017,2019 NXP
  */
 
 #include <assert.h>
@@ -468,8 +466,7 @@ dpaa2_eventdev_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id,
        RTE_SET_USED(queue_conf);
 
        queue_conf->nb_atomic_flows = DPAA2_EVENT_QUEUE_ATOMIC_FLOWS;
-       queue_conf->schedule_type = RTE_SCHED_TYPE_ATOMIC |
-                                     RTE_SCHED_TYPE_PARALLEL;
+       queue_conf->schedule_type = RTE_SCHED_TYPE_PARALLEL;
        queue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
 }
 
@@ -638,7 +635,7 @@ dpaa2_eventdev_timeout_ticks(struct rte_eventdev *dev, uint64_t ns,
        EVENTDEV_INIT_FUNC_TRACE();
 
        RTE_SET_USED(dev);
-       *timeout_ticks = ns * scale;
+       *timeout_ticks = ns / scale;
 
        return 0;
 }
@@ -1062,6 +1059,39 @@ fail:
        return -EFAULT;
 }
 
+static int
+dpaa2_eventdev_destroy(const char *name)
+{
+       struct rte_eventdev *eventdev;
+       struct dpaa2_eventdev *priv;
+       int i;
+
+       eventdev = rte_event_pmd_get_named_dev(name);
+       if (eventdev == NULL) {
+               RTE_EDEV_LOG_ERR("eventdev with name %s not allocated", name);
+               return -1;
+       }
+
+       /* For secondary processes, the primary has done all the work */
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       priv = eventdev->data->dev_private;
+       for (i = 0; i < priv->max_event_queues; i++) {
+               if (priv->evq_info[i].dpcon)
+                       rte_dpaa2_free_dpcon_dev(priv->evq_info[i].dpcon);
+
+               if (priv->evq_info[i].dpci)
+                       rte_dpaa2_free_dpci_dev(priv->evq_info[i].dpci);
+
+       }
+       priv->max_event_queues = 0;
+
+       RTE_LOG(INFO, PMD, "%s eventdev cleaned\n", name);
+       return 0;
+}
+
+
 static int
 dpaa2_eventdev_probe(struct rte_vdev_device *vdev)
 {
@@ -1080,6 +1110,8 @@ dpaa2_eventdev_remove(struct rte_vdev_device *vdev)
        name = rte_vdev_device_name(vdev);
        DPAA2_EVENTDEV_INFO("Closing %s", name);
 
+       dpaa2_eventdev_destroy(name);
+
        return rte_event_pmd_vdev_uninit(name);
 }