event/dpaa2: support destroy
[dpdk.git] / drivers / event / dpaa2 / dpaa2_eventdev.c
index d9a33a2..9255de1 100644 (file)
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- *
- *   Copyright 2017 NXP
- *
+ * Copyright 2017,2019 NXP
  */
 
 #include <assert.h>
@@ -27,6 +25,7 @@
 #include <rte_pci.h>
 #include <rte_bus_vdev.h>
 #include <rte_ethdev_driver.h>
+#include <rte_cryptodev.h>
 #include <rte_event_eth_rx_adapter.h>
 
 #include <fslmc_vfio.h>
@@ -34,6 +33,7 @@
 #include <dpaa2_hw_mempool.h>
 #include <dpaa2_hw_dpio.h>
 #include <dpaa2_ethdev.h>
+#include <dpaa2_sec_event.h>
 #include "dpaa2_eventdev.h"
 #include "dpaa2_eventdev_logs.h"
 #include <portal/dpaa2_hw_pvt.h>
@@ -466,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;
 }
 
@@ -636,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;
 }
@@ -793,6 +792,149 @@ dpaa2_eventdev_eth_stop(const struct rte_eventdev *dev,
        return 0;
 }
 
+static int
+dpaa2_eventdev_crypto_caps_get(const struct rte_eventdev *dev,
+                           const struct rte_cryptodev *cdev,
+                           uint32_t *caps)
+{
+       const char *name = cdev->data->name;
+
+       EVENTDEV_INIT_FUNC_TRACE();
+
+       RTE_SET_USED(dev);
+
+       if (!strncmp(name, "dpsec-", 6))
+               *caps = RTE_EVENT_CRYPTO_ADAPTER_DPAA2_CAP;
+       else
+               return -1;
+
+       return 0;
+}
+
+static int
+dpaa2_eventdev_crypto_queue_add_all(const struct rte_eventdev *dev,
+               const struct rte_cryptodev *cryptodev,
+               const struct rte_event *ev)
+{
+       struct dpaa2_eventdev *priv = dev->data->dev_private;
+       uint8_t ev_qid = ev->queue_id;
+       uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id;
+       int i, ret;
+
+       EVENTDEV_INIT_FUNC_TRACE();
+
+       for (i = 0; i < cryptodev->data->nb_queue_pairs; i++) {
+               ret = dpaa2_sec_eventq_attach(cryptodev, i,
+                               dpcon_id, ev);
+               if (ret) {
+                       DPAA2_EVENTDEV_ERR("dpaa2_sec_eventq_attach failed: ret %d\n",
+                                   ret);
+                       goto fail;
+               }
+       }
+       return 0;
+fail:
+       for (i = (i - 1); i >= 0 ; i--)
+               dpaa2_sec_eventq_detach(cryptodev, i);
+
+       return ret;
+}
+
+static int
+dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev,
+               const struct rte_cryptodev *cryptodev,
+               int32_t rx_queue_id,
+               const struct rte_event *ev)
+{
+       struct dpaa2_eventdev *priv = dev->data->dev_private;
+       uint8_t ev_qid = ev->queue_id;
+       uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id;
+       int ret;
+
+       EVENTDEV_INIT_FUNC_TRACE();
+
+       if (rx_queue_id == -1)
+               return dpaa2_eventdev_crypto_queue_add_all(dev,
+                               cryptodev, ev);
+
+       ret = dpaa2_sec_eventq_attach(cryptodev, rx_queue_id,
+                       dpcon_id, ev);
+       if (ret) {
+               DPAA2_EVENTDEV_ERR(
+                       "dpaa2_sec_eventq_attach failed: ret: %d\n", ret);
+               return ret;
+       }
+       return 0;
+}
+
+static int
+dpaa2_eventdev_crypto_queue_del_all(const struct rte_eventdev *dev,
+                            const struct rte_cryptodev *cdev)
+{
+       int i, ret;
+
+       EVENTDEV_INIT_FUNC_TRACE();
+
+       RTE_SET_USED(dev);
+
+       for (i = 0; i < cdev->data->nb_queue_pairs; i++) {
+               ret = dpaa2_sec_eventq_detach(cdev, i);
+               if (ret) {
+                       DPAA2_EVENTDEV_ERR(
+                               "dpaa2_sec_eventq_detach failed:ret %d\n", ret);
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
+static int
+dpaa2_eventdev_crypto_queue_del(const struct rte_eventdev *dev,
+                            const struct rte_cryptodev *cryptodev,
+                            int32_t rx_queue_id)
+{
+       int ret;
+
+       EVENTDEV_INIT_FUNC_TRACE();
+
+       if (rx_queue_id == -1)
+               return dpaa2_eventdev_crypto_queue_del_all(dev, cryptodev);
+
+       ret = dpaa2_sec_eventq_detach(cryptodev, rx_queue_id);
+       if (ret) {
+               DPAA2_EVENTDEV_ERR(
+                       "dpaa2_sec_eventq_detach failed: ret: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int
+dpaa2_eventdev_crypto_start(const struct rte_eventdev *dev,
+                           const struct rte_cryptodev *cryptodev)
+{
+       EVENTDEV_INIT_FUNC_TRACE();
+
+       RTE_SET_USED(dev);
+       RTE_SET_USED(cryptodev);
+
+       return 0;
+}
+
+static int
+dpaa2_eventdev_crypto_stop(const struct rte_eventdev *dev,
+                          const struct rte_cryptodev *cryptodev)
+{
+       EVENTDEV_INIT_FUNC_TRACE();
+
+       RTE_SET_USED(dev);
+       RTE_SET_USED(cryptodev);
+
+       return 0;
+}
+
 static struct rte_eventdev_ops dpaa2_eventdev_ops = {
        .dev_infos_get    = dpaa2_eventdev_info_get,
        .dev_configure    = dpaa2_eventdev_configure,
@@ -814,6 +956,11 @@ static struct rte_eventdev_ops dpaa2_eventdev_ops = {
        .eth_rx_adapter_queue_del = dpaa2_eventdev_eth_queue_del,
        .eth_rx_adapter_start = dpaa2_eventdev_eth_start,
        .eth_rx_adapter_stop = dpaa2_eventdev_eth_stop,
+       .crypto_adapter_caps_get        = dpaa2_eventdev_crypto_caps_get,
+       .crypto_adapter_queue_pair_add  = dpaa2_eventdev_crypto_queue_add,
+       .crypto_adapter_queue_pair_del  = dpaa2_eventdev_crypto_queue_del,
+       .crypto_adapter_start           = dpaa2_eventdev_crypto_start,
+       .crypto_adapter_stop            = dpaa2_eventdev_crypto_stop,
 };
 
 static int
@@ -912,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)
 {
@@ -930,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);
 }