devargs: make device representation generic

[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 78b097e..8bff3a8 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -47,6 +47,7 @@
 #include <rte_pci.h>
 #include <rte_per_lcore.h>
 #include <rte_memory.h>
+#include <rte_memcpy.h>
 #include <rte_memzone.h>
 #include <rte_eal.h>
 #include <rte_string_fns.h>
@@ -73,12 +74,15 @@ const char *pci_get_sysfs_path(void)
 static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev)
 {
        struct rte_devargs *devargs;
+       struct rte_pci_addr addr;
+       struct rte_bus *pbus;
 
+       pbus = rte_bus_find_by_name("pci");
        TAILQ_FOREACH(devargs, &devargs_list, next) {
-               if (devargs->type != RTE_DEVTYPE_BLACKLISTED_PCI &&
-                       devargs->type != RTE_DEVTYPE_WHITELISTED_PCI)
+               if (devargs->bus != pbus)
                        continue;
-               if (!rte_eal_compare_pci_addr(&dev->addr, &devargs->pci.addr))
+               devargs->bus->parse(devargs->name, &addr);
+               if (!rte_eal_compare_pci_addr(&dev->addr, &addr))
                        return devargs;
        }
        return NULL;
@@ -183,12 +187,9 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
        loc = &dev->addr;
 
        /* The device is not blacklisted; Check if driver supports it */
-       if (!rte_pci_match(dr, dev)) {
+       if (!rte_pci_match(dr, dev))
                /* Match of device and driver failed */
-               RTE_LOG(DEBUG, EAL, "Driver (%s) doesn't match the device\n",
-                       dr->driver.name);
                return 1;
-       }
 
        RTE_LOG(INFO, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n",
                        loc->domain, loc->bus, loc->devid, loc->function,
@@ -302,7 +303,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
 
 /*
  * Find the pci device specified by pci address, then invoke probe function of
- * the driver of the devive.
+ * the driver of the device.
  */
 int
 rte_pci_probe_one(const struct rte_pci_addr *addr)
@@ -450,6 +451,20 @@ rte_pci_dump(FILE *f)
        }
 }
 
+static int
+pci_parse(const char *name, void *addr)
+{
+       struct rte_pci_addr *out = addr;
+       struct rte_pci_addr pci_addr;
+       bool parse;
+
+       parse = (eal_parse_pci_BDF(name, &pci_addr) == 0 ||
+                eal_parse_pci_DomBDF(name, &pci_addr) == 0);
+       if (parse && addr != NULL)
+               *out = pci_addr;
+       return parse == false;
+}
+
 /* register a driver */
 void
 rte_pci_register(struct rte_pci_driver *driver)
@@ -488,13 +503,66 @@ rte_pci_remove_device(struct rte_pci_device *pci_dev)
        TAILQ_REMOVE(&rte_pci_bus.device_list, pci_dev, next);
 }
 
+static struct rte_device *
+pci_find_device(const struct rte_device *start, rte_dev_cmp_t cmp,
+               const void *data)
+{
+       struct rte_pci_device *dev;
+
+       FOREACH_DEVICE_ON_PCIBUS(dev) {
+               if (start && &dev->device == start) {
+                       start = NULL; /* starting point found */
+                       continue;
+               }
+               if (cmp(&dev->device, data) == 0)
+                       return &dev->device;
+       }
+
+       return NULL;
+}
+
+static int
+pci_plug(struct rte_device *dev, const char *devargs __rte_unused)
+{
+       struct rte_pci_device *pdev;
+       struct rte_pci_addr *addr;
+
+       addr = &RTE_DEV_TO_PCI(dev)->addr;
+
+       /* Find the current device holding this address in the bus. */
+       FOREACH_DEVICE_ON_PCIBUS(pdev) {
+               if (rte_eal_compare_pci_addr(&pdev->addr, addr) == 0)
+                       return rte_pci_probe_one(addr);
+       }
+
+       rte_errno = ENODEV;
+       return -1;
+}
+
+static int
+pci_unplug(struct rte_device *dev)
+{
+       struct rte_pci_device *pdev;
+
+       pdev = RTE_DEV_TO_PCI(dev);
+       if (rte_pci_detach(&pdev->addr) != 0) {
+               rte_errno = ENODEV;
+               return -1;
+       }
+       return 0;
+}
+
 struct rte_pci_bus rte_pci_bus = {
        .bus = {
                .scan = rte_pci_scan,
                .probe = rte_pci_probe,
+               .find_device = pci_find_device,
+               .plug = pci_plug,
+               .unplug = pci_unplug,
+               .parse = pci_parse,
        },
        .device_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.device_list),
        .driver_list = TAILQ_HEAD_INITIALIZER(rte_pci_bus.driver_list),
 };
 
-RTE_REGISTER_BUS(PCI_BUS_NAME, rte_pci_bus.bus);
+RTE_REGISTER_BUS(pci, rte_pci_bus.bus);