pci: replace devinit/devuninit with probe/remove

[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 96d5113..db8cba0 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -82,8 +82,23 @@
 
 #include "eal_private.h"
 
-struct pci_driver_list pci_driver_list;
-struct pci_device_list pci_device_list;
+struct pci_driver_list pci_driver_list =
+       TAILQ_HEAD_INITIALIZER(pci_driver_list);
+struct pci_device_list pci_device_list =
+       TAILQ_HEAD_INITIALIZER(pci_device_list);
+
+#define SYSFS_PCI_DEVICES "/sys/bus/pci/devices"
+
+const char *pci_get_sysfs_path(void)
+{
+       const char *path = NULL;
+
+       path = getenv("SYSFS_PCI_DEVICES");
+       if (path == NULL)
+               return SYSFS_PCI_DEVICES;
+
+       return path;
+}
 
 static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev)
 {
@@ -138,7 +153,7 @@ pci_unmap_resource(void *requested_addr, size_t size)
 }
 
 /*
- * If vendor/device ID match, call the devinit() function of the
+ * If vendor/device ID match, call the probe() function of the
  * driver.
  */
 static int
@@ -162,31 +177,27 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
                if (id_table->subsystem_device_id != dev->id.subsystem_device_id &&
                                id_table->subsystem_device_id != PCI_ANY_ID)
                        continue;
+               if (id_table->class_id != dev->id.class_id &&
+                               id_table->class_id != RTE_CLASS_ANY_ID)
+                       continue;
 
                struct rte_pci_addr *loc = &dev->addr;
 
-               RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n",
+               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);
 
-               RTE_LOG(DEBUG, EAL, "  probe driver: %x:%x %s\n", dev->id.vendor_id,
-                               dev->id.device_id, dr->name);
-
                /* no initialization when blacklisted, return without error */
                if (dev->devargs != NULL &&
                        dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) {
-                       RTE_LOG(DEBUG, EAL, "  Device is blacklisted, not initializing\n");
+                       RTE_LOG(INFO, EAL, "  Device is blacklisted, not initializing\n");
                        return 1;
                }
 
+               RTE_LOG(INFO, EAL, "  probe driver: %x:%x %s\n", dev->id.vendor_id,
+                               dev->id.device_id, dr->name);
+
                if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING) {
-#ifdef RTE_PCI_CONFIG
-                       /*
-                        * Set PCIe config space for high performance.
-                        * Return value can be ignored.
-                        */
-                       pci_config_space_set(dev);
-#endif
                        /* map resources for devices that use igb_uio */
                        ret = rte_eal_pci_map_device(dev);
                        if (ret != 0)
@@ -201,15 +212,15 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
                /* reference driver structure */
                dev->driver = dr;
 
-               /* call the driver devinit() function */
-               return dr->devinit(dr, dev);
+               /* call the driver probe() function */
+               return dr->probe(dr, dev);
        }
-       /* return positive value if driver is not found */
+       /* return positive value if driver doesn't support this device */
        return 1;
 }
 
 /*
- * If vendor/device ID match, call the devuninit() function of the
+ * If vendor/device ID match, call the remove() function of the
  * driver.
  */
 static int
@@ -246,7 +257,7 @@ rte_eal_pci_detach_dev(struct rte_pci_driver *dr,
                RTE_LOG(DEBUG, EAL, "  remove driver: %x:%x %s\n", dev->id.vendor_id,
                                dev->id.device_id, dr->name);
 
-               if (dr->devuninit && (dr->devuninit(dev) < 0))
+               if (dr->remove && (dr->remove(dev) < 0))
                        return -1;      /* negative value is an error */
 
                /* clear driver structure */
@@ -259,12 +270,12 @@ rte_eal_pci_detach_dev(struct rte_pci_driver *dr,
                return 0;
        }
 
-       /* return positive value if driver is not found */
+       /* return positive value if driver doesn't support this device */
        return 1;
 }
 
 /*
- * If vendor/device ID match, call the devinit() function of all
+ * If vendor/device ID match, call the probe() function of all
  * registered driver for the given device. Return -1 if initialization
  * failed, return 1 if no driver is found for this device.
  */
@@ -283,7 +294,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
                        /* negative value is an error */
                        return -1;
                if (rc > 0)
-                       /* positive value means driver not found */
+                       /* positive value means driver doesn't support it */
                        continue;
                return 0;
        }
@@ -291,7 +302,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
 }
 
 /*
- * If vendor/device ID match, call the devuninit() function of all
+ * If vendor/device ID match, call the remove() function of all
  * registered driver for the given device. Return -1 if initialization
  * failed, return 1 if no driver is found for this device.
  */
@@ -310,7 +321,7 @@ pci_detach_all_drivers(struct rte_pci_device *dev)
                        /* negative value is an error */
                        return -1;
                if (rc > 0)
-                       /* positive value means driver not found */
+                       /* positive value means driver doesn't support it */
                        continue;
                return 0;
        }
@@ -381,7 +392,7 @@ err_return:
 }
 
 /*
- * Scan the content of the PCI bus, and call the devinit() function for
+ * Scan the content of the PCI bus, and call the probe() function for
  * all registered drivers that have a matching entry in its id_table
  * for discovered devices.
  */