pci: unset driver if probe fails

[dpdk.git] / lib / librte_eal / common / eal_common_pci.c

diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index 79f5526..6163b09 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -185,11 +185,12 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
 
                RTE_LOG(INFO, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n",
                                loc->domain, loc->bus, loc->devid, loc->function,
-                               dev->numa_node);
+                               dev->device.numa_node);
 
                /* no initialization when blacklisted, return without error */
-               if (dev->devargs != NULL &&
-                       dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) {
+               if (dev->device.devargs != NULL &&
+                       dev->device.devargs->type ==
+                               RTE_DEVTYPE_BLACKLISTED_PCI) {
                        RTE_LOG(INFO, EAL, "  Device is blacklisted, not initializing\n");
                        return 1;
                }
@@ -213,7 +214,11 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
                dev->driver = dr;
 
                /* call the driver probe() function */
-               return dr->probe(dr, dev);
+               ret = dr->probe(dr, dev);
+               if (ret)
+                       dev->driver = NULL;
+
+               return ret;
        }
        /* return positive value if driver doesn't support this device */
        return 1;
@@ -252,7 +257,7 @@ rte_eal_pci_detach_dev(struct rte_pci_driver *dr,
 
                RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n",
                                loc->domain, loc->bus, loc->devid,
-                               loc->function, dev->numa_node);
+                               loc->function, dev->device.numa_node);
 
                RTE_LOG(DEBUG, EAL, "  remove driver: %x:%x %s\n", dev->id.vendor_id,
                                dev->id.device_id, dr->driver.name);
@@ -288,6 +293,10 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
        if (dev == NULL)
                return -1;
 
+       /* Check if a driver is already loaded */
+       if (dev->driver != NULL)
+               return 0;
+
        TAILQ_FOREACH(dr, &pci_driver_list, next) {
                rc = rte_eal_pci_probe_one_driver(dr, dev);
                if (rc < 0)
@@ -386,6 +395,7 @@ rte_eal_pci_detach(const struct rte_pci_addr *addr)
                        goto err_return;
 
                TAILQ_REMOVE(&pci_device_list, dev, next);
+               free(dev);
                return 0;
        }
        return -1;
@@ -418,7 +428,7 @@ rte_eal_pci_probe(void)
                /* set devargs in PCI structure */
                devargs = pci_devargs_lookup(dev);
                if (devargs != NULL)
-                       dev->devargs = devargs;
+                       dev->device.devargs = devargs;
 
                /* probe all or only whitelisted devices */
                if (probe_all)
@@ -471,11 +481,13 @@ void
 rte_eal_pci_register(struct rte_pci_driver *driver)
 {
        TAILQ_INSERT_TAIL(&pci_driver_list, driver, next);
+       rte_eal_driver_register(&driver->driver);
 }
 
 /* unregister a driver */
 void
 rte_eal_pci_unregister(struct rte_pci_driver *driver)
 {
+       rte_eal_driver_unregister(&driver->driver);
        TAILQ_REMOVE(&pci_driver_list, driver, next);
 }