X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fevent%2Fdpaa2%2Fdpaa2_eventdev.c;h=cf2d2741a87fd75e70ac0e2325776c44f3157f05;hb=c0bad56ef8b84a2e03bff1f5739a52248d22aedd;hp=a7f85166bc5612e8b3dda32f8c36559085f4a468;hpb=b75061260c34d3c515f0d0d09a1860b19d9f4062;p=dpdk.git

diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index a7f85166bc..cf2d2741a8 100644
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -36,7 +36,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdint.h>
 #include <sys/epoll.h>
 
 #include <rte_atomic.h>
@@ -93,7 +92,7 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[],
 	if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
 		ret = dpaa2_affine_qbman_swp();
 		if (ret) {
-			PMD_DRV_LOG(ERR, PMD, "Failure in affining portal\n");
+			PMD_DRV_LOG(ERR, "Failure in affining portal\n");
 			return 0;
 		}
 	}
@@ -162,6 +161,31 @@ dpaa2_eventdev_enqueue(void *port, const struct rte_event *ev)
 	return dpaa2_eventdev_enqueue_burst(port, ev, 1);
 }
 
+static void dpaa2_eventdev_dequeue_wait(uint64_t timeout_ticks)
+{
+	struct epoll_event epoll_ev;
+	int ret, i = 0;
+
+	qbman_swp_interrupt_clear_status(DPAA2_PER_LCORE_PORTAL,
+					 QBMAN_SWP_INTERRUPT_DQRI);
+
+RETRY:
+	ret = epoll_wait(DPAA2_PER_LCORE_DPIO->epoll_fd,
+			 &epoll_ev, 1, timeout_ticks);
+	if (ret < 1) {
+		/* sometimes due to some spurious interrupts epoll_wait fails
+		 * with errno EINTR. so here we are retrying epoll_wait in such
+		 * case to avoid the problem.
+		 */
+		if (errno == EINTR) {
+			PMD_DRV_LOG(DEBUG, "epoll_wait fails\n");
+			if (i++ > 10)
+				PMD_DRV_LOG(DEBUG, "Dequeue burst Failed\n");
+		goto RETRY;
+		}
+	}
+}
+
 static void dpaa2_eventdev_process_parallel(struct qbman_swp *swp,
 					    const struct qbman_fd *fd,
 					    const struct qbman_result *dq,
@@ -204,12 +228,11 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[],
 	int num_pkts = 0, ret, i = 0;
 
 	RTE_SET_USED(port);
-	RTE_SET_USED(timeout_ticks);
 
 	if (unlikely(!DPAA2_PER_LCORE_DPIO)) {
 		ret = dpaa2_affine_qbman_swp();
 		if (ret) {
-			PMD_DRV_LOG(ERR, PMD, "Failure in affining portal\n");
+			PMD_DRV_LOG(ERR, "Failure in affining portal\n");
 			return 0;
 		}
 	}
@@ -229,8 +252,14 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[],
 
 	do {
 		dq = qbman_swp_dqrr_next(swp);
-		if (!dq)
-			return 0;
+		if (!dq) {
+			if (!num_pkts && timeout_ticks) {
+				dpaa2_eventdev_dequeue_wait(timeout_ticks);
+				timeout_ticks = 0;
+				continue;
+			}
+			return num_pkts;
+		}
 
 		fd = qbman_result_DQ_fd(dq);
 
@@ -239,7 +268,7 @@ dpaa2_eventdev_dequeue_burst(void *port, struct rte_event ev[],
 			rxq->cb(swp, fd, dq, &ev[num_pkts]);
 		} else {
 			qbman_swp_dqrr_consume(swp, dq);
-			PMD_DRV_LOG(ERR, PMD, "Null Return VQ received\n");
+			PMD_DRV_LOG(ERR, "Null Return VQ received\n");
 			return 0;
 		}
 
@@ -286,7 +315,8 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,
 	dev_info->max_event_port_enqueue_depth =
 		DPAA2_EVENT_MAX_PORT_ENQUEUE_DEPTH;
 	dev_info->max_num_events = DPAA2_EVENT_MAX_NUM_EVENTS;
-	dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED;
+	dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |
+		RTE_EVENT_DEV_CAP_BURST_MODE;
 }
 
 static int
@@ -565,7 +595,7 @@ dpaa2_eventdev_setup_dpci(struct dpaa2_dpci_dev *dpci_dev,
 					dpci_dev->token, i,
 					&rx_queue_cfg);
 		if (ret) {
-			PMD_DRV_LOG(ERR, PMD,
+			PMD_DRV_LOG(ERR,
 				    "set_rx_q failed with err code: %d", ret);
 			return ret;
 		}
@@ -594,6 +624,8 @@ dpaa2_eventdev_create(const char *name)
 	eventdev->schedule      = NULL;
 	eventdev->enqueue       = dpaa2_eventdev_enqueue;
 	eventdev->enqueue_burst = dpaa2_eventdev_enqueue_burst;
+	eventdev->enqueue_new_burst = dpaa2_eventdev_enqueue_burst;
+	eventdev->enqueue_forward_burst = dpaa2_eventdev_enqueue_burst;
 	eventdev->dequeue       = dpaa2_eventdev_dequeue;
 	eventdev->dequeue_burst = dpaa2_eventdev_dequeue_burst;
 
@@ -619,7 +651,7 @@ dpaa2_eventdev_create(const char *name)
 
 		ret = dpaa2_eventdev_setup_dpci(dpci_dev, dpcon_dev);
 		if (ret) {
-			PMD_DRV_LOG(ERR, PMD,
+			PMD_DRV_LOG(ERR,
 				    "dpci setup failed with err code: %d", ret);
 			return ret;
 		}
@@ -637,7 +669,7 @@ dpaa2_eventdev_probe(struct rte_vdev_device *vdev)
 	const char *name;
 
 	name = rte_vdev_device_name(vdev);
-	PMD_DRV_LOG(INFO, PMD, "Initializing %s\n", name);
+	PMD_DRV_LOG(INFO, "Initializing %s", name);
 	return dpaa2_eventdev_create(name);
 }