event/dpaa2: enchance timeout handling

This patch enhances:
1. Configure the dequeue time out value as per the given
method or per dequeue, global or default.
2. The timeout values were being mixed as ns or ms timeouts,
Now the values are stored as ns and scale is in ms.

Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c
index c4064a4..4b56e2e 100644 (file)
--- a/drivers/event/dpaa2/dpaa2_eventdev.c
+++ b/drivers/event/dpaa2/dpaa2_eventdev.c
@@ -284,7 +284,7 @@ dpaa2_eventdev_info_get(struct rte_eventdev *dev,
        dev_info->max_dequeue_timeout_ns =
                DPAA2_EVENT_MAX_DEQUEUE_TIMEOUT;
        dev_info->dequeue_timeout_ns =
-               DPAA2_EVENT_MIN_DEQUEUE_TIMEOUT;
+               DPAA2_EVENT_PORT_DEQUEUE_TIMEOUT_NS;
        dev_info->max_event_queues = priv->max_event_queues;
        dev_info->max_event_queue_flows =
                DPAA2_EVENT_MAX_QUEUE_FLOWS;
@@ -314,7 +314,6 @@ dpaa2_eventdev_configure(const struct rte_eventdev *dev)
 
        EVENTDEV_INIT_FUNC_TRACE();
 
-       priv->dequeue_timeout_ns = conf->dequeue_timeout_ns;
        priv->nb_event_queues = conf->nb_event_queues;
        priv->nb_event_ports = conf->nb_event_ports;
        priv->nb_event_queue_flows = conf->nb_event_queue_flows;
@@ -322,6 +321,20 @@ dpaa2_eventdev_configure(const struct rte_eventdev *dev)
        priv->nb_event_port_enqueue_depth = conf->nb_event_port_enqueue_depth;
        priv->event_dev_cfg = conf->event_dev_cfg;
 
+       /* Check dequeue timeout method is per dequeue or global */
+       if (priv->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) {
+               /*
+                * Use timeout value as given in dequeue operation.
+                * So invalidating this timeout value.
+                */
+               priv->dequeue_timeout_ns = 0;
+
+       } else if (conf->dequeue_timeout_ns == 0) {
+               priv->dequeue_timeout_ns = DPAA2_EVENT_PORT_DEQUEUE_TIMEOUT_NS;
+       } else {
+               priv->dequeue_timeout_ns = conf->dequeue_timeout_ns;
+       }
+
        DPAA2_EVENTDEV_DEBUG("Configured eventdev devid=%d",
                             dev->data->dev_id);
        return 0;
@@ -516,7 +529,7 @@ static int
 dpaa2_eventdev_timeout_ticks(struct rte_eventdev *dev, uint64_t ns,
                             uint64_t *timeout_ticks)
 {
-       uint32_t scale = 1;
+       uint32_t scale = 1000*1000;
 
        EVENTDEV_INIT_FUNC_TRACE();
 

diff --git a/drivers/event/dpaa2/dpaa2_eventdev.h b/drivers/event/dpaa2/dpaa2_eventdev.h
index d2f98c6..8898024 100644 (file)
--- a/drivers/event/dpaa2/dpaa2_eventdev.h
+++ b/drivers/event/dpaa2/dpaa2_eventdev.h
@@ -21,6 +21,7 @@
 #define DPAA2_EVENT_MAX_QUEUES                 16
 #define DPAA2_EVENT_MIN_DEQUEUE_TIMEOUT                1
 #define DPAA2_EVENT_MAX_DEQUEUE_TIMEOUT                (UINT32_MAX - 1)
+#define DPAA2_EVENT_PORT_DEQUEUE_TIMEOUT_NS    100UL
 #define DPAA2_EVENT_MAX_QUEUE_FLOWS            2048
 #define DPAA2_EVENT_MAX_QUEUE_PRIORITY_LEVELS  8
 #define DPAA2_EVENT_MAX_EVENT_PRIORITY_LEVELS  0