drivers/event: invoke probing finish function

[dpdk.git] / drivers / event / dpaa / dpaa_eventdev.c

diff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c
index 5a018d4..14ca341 100644 (file)
--- a/drivers/event/dpaa/dpaa_eventdev.c
+++ b/drivers/event/dpaa/dpaa_eventdev.c
@@ -24,7 +24,7 @@
 #include <rte_memzone.h>
 #include <rte_pci.h>
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_ethdev.h>
 #include <rte_event_eth_rx_adapter.h>
 #include <rte_event_eth_tx_adapter.h>
@@ -46,7 +46,7 @@
  * Eventqueue = Channel Instance
  * 1 Eventdev can have N Eventqueue
  */
-int dpaa_logtype_eventdev;
+RTE_LOG_REGISTER_DEFAULT(dpaa_logtype_eventdev, NOTICE);
 
 #define DISABLE_INTR_MODE "disable_intr"
 
@@ -99,7 +99,7 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[],
                case RTE_EVENT_OP_RELEASE:
                        qman_dca_index(ev[i].impl_opaque, 0);
                        mbuf = DPAA_PER_LCORE_DQRR_MBUF(i);
-                       mbuf->seqn = DPAA_INVALID_MBUF_SEQN;
+                       *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN;
                        DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i);
                        DPAA_PER_LCORE_DQRR_SIZE--;
                        break;
@@ -174,12 +174,12 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],
        int ret;
        u16 ch_id;
        void *buffers[8];
-       u32 num_frames, i, irq = 0;
+       u32 num_frames, i;
        uint64_t cur_ticks = 0, wait_time_ticks = 0;
        struct dpaa_port *portal = (struct dpaa_port *)port;
        struct rte_mbuf *mbuf;
 
-       if (unlikely(!RTE_PER_LCORE(dpaa_io))) {
+       if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
                /* Affine current thread context to a qman portal */
                ret = rte_dpaa_portal_init((void *)0);
                if (ret) {
@@ -206,7 +206,7 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],
                if (DPAA_PER_LCORE_DQRR_HELD & (1 << i)) {
                        qman_dca_index(i, 0);
                        mbuf = DPAA_PER_LCORE_DQRR_MBUF(i);
-                       mbuf->seqn = DPAA_INVALID_MBUF_SEQN;
+                       *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN;
                        DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i);
                        DPAA_PER_LCORE_DQRR_SIZE--;
                }
@@ -223,8 +223,6 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],
        do {
                /* Lets dequeue the frames */
                num_frames = qman_portal_dequeue(ev, nb_events, buffers);
-               if (irq)
-                       irq = 0;
                if (num_frames)
                        break;
                cur_ticks = rte_get_timer_cycles();
@@ -251,7 +249,7 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[],
        struct dpaa_port *portal = (struct dpaa_port *)port;
        struct rte_mbuf *mbuf;
 
-       if (unlikely(!RTE_PER_LCORE(dpaa_io))) {
+       if (unlikely(!DPAA_PER_LCORE_PORTAL)) {
                /* Affine current thread context to a qman portal */
                ret = rte_dpaa_portal_init((void *)0);
                if (ret) {
@@ -278,7 +276,7 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[],
                if (DPAA_PER_LCORE_DQRR_HELD & (1 << i)) {
                        qman_dca_index(i, 0);
                        mbuf = DPAA_PER_LCORE_DQRR_MBUF(i);
-                       mbuf->seqn = DPAA_INVALID_MBUF_SEQN;
+                       *dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN;
                        DPAA_PER_LCORE_DQRR_HELD &= ~(1 << i);
                        DPAA_PER_LCORE_DQRR_SIZE--;
                }
@@ -357,7 +355,8 @@ dpaa_event_dev_info_get(struct rte_eventdev *dev,
                RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |
                RTE_EVENT_DEV_CAP_BURST_MODE |
                RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT |
-               RTE_EVENT_DEV_CAP_NONSEQ_MODE;
+               RTE_EVENT_DEV_CAP_NONSEQ_MODE |
+               RTE_EVENT_DEV_CAP_CARRY_FLOW_ID;
 }
 
 static int
@@ -926,7 +925,7 @@ dpaa_eventdev_txa_enqueue(void *port,
        return nb_events;
 }
 
-static struct rte_eventdev_ops dpaa_eventdev_ops = {
+static struct eventdev_ops dpaa_eventdev_ops = {
        .dev_infos_get    = dpaa_event_dev_info_get,
        .dev_configure    = dpaa_event_dev_configure,
        .dev_start        = dpaa_event_dev_start,
@@ -1027,10 +1026,12 @@ dpaa_event_dev_create(const char *name, const char *params)
 
        /* For secondary processes, the primary has done all the work */
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-               return 0;
+               goto done;
 
        priv->max_event_queues = DPAA_EVENT_MAX_QUEUES;
 
+done:
+       event_dev_probing_finish(eventdev);
        return 0;
 fail:
        return -EFAULT;
@@ -1069,9 +1070,3 @@ static struct rte_vdev_driver vdev_eventdev_dpaa_pmd = {
 RTE_PMD_REGISTER_VDEV(EVENTDEV_NAME_DPAA_PMD, vdev_eventdev_dpaa_pmd);
 RTE_PMD_REGISTER_PARAM_STRING(EVENTDEV_NAME_DPAA_PMD,
                DISABLE_INTR_MODE "=<int>");
-RTE_INIT(dpaa_event_init_log)
-{
-       dpaa_logtype_eventdev = rte_log_register("pmd.event.dpaa");
-       if (dpaa_logtype_eventdev >= 0)
-               rte_log_set_level(dpaa_logtype_eventdev, RTE_LOG_NOTICE);
-}