eventdev: make PCI probe and remove functions optional

[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 8042988..9328cda 100644 (file)
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -45,7 +45,6 @@
 #include <rte_log.h>
 #include <rte_debug.h>
 #include <rte_dev.h>
-#include <rte_pci.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
 #include <rte_memzone.h>
@@ -126,8 +125,6 @@ rte_event_dev_info_get(uint8_t dev_id, struct rte_event_dev_info *dev_info)
        dev_info->dequeue_timeout_ns = dev->data->dev_conf.dequeue_timeout_ns;
 
        dev_info->dev = dev->dev;
-       if (dev->driver)
-               dev_info->driver_name = dev->driver->pci_drv.driver.name;
        return 0;
 }
 
@@ -368,7 +365,7 @@ rte_event_dev_configure(uint8_t dev_id,
        (*dev->dev_ops->dev_infos_get)(dev, &info);
 
        /* Check dequeue_timeout_ns value is in limit */
-       if (!dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) {
+       if (!(dev_conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)) {
                if (dev_conf->dequeue_timeout_ns < info.min_dequeue_timeout_ns
                        || dev_conf->dequeue_timeout_ns >
                                 info.max_dequeue_timeout_ns) {
@@ -1174,10 +1171,6 @@ rte_event_pmd_release(struct rte_eventdev *eventdev)
        if (eventdev == NULL)
                return -EINVAL;
 
-       ret = rte_event_dev_close(eventdev->data->dev_id);
-       if (ret < 0)
-               return ret;
-
        eventdev->attached = RTE_EVENTDEV_DETACHED;
        eventdev_globals.nb_devs--;
 
@@ -1233,6 +1226,7 @@ rte_event_pmd_vdev_init(const char *name, size_t dev_private_size,
 int
 rte_event_pmd_vdev_uninit(const char *name)
 {
+       int ret;
        struct rte_eventdev *eventdev;
 
        if (name == NULL)
@@ -1242,104 +1236,12 @@ rte_event_pmd_vdev_uninit(const char *name)
        if (eventdev == NULL)
                return -ENODEV;
 
-       /* Free the event device */
-       rte_event_pmd_release(eventdev);
-
-       return 0;
-}
-
-int
-rte_event_pmd_pci_probe(struct rte_pci_driver *pci_drv,
-                       struct rte_pci_device *pci_dev)
-{
-       struct rte_eventdev_driver *eventdrv;
-       struct rte_eventdev *eventdev;
-
-       char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
-
-       int retval;
-
-       eventdrv = (struct rte_eventdev_driver *)pci_drv;
-       if (eventdrv == NULL)
-               return -ENODEV;
-
-       rte_eal_pci_device_name(&pci_dev->addr, eventdev_name,
-                       sizeof(eventdev_name));
-
-       eventdev = rte_event_pmd_allocate(eventdev_name,
-                        pci_dev->device.numa_node);
-       if (eventdev == NULL)
-               return -ENOMEM;
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               eventdev->data->dev_private =
-                               rte_zmalloc_socket(
-                                               "eventdev private structure",
-                                               eventdrv->dev_private_size,
-                                               RTE_CACHE_LINE_SIZE,
-                                               rte_socket_id());
-
-               if (eventdev->data->dev_private == NULL)
-                       rte_panic("Cannot allocate memzone for private "
-                                       "device data");
-       }
-
-       eventdev->dev = &pci_dev->device;
-       eventdev->driver = eventdrv;
-
-       /* Invoke PMD device initialization function */
-       retval = (*eventdrv->eventdev_init)(eventdev);
-       if (retval == 0)
-               return 0;
-
-       RTE_EDEV_LOG_ERR("driver %s: (vendor_id=0x%x device_id=0x%x)"
-                       " failed", pci_drv->driver.name,
-                       (unsigned int) pci_dev->id.vendor_id,
-                       (unsigned int) pci_dev->id.device_id);
-
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-               rte_free(eventdev->data->dev_private);
-
-       eventdev->attached = RTE_EVENTDEV_DETACHED;
-       eventdev_globals.nb_devs--;
-
-       return -ENXIO;
-}
-
-int
-rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev)
-{
-       const struct rte_eventdev_driver *eventdrv;
-       struct rte_eventdev *eventdev;
-       char eventdev_name[RTE_EVENTDEV_NAME_MAX_LEN];
-       int ret;
-
-       if (pci_dev == NULL)
-               return -EINVAL;
-
-       rte_eal_pci_device_name(&pci_dev->addr, eventdev_name,
-                       sizeof(eventdev_name));
-
-       eventdev = rte_event_pmd_get_named_dev(eventdev_name);
-       if (eventdev == NULL)
-               return -ENODEV;
-
-       eventdrv = (const struct rte_eventdev_driver *)pci_dev->driver;
-       if (eventdrv == NULL)
-               return -ENODEV;
-
-       /* Invoke PMD device un-init function */
-       if (*eventdrv->eventdev_uninit) {
-               ret = (*eventdrv->eventdev_uninit)(eventdev);
-               if (ret)
-                       return ret;
-       }
+       ret = rte_event_dev_close(eventdev->data->dev_id);
+       if (ret < 0)
+               return ret;
 
-       /* Free event device */
+       /* Free the event device */
        rte_event_pmd_release(eventdev);
 
-       eventdev->dev = NULL;
-       eventdev->driver = NULL;
-
        return 0;
 }