vhost/crypto: fix build with gcc 4.7.2

[dpdk.git] / lib / librte_eventdev / rte_eventdev.c

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index 5e2c4b1..3f016f4 100644 (file)
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -123,6 +123,28 @@ rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint8_t eth_port_id,
                                : 0;
 }
 
+int __rte_experimental
+rte_event_timer_adapter_caps_get(uint8_t dev_id, uint32_t *caps)
+{
+       struct rte_eventdev *dev;
+       const struct rte_event_timer_adapter_ops *ops;
+
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+
+       dev = &rte_eventdevs[dev_id];
+
+       if (caps == NULL)
+               return -EINVAL;
+       *caps = 0;
+
+       return dev->dev_ops->timer_adapter_caps_get ?
+                               (*dev->dev_ops->timer_adapter_caps_get)(dev,
+                                                                       0,
+                                                                       caps,
+                                                                       &ops)
+                               : 0;
+}
+
 static inline int
 rte_event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues)
 {
@@ -658,6 +680,15 @@ rte_event_port_setup(uint8_t dev_id, uint8_t port_id,
                return -EINVAL;
        }
 
+       if (port_conf && port_conf->disable_implicit_release &&
+           !(dev->data->event_dev_cap &
+             RTE_EVENT_DEV_CAP_IMPLICIT_RELEASE_DISABLE)) {
+               RTE_EDEV_LOG_ERR(
+                  "dev%d port%d Implicit release disable not supported",
+                       dev_id, port_id);
+               return -EINVAL;
+       }
+
        if (dev->data->dev_started) {
                RTE_EDEV_LOG_ERR(
                    "device %d must be stopped to allow port setup", dev_id);
@@ -860,7 +891,7 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
 {
        struct rte_eventdev *dev;
        uint8_t all_queues[RTE_EVENT_MAX_QUEUES_PER_DEV];
-       int i, diag;
+       int i, diag, j;
        uint16_t *links_map;
 
        RTE_EVENTDEV_VALID_DEVID_OR_ERRNO_RET(dev_id, -EINVAL, 0);
@@ -878,13 +909,29 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
                return 0;
        }
 
+       links_map = dev->data->links_map;
+       /* Point links_map to this port specific area */
+       links_map += (port_id * RTE_EVENT_MAX_QUEUES_PER_DEV);
+
        if (queues == NULL) {
-               for (i = 0; i < dev->data->nb_queues; i++)
-                       all_queues[i] = i;
+               j = 0;
+               for (i = 0; i < dev->data->nb_queues; i++) {
+                       if (links_map[i] !=
+                                       EVENT_QUEUE_SERVICE_PRIORITY_INVALID) {
+                               all_queues[j] = i;
+                               j++;
+                       }
+               }
                queues = all_queues;
-               nb_unlinks = dev->data->nb_queues;
+       } else {
+               for (j = 0; j < nb_unlinks; j++) {
+                       if (links_map[queues[j]] ==
+                                       EVENT_QUEUE_SERVICE_PRIORITY_INVALID)
+                               break;
+               }
        }
 
+       nb_unlinks = j;
        for (i = 0; i < nb_unlinks; i++)
                if (queues[i] >= dev->data->nb_queues) {
                        rte_errno = -EINVAL;
@@ -897,9 +944,6 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
        if (diag < 0)
                return diag;
 
-       links_map = dev->data->links_map;
-       /* Point links_map to this port specific area */
-       links_map += (port_id * RTE_EVENT_MAX_QUEUES_PER_DEV);
        for (i = 0; i < diag; i++)
                links_map[queues[i]] = EVENT_QUEUE_SERVICE_PRIORITY_INVALID;
 
@@ -1064,6 +1108,16 @@ int rte_event_dev_xstats_reset(uint8_t dev_id,
        return -ENOTSUP;
 }
 
+int rte_event_dev_selftest(uint8_t dev_id)
+{
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+       struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+
+       if (dev->dev_ops->dev_selftest != NULL)
+               return (*dev->dev_ops->dev_selftest)();
+       return -ENOTSUP;
+}
+
 int
 rte_event_dev_start(uint8_t dev_id)
 {
@@ -1091,6 +1145,23 @@ rte_event_dev_start(uint8_t dev_id)
        return 0;
 }
 
+int
+rte_event_dev_stop_flush_callback_register(uint8_t dev_id,
+               eventdev_stop_flush_t callback, void *userdata)
+{
+       struct rte_eventdev *dev;
+
+       RTE_EDEV_LOG_DEBUG("Stop flush register dev_id=%" PRIu8, dev_id);
+
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+       dev = &rte_eventdevs[dev_id];
+
+       dev->dev_ops->dev_stop_flush = callback;
+       dev->data->dev_stop_flush_arg = userdata;
+
+       return 0;
+}
+
 void
 rte_event_dev_stop(uint8_t dev_id)
 {