fix various typos found by Lintian
[dpdk.git] / drivers / event / dpaa2 / dpaa2_eventdev.c
index 5249d2f..2be6e12 100644 (file)
@@ -27,6 +27,7 @@
 #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>
@@ -390,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 =
@@ -476,9 +477,10 @@ 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->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;
 }
@@ -495,8 +497,9 @@ dpaa2_eventdev_queue_setup(struct rte_eventdev *dev, uint8_t queue_id,
        switch (queue_conf->schedule_type) {
        case RTE_SCHED_TYPE_PARALLEL:
        case RTE_SCHED_TYPE_ATOMIC:
-               break;
        case RTE_SCHED_TYPE_ORDERED:
+               break;
+       default:
                DPAA2_EVENTDEV_ERR("Schedule type is not supported.");
                return -1;
        }
@@ -688,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);
@@ -718,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();
@@ -728,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);
@@ -831,14 +834,13 @@ dpaa2_eventdev_crypto_queue_add_all(const struct rte_eventdev *dev,
 {
        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;
+       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_id, ev);
+               ret = dpaa2_sec_eventq_attach(cryptodev, i, dpcon, ev);
                if (ret) {
                        DPAA2_EVENTDEV_ERR("dpaa2_sec_eventq_attach failed: ret %d\n",
                                    ret);
@@ -861,7 +863,7 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev,
 {
        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;
+       struct dpaa2_dpcon_dev *dpcon = priv->evq_info[ev_qid].dpcon;
        int ret;
 
        EVENTDEV_INIT_FUNC_TRACE();
@@ -871,7 +873,7 @@ dpaa2_eventdev_crypto_queue_add(const struct rte_eventdev *dev,
                                cryptodev, ev);
 
        ret = dpaa2_sec_eventq_attach(cryptodev, rx_queue_id,
-                       dpcon_id, ev);
+                                     dpcon, ev);
        if (ret) {
                DPAA2_EVENTDEV_ERR(
                        "dpaa2_sec_eventq_attach failed: ret: %d\n", ret);
@@ -948,6 +950,66 @@ dpaa2_eventdev_crypto_stop(const struct rte_eventdev *dev,
        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,
@@ -965,11 +1027,13 @@ static struct rte_eventdev_ops dpaa2_eventdev_ops = {
        .timeout_ticks    = dpaa2_eventdev_timeout_ticks,
        .dump             = dpaa2_eventdev_dump,
        .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_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,
@@ -1036,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)