New upstream version 18.11-rc1

[deb_dpdk.git] / drivers / bus / ifpga / ifpga_bus.c

diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index b324872..5f23ed8 100644 (file)
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -142,6 +142,7 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
        if (!afu_dev)
                goto end;
 
+       afu_dev->device.bus = &rte_ifpga_bus;
        afu_dev->device.devargs = devargs;
        afu_dev->device.numa_node = SOCKET_ID_ANY;
        afu_dev->device.name = devargs->name;
@@ -279,14 +280,13 @@ ifpga_probe_one_driver(struct rte_afu_driver *drv,
 
        /* reference driver structure */
        afu_dev->driver = drv;
-       afu_dev->device.driver = &drv->driver;
 
        /* call the driver probe() function */
        ret = drv->probe(afu_dev);
-       if (ret) {
+       if (ret)
                afu_dev->driver = NULL;
-               afu_dev->device.driver = NULL;
-       }
+       else
+               afu_dev->device.driver = &drv->driver;
 
        return ret;
 }
@@ -301,8 +301,11 @@ ifpga_probe_all_drivers(struct rte_afu_device *afu_dev)
                return -1;
 
        /* Check if a driver is already loaded */
-       if (afu_dev->driver != NULL)
-               return 0;
+       if (rte_dev_is_probed(&afu_dev->device)) {
+               IFPGA_BUS_DEBUG("Device %s is already probed\n",
+                               rte_ifpga_device_name(afu_dev));
+               return -EEXIST;
+       }
 
        TAILQ_FOREACH(drv, &ifpga_afu_drv_list, next) {
                if (ifpga_probe_one_driver(drv, afu_dev)) {
@@ -325,14 +328,13 @@ ifpga_probe(void)
        int ret = 0;
 
        TAILQ_FOREACH(afu_dev, &ifpga_afu_dev_list, next) {
-               if (afu_dev->device.driver)
-                       continue;
-
                ret = ifpga_probe_all_drivers(afu_dev);
+               if (ret == -EEXIST)
+                       continue;
                if (ret < 0)
                        IFPGA_BUS_ERR("failed to initialize %s device\n",
                                rte_ifpga_device_name(afu_dev));
-               }
+       }
 
        return ret;
 }
@@ -347,23 +349,20 @@ static int
 ifpga_remove_driver(struct rte_afu_device *afu_dev)
 {
        const char *name;
-       const struct rte_afu_driver *driver;
 
        name = rte_ifpga_device_name(afu_dev);
-       if (!afu_dev->device.driver) {
+       if (afu_dev->driver == NULL) {
                IFPGA_BUS_DEBUG("no driver attach to device %s\n", name);
                return 1;
        }
 
-       driver = RTE_DRV_TO_AFU_CONST(afu_dev->device.driver);
-       return driver->remove(afu_dev);
+       return afu_dev->driver->remove(afu_dev);
 }
 
 static int
 ifpga_unplug(struct rte_device *dev)
 {
        struct rte_afu_device *afu_dev = NULL;
-       struct rte_devargs *devargs = NULL;
        int ret;
 
        if (dev == NULL)
@@ -373,15 +372,13 @@ ifpga_unplug(struct rte_device *dev)
        if (!afu_dev)
                return -ENOENT;
 
-       devargs = dev->devargs;
-
        ret = ifpga_remove_driver(afu_dev);
        if (ret)
                return ret;
 
        TAILQ_REMOVE(&ifpga_afu_dev_list, afu_dev, next);
 
-       rte_devargs_remove(devargs->bus->name, devargs->name);
+       rte_devargs_remove(dev->devargs);
        free(afu_dev);
        return 0;