New upstream version 18.11-rc1

[deb_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 801810e..ebaf308 100644 (file)
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -35,22 +35,20 @@
 #include "rte_eventdev.h"
 #include "rte_eventdev_pmd.h"
 
-struct rte_eventdev rte_event_devices[RTE_EVENT_MAX_DEVS];
+static struct rte_eventdev rte_event_devices[RTE_EVENT_MAX_DEVS];
 
-struct rte_eventdev *rte_eventdevs = &rte_event_devices[0];
+struct rte_eventdev *rte_eventdevs = rte_event_devices;
 
 static struct rte_eventdev_global eventdev_globals = {
        .nb_devs                = 0
 };
 
-struct rte_eventdev_global *rte_eventdev_globals = &eventdev_globals;
-
 /* Event dev north bound API implementation */
 
 uint8_t
 rte_event_dev_count(void)
 {
-       return rte_eventdev_globals->nb_devs;
+       return eventdev_globals.nb_devs;
 }
 
 int
@@ -62,7 +60,7 @@ rte_event_dev_get_dev_id(const char *name)
        if (!name)
                return -EINVAL;
 
-       for (i = 0; i < rte_eventdev_globals->nb_devs; i++) {
+       for (i = 0; i < eventdev_globals.nb_devs; i++) {
                cmp = (strncmp(rte_event_devices[i].data->name, name,
                                RTE_EVENTDEV_NAME_MAX_LEN) == 0) ||
                        (rte_event_devices[i].dev ? (strncmp(
@@ -109,7 +107,7 @@ rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info)
 }
 
 int
-rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint8_t eth_port_id,
+rte_event_eth_rx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id,
                                uint32_t *caps)
 {
        struct rte_eventdev *dev;
@@ -175,6 +173,31 @@ rte_event_crypto_adapter_caps_get(uint8_t dev_id, uint8_t cdev_id,
                (dev, cdev, caps) : -ENOTSUP;
 }
 
+int __rte_experimental
+rte_event_eth_tx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id,
+                               uint32_t *caps)
+{
+       struct rte_eventdev *dev;
+       struct rte_eth_dev *eth_dev;
+
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+       RTE_ETH_VALID_PORTID_OR_ERR_RET(eth_port_id, -EINVAL);
+
+       dev = &rte_eventdevs[dev_id];
+       eth_dev = &rte_eth_devices[eth_port_id];
+
+       if (caps == NULL)
+               return -EINVAL;
+
+       *caps = 0;
+
+       return dev->dev_ops->eth_tx_adapter_caps_get ?
+                       (*dev->dev_ops->eth_tx_adapter_caps_get)(dev,
+                                                               eth_dev,
+                                                               caps)
+                       : 0;
+}
+
 static inline int
 rte_event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues)
 {
@@ -980,6 +1003,28 @@ rte_event_port_unlink(uint8_t dev_id, uint8_t port_id,
        return diag;
 }
 
+int __rte_experimental
+rte_event_port_unlinks_in_progress(uint8_t dev_id, uint8_t port_id)
+{
+       struct rte_eventdev *dev;
+
+       RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+       dev = &rte_eventdevs[dev_id];
+       if (!is_valid_port(dev, port_id)) {
+               RTE_EDEV_LOG_ERR("Invalid port_id=%" PRIu8, port_id);
+               return -EINVAL;
+       }
+
+       /* Return 0 if the PMD does not implement unlinks in progress.
+        * This allows PMDs which handle unlink synchronously to not implement
+        * this function at all.
+        */
+       RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->port_unlinks_in_progress, 0);
+
+       return (*dev->dev_ops->port_unlinks_in_progress)(dev,
+                       dev->data->ports[port_id]);
+}
+
 int
 rte_event_port_links_get(uint8_t dev_id, uint8_t port_id,
                         uint8_t queues[], uint8_t priorities[])
@@ -1275,6 +1320,15 @@ rte_eventdev_find_free_device_index(void)
        return RTE_EVENT_MAX_DEVS;
 }
 
+static uint16_t
+rte_event_tx_adapter_enqueue(__rte_unused void *port,
+                       __rte_unused struct rte_event ev[],
+                       __rte_unused uint16_t nb_events)
+{
+       rte_errno = ENOTSUP;
+       return 0;
+}
+
 struct rte_eventdev *
 rte_event_pmd_allocate(const char *name, int socket_id)
 {
@@ -1295,6 +1349,8 @@ rte_event_pmd_allocate(const char *name, int socket_id)
 
        eventdev = &rte_eventdevs[dev_id];
 
+       eventdev->txa_enqueue = rte_event_tx_adapter_enqueue;
+
        if (eventdev->data == NULL) {
                struct rte_eventdev_data *eventdev_data = NULL;