fix various typos found by Lintian
[dpdk.git] / drivers / event / dpaa2 / dpaa2_eventdev.c
index 456b446..2be6e12 100644 (file)
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- *
- *   Copyright 2017 NXP
- *
+ * Copyright 2017,2019 NXP
  */
 
 #include <assert.h>
 #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 <rte_event_eth_tx_adapter.h>
 
 #include <fslmc_vfio.h>
 #include <dpaa2_hw_pvt.h>
 #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>
 
 /* Dynamic logging identified for mempool */
 int dpaa2_logtype_event;
+#define DPAA2_EV_TX_RETRY_COUNT 10000
 
 static uint16_t
 dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[],
                             uint16_t nb_events)
 {
-       struct rte_eventdev *ev_dev =
-                       ((struct dpaa2_io_portal_t *)port)->eventdev;
-       struct dpaa2_eventdev *priv = ev_dev->data->dev_private;
+
+       struct dpaa2_port *dpaa2_portal = port;
+       struct dpaa2_dpio_dev *dpio_dev;
        uint32_t queue_id = ev[0].queue_id;
-       struct dpaa2_eventq *evq_info = &priv->evq_info[queue_id];
-       uint32_t fqid;
+       struct dpaa2_eventq *evq_info;
+       uint32_t fqid, retry_count;
        struct qbman_swp *swp;
        struct qbman_fd fd_arr[MAX_TX_RING_SLOTS];
        uint32_t loop, frames_to_send;
        struct qbman_eq_desc eqdesc[MAX_TX_RING_SLOTS];
        uint16_t num_tx = 0;
-       int ret;
-
-       RTE_SET_USED(port);
+       int i, n, ret;
+       uint8_t channel_index;
 
        if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
+               /* Affine current thread context to a qman portal */
                ret = dpaa2_affine_qbman_swp();
-               if (ret) {
+               if (ret < 0) {
                        DPAA2_EVENTDEV_ERR("Failure in affining portal");
                        return 0;
                }
        }
-
+       /* todo - dpaa2_portal shall have dpio_dev - no per thread variable */
+       dpio_dev = DPAA2_PER_LCORE_DPIO;
        swp = DPAA2_PER_LCORE_PORTAL;
 
+       if (likely(dpaa2_portal->is_port_linked))
+               goto skip_linking;
+
+       /* Create mapping between portal and channel to receive packets */
+       for (i = 0; i < DPAA2_EVENT_MAX_QUEUES; i++) {
+               evq_info = &dpaa2_portal->evq_info[i];
+               if (!evq_info->event_port)
+                       continue;
+
+               ret = dpio_add_static_dequeue_channel(dpio_dev->dpio,
+                                                     CMD_PRI_LOW,
+                                                     dpio_dev->token,
+                                                     evq_info->dpcon->dpcon_id,
+                                                     &channel_index);
+               if (ret < 0) {
+                       DPAA2_EVENTDEV_ERR(
+                               "Static dequeue config failed: err(%d)", ret);
+                       goto err;
+               }
+
+               qbman_swp_push_set(swp, channel_index, 1);
+               evq_info->dpcon->channel_index = channel_index;
+       }
+       dpaa2_portal->is_port_linked = true;
+
+skip_linking:
+       evq_info = &dpaa2_portal->evq_info[queue_id];
+
        while (nb_events) {
-               frames_to_send = (nb_events >> 3) ?
-                       MAX_TX_RING_SLOTS : nb_events;
+               frames_to_send = (nb_events > dpaa2_eqcr_size) ?
+                       dpaa2_eqcr_size : nb_events;
 
                for (loop = 0; loop < frames_to_send; loop++) {
                        const struct rte_event *event = &ev[num_tx + loop];
@@ -99,14 +130,14 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[],
                        qbman_eq_desc_set_no_orp(&eqdesc[loop], 0);
                        qbman_eq_desc_set_response(&eqdesc[loop], 0, 0);
 
-                       if (event->mbuf->seqn) {
+                       if (event->sched_type == RTE_SCHED_TYPE_ATOMIC
+                               && event->mbuf->seqn) {
                                uint8_t dqrr_index = event->mbuf->seqn - 1;
 
                                qbman_eq_desc_set_dca(&eqdesc[loop], 1,
                                                      dqrr_index, 0);
                                DPAA2_PER_LCORE_DQRR_SIZE--;
-                               DPAA2_PER_LCORE_DQRR_HELD &=
-                                       ~(1 << dqrr_index);
+                               DPAA2_PER_LCORE_DQRR_HELD &= ~(1 << dqrr_index);
                        }
 
                        memset(&fd_arr[loop], 0, sizeof(struct qbman_fd));
@@ -116,7 +147,7 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[],
                         * to avoid copy
                         */
                        struct rte_event *ev_temp = rte_malloc(NULL,
-                               sizeof(struct rte_event), 0);
+                                               sizeof(struct rte_event), 0);
 
                        if (!ev_temp) {
                                if (!loop)
@@ -133,16 +164,40 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[],
                }
 send_partial:
                loop = 0;
+               retry_count = 0;
                while (loop < frames_to_send) {
-                       loop += qbman_swp_enqueue_multiple_desc(swp,
+                       ret = qbman_swp_enqueue_multiple_desc(swp,
                                        &eqdesc[loop], &fd_arr[loop],
                                        frames_to_send - loop);
+                       if (unlikely(ret < 0)) {
+                               retry_count++;
+                               if (retry_count > DPAA2_EV_TX_RETRY_COUNT) {
+                                       num_tx += loop;
+                                       nb_events -= loop;
+                                       return num_tx + loop;
+                               }
+                       } else {
+                               loop += ret;
+                               retry_count = 0;
+                       }
                }
-               num_tx += frames_to_send;
-               nb_events -= frames_to_send;
+               num_tx += loop;
+               nb_events -= loop;
        }
 
        return num_tx;
+err:
+       for (n = 0; n < i; n++) {
+               evq_info = &dpaa2_portal->evq_info[n];
+               if (!evq_info->event_port)
+                       continue;
+               qbman_swp_push_set(swp, evq_info->dpcon->channel_index, 0);
+               dpio_remove_static_dequeue_channel(dpio_dev->dpio, 0,
+                                               dpio_dev->token,
+                                               evq_info->dpcon->dpcon_id);
+       }
+       return 0;
+
 }
 
 static uint16_t
@@ -205,22 +260,53 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[],
                             uint16_t nb_events, uint64_t timeout_ticks)
 {
        const struct qbman_result *dq;
+       struct dpaa2_dpio_dev *dpio_dev = NULL;
+       struct dpaa2_port *dpaa2_portal = port;
+       struct dpaa2_eventq *evq_info;
        struct qbman_swp *swp;
        const struct qbman_fd *fd;
        struct dpaa2_queue *rxq;
-       int num_pkts = 0, ret, i = 0;
-
-       RTE_SET_USED(port);
+       int num_pkts = 0, ret, i = 0, n;
+       uint8_t channel_index;
 
        if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
+               /* Affine current thread context to a qman portal */
                ret = dpaa2_affine_qbman_swp();
-               if (ret) {
+               if (ret < 0) {
                        DPAA2_EVENTDEV_ERR("Failure in affining portal");
                        return 0;
                }
        }
+
+       dpio_dev = DPAA2_PER_LCORE_DPIO;
        swp = DPAA2_PER_LCORE_PORTAL;
 
+       if (likely(dpaa2_portal->is_port_linked))
+               goto skip_linking;
+
+       /* Create mapping between portal and channel to receive packets */
+       for (i = 0; i < DPAA2_EVENT_MAX_QUEUES; i++) {
+               evq_info = &dpaa2_portal->evq_info[i];
+               if (!evq_info->event_port)
+                       continue;
+
+               ret = dpio_add_static_dequeue_channel(dpio_dev->dpio,
+                                                     CMD_PRI_LOW,
+                                                     dpio_dev->token,
+                                                     evq_info->dpcon->dpcon_id,
+                                                     &channel_index);
+               if (ret < 0) {
+                       DPAA2_EVENTDEV_ERR(
+                               "Static dequeue config failed: err(%d)", ret);
+                       goto err;
+               }
+
+               qbman_swp_push_set(swp, channel_index, 1);
+               evq_info->dpcon->channel_index = channel_index;
+       }
+       dpaa2_portal->is_port_linked = true;
+
+skip_linking:
        /* Check if there are atomic contexts to be released */
        while (DPAA2_PER_LCORE_DQRR_SIZE) {
                if (DPAA2_PER_LCORE_DQRR_HELD & (1 << i)) {
@@ -259,6 +345,18 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[],
        } while (num_pkts < nb_events);
 
        return num_pkts;
+err:
+       for (n = 0; n < i; n++) {
+               evq_info = &dpaa2_portal->evq_info[n];
+               if (!evq_info->event_port)
+                       continue;
+
+               qbman_swp_push_set(swp, evq_info->dpcon->channel_index, 0);
+               dpio_remove_static_dequeue_channel(dpio_dev->dpio, 0,
+                                                       dpio_dev->token,
+                                               evq_info->dpcon->dpcon_id);
+       }
+       return 0;
 }
 
 static uint16_t
@@ -293,7 +391,7 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,
        dev_info->max_event_priority_levels =
                DPAA2_EVENT_MAX_EVENT_PRIORITY_LEVELS;
        dev_info->max_event_ports = rte_fslmc_get_device_count(DPAA2_IO);
-       /* we only support dpio upto number of cores*/
+       /* we only support dpio up to number of cores */
        if (dev_info->max_event_ports > rte_lcore_count())
                dev_info->max_event_ports = rte_lcore_count();
        dev_info->max_event_port_dequeue_depth =
@@ -379,38 +477,47 @@ dpaa2_eventdev_queue_def_conf(struct rte_eventdev *dev, uint8_t queue_id,
 
        RTE_SET_USED(dev);
        RTE_SET_USED(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->nb_atomic_order_sequences =
+                               DPAA2_EVENT_QUEUE_ORDER_SEQUENCES;
+       queue_conf->schedule_type = RTE_SCHED_TYPE_PARALLEL;
        queue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
 }
 
-static void
-dpaa2_eventdev_queue_release(struct rte_eventdev *dev, uint8_t queue_id)
-{
-       EVENTDEV_INIT_FUNC_TRACE();
-
-       RTE_SET_USED(dev);
-       RTE_SET_USED(queue_id);
-}
-
 static int
 dpaa2_eventdev_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,
                           const struct rte_event_queue_conf *queue_conf)
 {
        struct dpaa2_eventdev *priv = dev->data->dev_private;
-       struct dpaa2_eventq *evq_info =
-               &priv->evq_info[queue_id];
+       struct dpaa2_eventq *evq_info = &priv->evq_info[queue_id];
 
        EVENTDEV_INIT_FUNC_TRACE();
 
+       switch (queue_conf->schedule_type) {
+       case RTE_SCHED_TYPE_PARALLEL:
+       case RTE_SCHED_TYPE_ATOMIC:
+       case RTE_SCHED_TYPE_ORDERED:
+               break;
+       default:
+               DPAA2_EVENTDEV_ERR("Schedule type is not supported.");
+               return -1;
+       }
        evq_info->event_queue_cfg = queue_conf->event_queue_cfg;
+       evq_info->event_queue_id = queue_id;
 
        return 0;
 }
 
+static void
+dpaa2_eventdev_queue_release(struct rte_eventdev *dev, uint8_t queue_id)
+{
+       EVENTDEV_INIT_FUNC_TRACE();
+
+       RTE_SET_USED(dev);
+       RTE_SET_USED(queue_id);
+}
+
 static void
 dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id,
                             struct rte_event_port_conf *port_conf)
@@ -419,7 +526,6 @@ dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id,
 
        RTE_SET_USED(dev);
        RTE_SET_USED(port_id);
-       RTE_SET_USED(port_conf);
 
        port_conf->new_event_threshold =
                DPAA2_EVENT_MAX_NUM_EVENTS;
@@ -430,56 +536,44 @@ dpaa2_eventdev_port_def_conf(struct rte_eventdev *dev, uint8_t port_id,
        port_conf->disable_implicit_release = 0;
 }
 
-static void
-dpaa2_eventdev_port_release(void *port)
-{
-       EVENTDEV_INIT_FUNC_TRACE();
-
-       RTE_SET_USED(port);
-}
-
 static int
 dpaa2_eventdev_port_setup(struct rte_eventdev *dev, uint8_t port_id,
                          const struct rte_event_port_conf *port_conf)
 {
+       char event_port_name[32];
+       struct dpaa2_port *portal;
+
        EVENTDEV_INIT_FUNC_TRACE();
 
        RTE_SET_USED(port_conf);
 
-       if (!dpaa2_io_portal[port_id].dpio_dev) {
-               dpaa2_io_portal[port_id].dpio_dev =
-                               dpaa2_get_qbman_swp(port_id);
-               rte_atomic16_inc(&dpaa2_io_portal[port_id].dpio_dev->ref_count);
-               if (!dpaa2_io_portal[port_id].dpio_dev)
-                       return -1;
+       sprintf(event_port_name, "event-port-%d", port_id);
+       portal = rte_malloc(event_port_name, sizeof(struct dpaa2_port), 0);
+       if (!portal) {
+               DPAA2_EVENTDEV_ERR("Memory allocation failure");
+               return -ENOMEM;
        }
 
-       dpaa2_io_portal[port_id].eventdev = dev;
-       dev->data->ports[port_id] = &dpaa2_io_portal[port_id];
+       memset(portal, 0, sizeof(struct dpaa2_port));
+       dev->data->ports[port_id] = portal;
        return 0;
 }
 
-static int
-dpaa2_eventdev_port_unlink(struct rte_eventdev *dev, void *port,
-                          uint8_t queues[], uint16_t nb_unlinks)
+static void
+dpaa2_eventdev_port_release(void *port)
 {
-       struct dpaa2_eventdev *priv = dev->data->dev_private;
-       struct dpaa2_io_portal_t *dpaa2_portal = port;
-       struct dpaa2_eventq *evq_info;
-       int i;
+       struct dpaa2_port *portal = port;
 
        EVENTDEV_INIT_FUNC_TRACE();
 
-       for (i = 0; i < nb_unlinks; i++) {
-               evq_info = &priv->evq_info[queues[i]];
-               qbman_swp_push_set(dpaa2_portal->dpio_dev->sw_portal,
-                                  evq_info->dpcon->channel_index, 0);
-               dpio_remove_static_dequeue_channel(dpaa2_portal->dpio_dev->dpio,
-                                       0, dpaa2_portal->dpio_dev->token,
-                       evq_info->dpcon->dpcon_id);
-       }
+       /* TODO: Cleanup is required when ports are in linked state. */
+       if (portal->is_port_linked)
+               DPAA2_EVENTDEV_WARN("Event port must be unlinked before release");
 
-       return (int)nb_unlinks;
+       if (portal)
+               rte_free(portal);
+
+       portal = NULL;
 }
 
 static int
@@ -488,46 +582,66 @@ dpaa2_eventdev_port_link(struct rte_eventdev *dev, void *port,
                        uint16_t nb_links)
 {
        struct dpaa2_eventdev *priv = dev->data->dev_private;
-       struct dpaa2_io_portal_t *dpaa2_portal = port;
+       struct dpaa2_port *dpaa2_portal = port;
        struct dpaa2_eventq *evq_info;
-       uint8_t channel_index;
-       int ret, i, n;
+       uint16_t i;
 
        EVENTDEV_INIT_FUNC_TRACE();
 
+       RTE_SET_USED(priorities);
+
        for (i = 0; i < nb_links; i++) {
                evq_info = &priv->evq_info[queues[i]];
+               memcpy(&dpaa2_portal->evq_info[queues[i]], evq_info,
+                          sizeof(struct dpaa2_eventq));
+               dpaa2_portal->evq_info[queues[i]].event_port = port;
+               dpaa2_portal->num_linked_evq++;
+       }
 
-               ret = dpio_add_static_dequeue_channel(
-                       dpaa2_portal->dpio_dev->dpio,
-                       CMD_PRI_LOW, dpaa2_portal->dpio_dev->token,
-                       evq_info->dpcon->dpcon_id, &channel_index);
-               if (ret < 0) {
-                       DPAA2_EVENTDEV_ERR(
-                               "Static dequeue config failed: err(%d)", ret);
-                       goto err;
-               }
+       return (int)nb_links;
+}
 
-               qbman_swp_push_set(dpaa2_portal->dpio_dev->sw_portal,
-                                  channel_index, 1);
-               evq_info->dpcon->channel_index = channel_index;
-       }
+static int
+dpaa2_eventdev_port_unlink(struct rte_eventdev *dev, void *port,
+                          uint8_t queues[], uint16_t nb_unlinks)
+{
+       struct dpaa2_port *dpaa2_portal = port;
+       int i;
+       struct dpaa2_dpio_dev *dpio_dev = NULL;
+       struct dpaa2_eventq *evq_info;
+       struct qbman_swp *swp;
 
-       RTE_SET_USED(priorities);
+       EVENTDEV_INIT_FUNC_TRACE();
 
-       return (int)nb_links;
-err:
-       for (n = 0; n < i; n++) {
-               evq_info = &priv->evq_info[queues[n]];
-               qbman_swp_push_set(dpaa2_portal->dpio_dev->sw_portal,
-                                  evq_info->dpcon->channel_index, 0);
-               dpio_remove_static_dequeue_channel(dpaa2_portal->dpio_dev->dpio,
-                                       0, dpaa2_portal->dpio_dev->token,
-                       evq_info->dpcon->dpcon_id);
+       RTE_SET_USED(dev);
+       RTE_SET_USED(queues);
+
+       for (i = 0; i < nb_unlinks; i++) {
+               evq_info = &dpaa2_portal->evq_info[queues[i]];
+
+               if (DPAA2_PER_LCORE_DPIO && evq_info->dpcon) {
+                       /* todo dpaa2_portal shall have dpio_dev-no per lcore*/
+                       dpio_dev = DPAA2_PER_LCORE_DPIO;
+                       swp = DPAA2_PER_LCORE_PORTAL;
+
+                       qbman_swp_push_set(swp,
+                                       evq_info->dpcon->channel_index, 0);
+                       dpio_remove_static_dequeue_channel(dpio_dev->dpio, 0,
+                                               dpio_dev->token,
+                                               evq_info->dpcon->dpcon_id);
+               }
+               memset(evq_info, 0, sizeof(struct dpaa2_eventq));
+               if (dpaa2_portal->num_linked_evq)
+                       dpaa2_portal->num_linked_evq--;
        }
-       return ret;
+
+       if (!dpaa2_portal->num_linked_evq)
+               dpaa2_portal->is_port_linked = false;
+
+       return (int)nb_unlinks;
 }
 
+
 static int
 dpaa2_eventdev_timeout_ticks(struct rte_eventdev *dev, uint64_t ns,
                             uint64_t *timeout_ticks)
@@ -537,7 +651,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;
 }
@@ -577,14 +691,14 @@ dpaa2_eventdev_eth_queue_add_all(const struct rte_eventdev *dev,
 {
        struct dpaa2_eventdev *priv = dev->data->dev_private;
        uint8_t ev_qid = queue_conf->ev.queue_id;
-       uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id;
+       struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;
        int i, ret;
 
        EVENTDEV_INIT_FUNC_TRACE();
 
        for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
                ret = dpaa2_eth_eventq_attach(eth_dev, i,
-                               dpcon_id, queue_conf);
+                                             dpcon, queue_conf);
                if (ret) {
                        DPAA2_EVENTDEV_ERR(
                                "Event queue attach failed: err(%d)", ret);
@@ -607,7 +721,7 @@ dpaa2_eventdev_eth_queue_add(const struct rte_eventdev *dev,
 {
        struct dpaa2_eventdev *priv = dev->data->dev_private;
        uint8_t ev_qid = queue_conf->ev.queue_id;
-       uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id;
+       struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;
        int ret;
 
        EVENTDEV_INIT_FUNC_TRACE();
@@ -617,7 +731,7 @@ dpaa2_eventdev_eth_queue_add(const struct rte_eventdev *dev,
                                eth_dev, queue_conf);
 
        ret = dpaa2_eth_eventq_attach(eth_dev, rx_queue_id,
-                       dpcon_id, queue_conf);
+                                     dpcon, queue_conf);
        if (ret) {
                DPAA2_EVENTDEV_ERR(
                        "Event queue attach failed: err(%d)", ret);
@@ -694,6 +808,208 @@ 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;
+       struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;
+       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, 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;
+       struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;
+       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, 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 int
+dpaa2_eventdev_tx_adapter_create(uint8_t id,
+                                const struct rte_eventdev *dev)
+{
+       RTE_SET_USED(id);
+       RTE_SET_USED(dev);
+
+       /* Nothing to do. Simply return. */
+       return 0;
+}
+
+static int
+dpaa2_eventdev_tx_adapter_caps(const struct rte_eventdev *dev,
+                              const struct rte_eth_dev *eth_dev,
+                              uint32_t *caps)
+{
+       RTE_SET_USED(dev);
+       RTE_SET_USED(eth_dev);
+
+       *caps = RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT;
+       return 0;
+}
+
+static uint16_t
+dpaa2_eventdev_txa_enqueue_same_dest(void *port,
+                                    struct rte_event ev[],
+                                    uint16_t nb_events)
+{
+       struct rte_mbuf *m[DPAA2_EVENT_MAX_PORT_ENQUEUE_DEPTH], *m0;
+       uint8_t qid, i;
+
+       RTE_SET_USED(port);
+
+       m0 = (struct rte_mbuf *)ev[0].mbuf;
+       qid = rte_event_eth_tx_adapter_txq_get(m0);
+
+       for (i = 0; i < nb_events; i++)
+               m[i] = (struct rte_mbuf *)ev[i].mbuf;
+
+       return rte_eth_tx_burst(m0->port, qid, m, nb_events);
+}
+
+static uint16_t
+dpaa2_eventdev_txa_enqueue(void *port,
+                          struct rte_event ev[],
+                          uint16_t nb_events)
+{
+       struct rte_mbuf *m = (struct rte_mbuf *)ev[0].mbuf;
+       uint8_t qid, i;
+
+       RTE_SET_USED(port);
+
+       for (i = 0; i < nb_events; i++) {
+               qid = rte_event_eth_tx_adapter_txq_get(m);
+               rte_eth_tx_burst(m->port, qid, &m, 1);
+       }
+
+       return nb_events;
+}
+
 static struct rte_eventdev_ops dpaa2_eventdev_ops = {
        .dev_infos_get    = dpaa2_eventdev_info_get,
        .dev_configure    = dpaa2_eventdev_configure,
@@ -710,11 +1026,19 @@ static struct rte_eventdev_ops dpaa2_eventdev_ops = {
        .port_unlink      = dpaa2_eventdev_port_unlink,
        .timeout_ticks    = dpaa2_eventdev_timeout_ticks,
        .dump             = dpaa2_eventdev_dump,
-       .eth_rx_adapter_caps_get = dpaa2_eventdev_eth_caps_get,
-       .eth_rx_adapter_queue_add = dpaa2_eventdev_eth_queue_add,
-       .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,
+       .dev_selftest     = test_eventdev_dpaa2,
+       .eth_rx_adapter_caps_get        = dpaa2_eventdev_eth_caps_get,
+       .eth_rx_adapter_queue_add       = dpaa2_eventdev_eth_queue_add,
+       .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,
+       .eth_tx_adapter_caps_get        = dpaa2_eventdev_tx_adapter_caps,
+       .eth_tx_adapter_create          = dpaa2_eventdev_tx_adapter_create,
+       .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
@@ -776,6 +1100,8 @@ dpaa2_eventdev_create(const char *name)
        eventdev->enqueue_forward_burst = dpaa2_eventdev_enqueue_burst;
        eventdev->dequeue       = dpaa2_eventdev_dequeue;
        eventdev->dequeue_burst = dpaa2_eventdev_dequeue_burst;
+       eventdev->txa_enqueue   = dpaa2_eventdev_txa_enqueue;
+       eventdev->txa_enqueue_same_dest = dpaa2_eventdev_txa_enqueue_same_dest;
 
        /* For secondary processes, the primary has done all the work */
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
@@ -806,11 +1132,46 @@ dpaa2_eventdev_create(const char *name)
                priv->max_event_queues++;
        } while (dpcon_dev && dpci_dev);
 
+       RTE_LOG(INFO, PMD, "%s eventdev created\n", name);
+
        return 0;
 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)
 {
@@ -829,6 +1190,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);
 }