remove trailing whitespaces
[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_pci.c
index ccb3ae1..f809574 100644 (file)
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
  *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
+ *
+ *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 #include <ctype.h>
@@ -65,7 +64,9 @@
 #include <rte_malloc.h>
 #include <rte_string_fns.h>
 #include <rte_debug.h>
+#include <rte_devargs.h>
 
+#include "rte_pci_dev_ids.h"
 #include "eal_filesystem.h"
 #include "eal_private.h"
 
  * enabling bus master.
  */
 
-
-#define PROC_MODULES "/proc/modules"
-
-#define IGB_UIO_NAME "igb_uio"
-
-#define UIO_DRV_PATH  "/sys/bus/pci/drivers/%s"
-
-/* maximum time to wait that /dev/uioX appears */
-#define UIO_DEV_WAIT_TIMEOUT 3 /* seconds */
+struct uio_map {
+       void *addr;
+       uint64_t offset;
+       uint64_t size;
+       uint64_t phaddr;
+};
 
 /*
  * For multi-process we need to reproduce all PCI mappings in secondary
@@ -99,247 +97,253 @@ struct uio_resource {
        TAILQ_ENTRY(uio_resource) next;
 
        struct rte_pci_addr pci_addr;
-       void *addr;
        char path[PATH_MAX];
-       unsigned long size;
-       unsigned long offset;
+       size_t nb_maps;
+       struct uio_map maps[PCI_MAX_RESOURCE];
 };
 
 TAILQ_HEAD(uio_res_list, uio_resource);
 
 static struct uio_res_list *uio_res_list = NULL;
+static int pci_parse_sysfs_value(const char *filename, uint64_t *val);
 
-/*
- * Check that a kernel module is loaded. Returns 0 on success, or if the
- * parameter is NULL, or -1 if the module is not loaded.
- */
-static int
-pci_uio_check_module(const char *module_name)
-{
-       FILE *f;
-       unsigned i;
-       char buf[BUFSIZ];
-
-       if (module_name == NULL)
-               return 0;
-
-       f = fopen(PROC_MODULES, "r");
-       if (f == NULL) {
-               RTE_LOG(ERR, EAL, "Cannot open "PROC_MODULES": %s\n", 
-                               strerror(errno));
-               return -1;
-       }
-
-       while(fgets(buf, sizeof(buf), f) != NULL) {
-
-               for (i = 0; i < sizeof(buf) && buf[i] != '\0'; i++) {
-                       if (isspace(buf[i]))
-                           buf[i] = '\0';
-               }
-
-               if (strncmp(buf, module_name, sizeof(buf)) == 0) {
-                       fclose(f);
-                       return 0;
-               }
-       }
-       fclose(f);
-       return -1;
-}
-
-/* bind a PCI to the kernel module driver */
+/* unbind kernel driver for this device */
 static int
-pci_bind_device(struct rte_pci_device *dev, char dr_path[])
+pci_unbind_kernel_driver(struct rte_pci_device *dev)
 {
-       FILE *f;
        int n;
+       FILE *f;
+       char filename[PATH_MAX];
        char buf[BUFSIZ];
-       char dev_bind[PATH_MAX];
        struct rte_pci_addr *loc = &dev->addr;
 
-       RTE_LOG(DEBUG, EAL, "bind PCI device "PCI_PRI_FMT"\n",
-                       loc->domain, loc->bus, loc->devid, loc->function);
+       /* open /sys/bus/pci/devices/AAAA:BB:CC.D/driver */
+       rte_snprintf(filename, sizeof(filename),
+                SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/driver/unbind",
+                loc->domain, loc->bus, loc->devid, loc->function);
 
-       n = rte_snprintf(dev_bind, sizeof(dev_bind), "%s/bind", dr_path);
-       if ((n < 0) || (n >= (int)sizeof(buf))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf device bind path\n");
-               return -1;
-       }
+       f = fopen(filename, "w");
+       if (f == NULL) /* device was not bound */
+               return 0;
 
-       f = fopen(dev_bind, "w");
-       if (f == NULL) {
-               RTE_LOG(ERR, EAL, "Cannot open %s\n", dev->previous_dr);
-               return -1;
-       }
        n = rte_snprintf(buf, sizeof(buf), PCI_PRI_FMT "\n",
-                        loc->domain, loc->bus, loc->devid, loc->function);
+                    loc->domain, loc->bus, loc->devid, loc->function);
        if ((n < 0) || (n >= (int)sizeof(buf))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf PCI infos\n");
-               fclose(f);
-               return -1;
+               RTE_LOG(ERR, EAL, "%s(): rte_snprintf failed\n", __func__);
+               goto error;
        }
        if (fwrite(buf, n, 1, f) == 0) {
-               fclose(f);
-               return -1;
+               RTE_LOG(ERR, EAL, "%s(): could not write to %s\n", __func__,
+                               filename);
+               goto error;
        }
 
-       RTE_LOG(DEBUG, EAL, "Device bound\n");
-
        fclose(f);
        return 0;
-}
-
-static int
-pci_uio_bind_device(struct rte_pci_device *dev, const char *module_name)
-{
-       FILE *f;
-       int n;
-       char buf[BUFSIZ];
-       char uio_newid[PATH_MAX];
-       char uio_bind[PATH_MAX];
-
-       n = rte_snprintf(uio_newid, sizeof(uio_newid), UIO_DRV_PATH "/new_id", module_name);
-       if ((n < 0) || (n >= (int)sizeof(uio_newid))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf uio_newid name\n");
-               return -1;
-       }
-
-       n = rte_snprintf(uio_bind, sizeof(uio_bind), UIO_DRV_PATH, module_name);
-       if ((n < 0) || (n >= (int)sizeof(uio_bind))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf uio_bind name\n");
-               return -1;
-       }
-
-       n = rte_snprintf(buf, sizeof(buf), "%x %x\n",
-                       dev->id.vendor_id, dev->id.device_id);
-       if ((n < 0) || (n >= (int)sizeof(buf))) {
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf vendor_id/device_id\n");
-               return -1;
-       }
 
-       f = fopen(uio_newid, "w");
-       if (f == NULL) {
-               RTE_LOG(ERR, EAL, "Cannot open %s\n", uio_newid);
-               return -1;
-       }
-       if (fwrite(buf, n, 1, f) == 0) {
-               fclose(f);
-               return -1;
-       }
+error:
        fclose(f);
-
-       pci_bind_device(dev, uio_bind);
-       return 0;
+       return -1;
 }
 
-
 /* map a particular resource from a file */
 static void *
-pci_map_resource(struct rte_pci_device *dev, void *requested_addr, const char *devname,
-               unsigned long offset, unsigned long size)
+pci_map_resource(void *requested_addr, const char *devname, off_t offset,
+                size_t size)
 {
-       unsigned n;
        int fd;
        void *mapaddr;
 
        /*
-        * open devname, and mmap it: it can take some time to
-        * appear, so we wait some time before returning an error
+        * open devname, to mmap it
         */
-       for (n=0; n<UIO_DEV_WAIT_TIMEOUT*10; n++) {
-               fd = open(devname, O_RDWR);
-               if (fd >= 0)
-                       break;
-               if (errno != ENOENT)
-                       break;
-               usleep(100000);
-       }
+       fd = open(devname, O_RDWR);
        if (fd < 0) {
-               RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", devname, strerror(errno));
+               RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
+                       devname, strerror(errno));
                goto fail;
        }
 
        /* Map the PCI memory resource of device */
        mapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
                        MAP_SHARED, fd, offset);
+       close(fd);
        if (mapaddr == MAP_FAILED ||
                        (requested_addr != NULL && mapaddr != requested_addr)) {
-               RTE_LOG(ERR, EAL, "%s(): cannot mmap %s: %s\n", __func__,
-                       devname, strerror(errno));
-               close(fd);
+               RTE_LOG(ERR, EAL, "%s(): cannot mmap(%s(%d), %p, 0x%lx, 0x%lx):"
+                       " %s (%p)\n", __func__, devname, fd, requested_addr,
+                       (unsigned long)size, (unsigned long)offset,
+                       strerror(errno), mapaddr);
                goto fail;
        }
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               /* save fd if in primary process */
-               dev->intr_handle.fd = fd;
-               dev->intr_handle.type = RTE_INTR_HANDLE_UIO;
-       } else {
-               /* fd is not needed in slave process, close it */
-               dev->intr_handle.fd = -1;
-               dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
-               close(fd);
-       }
 
-       RTE_LOG(DEBUG, EAL, "PCI memory mapped at %p\n", mapaddr);
+       RTE_LOG(DEBUG, EAL, "  PCI memory mapped at %p\n", mapaddr);
 
        return mapaddr;
 
 fail:
-       dev->intr_handle.fd = -1;
-       dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
-
        return NULL;
 }
-/* map the PCI resource of a PCI device in virtual memory */
-static int
-pci_uio_map_resource(struct rte_pci_device *dev)
+
+#define OFF_MAX              ((uint64_t)(off_t)-1)
+static ssize_t
+pci_uio_get_mappings(const char *devname, struct uio_map maps[], size_t nb_maps)
 {
-       struct dirent *e;
-       DIR *dir;
+       size_t i;
        char dirname[PATH_MAX];
-       char dirname2[PATH_MAX];
        char filename[PATH_MAX];
-       char devname[PATH_MAX]; /* contains the /dev/uioX */
-       void *mapaddr;
-       unsigned uio_num;
-       unsigned long size, offset;
-       struct rte_pci_addr *loc = &dev->addr;
-       struct uio_resource *uio_res;
+       uint64_t offset, size;
 
-       RTE_LOG(DEBUG, EAL, "map PCI resource for device "PCI_PRI_FMT"\n",
-               loc->domain, loc->bus, loc->devid, loc->function);
+       for (i = 0; i != nb_maps; i++) {
 
-       /* secondary processes - use already recorded details */
-       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-
-                       TAILQ_FOREACH(uio_res, uio_res_list, next) {
-                               /* skip this element if it doesn't match our PCI address */
-                               if (memcmp(&uio_res->pci_addr, &dev->addr, sizeof(dev->addr)))
-                                       continue;
-
-                               if (pci_map_resource(dev, uio_res->addr, uio_res->path, \
-                                               uio_res->offset, uio_res->size) == uio_res->addr)
-                                       return 0;
-                               else {
-                                       RTE_LOG(ERR, EAL, "Cannot mmap device resource\n");
-                                       return -1;
-                               }
+               /* check if map directory exists */
+               rte_snprintf(dirname, sizeof(dirname),
+                       "%s/maps/map%u", devname, i);
+
+               if (access(dirname, F_OK) != 0)
+                       break;
+
+               /* get mapping offset */
+               rte_snprintf(filename, sizeof(filename),
+                       "%s/offset", dirname);
+               if (pci_parse_sysfs_value(filename, &offset) < 0) {
+                       RTE_LOG(ERR, EAL,
+                               "%s(): cannot parse offset of %s\n",
+                               __func__, dirname);
+                       return (-1);
+               }
+
+               /* get mapping size */
+               rte_snprintf(filename, sizeof(filename),
+                       "%s/size", dirname);
+               if (pci_parse_sysfs_value(filename, &size) < 0) {
+                       RTE_LOG(ERR, EAL,
+                               "%s(): cannot parse size of %s\n",
+                               __func__, dirname);
+                       return (-1);
+               }
+
+               /* get mapping physical address */
+               rte_snprintf(filename, sizeof(filename),
+                       "%s/addr", dirname);
+               if (pci_parse_sysfs_value(filename, &maps[i].phaddr) < 0) {
+                       RTE_LOG(ERR, EAL,
+                               "%s(): cannot parse addr of %s\n",
+                               __func__, dirname);
+                       return (-1);
+               }
+
+               if ((offset > OFF_MAX) || (size > SIZE_MAX)) {
+                       RTE_LOG(ERR, EAL,
+                               "%s(): offset/size exceed system max value\n",
+                               __func__);
+                       return (-1);
+               }
+
+               maps[i].offset = offset;
+               maps[i].size = size;
+        }
+       return (i);
+}
+
+static int
+pci_uio_map_secondary(struct rte_pci_device *dev)
+{
+        size_t i;
+        struct uio_resource *uio_res;
+
+       TAILQ_FOREACH(uio_res, uio_res_list, next) {
+
+               /* skip this element if it doesn't match our PCI address */
+               if (memcmp(&uio_res->pci_addr, &dev->addr, sizeof(dev->addr)))
+                       continue;
+
+               for (i = 0; i != uio_res->nb_maps; i++) {
+                       if (pci_map_resource(uio_res->maps[i].addr,
+                                            uio_res->path,
+                                            (off_t)uio_res->maps[i].offset,
+                                            (size_t)uio_res->maps[i].size)
+                           != uio_res->maps[i].addr) {
+                               RTE_LOG(ERR, EAL,
+                                       "Cannot mmap device resource\n");
+                               return (-1);
                        }
-                       RTE_LOG(ERR, EAL, "Cannot find resource for device\n");
-                       return -1;
+               }
+               return (0);
        }
 
+       RTE_LOG(ERR, EAL, "Cannot find resource for device\n");
+       return -1;
+}
+
+static int pci_mknod_uio_dev(const char *sysfs_uio_path, unsigned uio_num)
+{
+       FILE *f;
+       char filename[PATH_MAX];
+       int ret;
+       unsigned major, minor;
+       dev_t dev;
+
+       /* get the name of the sysfs file that contains the major and minor
+        * of the uio device and read its content */
+       rte_snprintf(filename, sizeof(filename), "%s/dev", sysfs_uio_path);
+
+       f = fopen(filename, "r");
+       if (f == NULL) {
+               RTE_LOG(ERR, EAL, "%s(): cannot open sysfs to get major:minor\n",
+                       __func__);
+               return -1;
+       }
+
+       ret = fscanf(f, "%d:%d", &major, &minor);
+       if (ret != 2) {
+               RTE_LOG(ERR, EAL, "%s(): cannot parse sysfs to get major:minor\n",
+                       __func__);
+               fclose(f);
+               return -1;
+       }
+       fclose(f);
+
+       /* create the char device "mknod /dev/uioX c major minor" */
+       rte_snprintf(filename, sizeof(filename), "/dev/uio%u", uio_num);
+       dev = makedev(major, minor);
+       ret = mknod(filename, S_IFCHR | S_IRUSR | S_IWUSR, dev);
+       if (f == NULL) {
+               RTE_LOG(ERR, EAL, "%s(): mknod() failed %s\n",
+                       __func__, strerror(errno));
+               return -1;
+       }
+
+       return ret;
+}
+
+/*
+ * Return the uioX char device used for a pci device. On success, return
+ * the UIO number and fill dstbuf string with the path of the device in
+ * sysfs. On error, return a negative value. In this case dstbuf is
+ * invalid.
+ */
+static int pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf,
+                          unsigned int buflen)
+{
+       struct rte_pci_addr *loc = &dev->addr;
+       unsigned int uio_num;
+       struct dirent *e;
+       DIR *dir;
+       char dirname[PATH_MAX];
+
        /* depending on kernel version, uio can be located in uio/uioX
         * or uio:uioX */
 
        rte_snprintf(dirname, sizeof(dirname),
-                "/sys/bus/pci/devices/" PCI_PRI_FMT "/uio",
+                SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/uio",
                 loc->domain, loc->bus, loc->devid, loc->function);
 
        dir = opendir(dirname);
        if (dir == NULL) {
                /* retry with the parent directory */
                rte_snprintf(dirname, sizeof(dirname),
-                        "/sys/bus/pci/devices/" PCI_PRI_FMT,
+                        SYSFS_PCI_DEVICES "/" PCI_PRI_FMT,
                         loc->domain, loc->bus, loc->devid, loc->function);
                dir = opendir(dirname);
 
@@ -351,8 +355,10 @@ pci_uio_map_resource(struct rte_pci_device *dev)
 
        /* take the first file starting with "uio" */
        while ((e = readdir(dir)) != NULL) {
-               int shortprefix_len = sizeof("uio") - 1; /* format could be uio%d ...*/
-               int longprefix_len = sizeof("uio:uio") - 1; /* ... or uio:uio%d */
+               /* format could be uio%d ...*/
+               int shortprefix_len = sizeof("uio") - 1;
+               /* ... or uio:uio%d */
+               int longprefix_len = sizeof("uio:uio") - 1;
                char *endptr;
 
                if (strncmp(e->d_name, "uio", 3) != 0)
@@ -361,18 +367,16 @@ pci_uio_map_resource(struct rte_pci_device *dev)
                /* first try uio%d */
                errno = 0;
                uio_num = strtoull(e->d_name + shortprefix_len, &endptr, 10);
-               if (errno == 0 && endptr != e->d_name) {
-                       rte_snprintf(dirname2, sizeof(dirname2),
-                                "%s/uio%u", dirname, uio_num);
+               if (errno == 0 && endptr != (e->d_name + shortprefix_len)) {
+                       rte_snprintf(dstbuf, buflen, "%s/uio%u", dirname, uio_num);
                        break;
                }
 
                /* then try uio:uio%d */
                errno = 0;
                uio_num = strtoull(e->d_name + longprefix_len, &endptr, 10);
-               if (errno == 0 && endptr != e->d_name) {
-                       rte_snprintf(dirname2, sizeof(dirname2),
-                                "%s/uio:uio%u", dirname, uio_num);
+               if (errno == 0 && endptr != (e->d_name + longprefix_len)) {
+                       rte_snprintf(dstbuf, buflen, "%s/uio:uio%u", dirname, uio_num);
                        break;
                }
        }
@@ -380,48 +384,113 @@ pci_uio_map_resource(struct rte_pci_device *dev)
 
        /* No uio resource found */
        if (e == NULL)
-               return 0;
-
-       /* get mapping offset */
-       rte_snprintf(filename, sizeof(filename),
-                "%s/maps/map0/offset", dirname2);
-       if (eal_parse_sysfs_value(filename, &offset) < 0) {
-               RTE_LOG(ERR, EAL, "%s(): cannot parse offset\n",
-                       __func__);
                return -1;
-       }
 
-       /* get mapping size */
-       rte_snprintf(filename, sizeof(filename),
-                "%s/maps/map0/size", dirname2);
-       if (eal_parse_sysfs_value(filename, &size) < 0) {
-               RTE_LOG(ERR, EAL, "%s(): cannot parse size\n",
-                       __func__);
+       /* create uio device if we've been asked to */
+       if (internal_config.create_uio_dev && pci_mknod_uio_dev(dstbuf, uio_num) < 0)
+               RTE_LOG(WARNING, EAL, "Cannot create /dev/uio%u\n", uio_num);
+
+       return uio_num;
+}
+
+/* map the PCI resource of a PCI device in virtual memory */
+static int
+pci_uio_map_resource(struct rte_pci_device *dev)
+{
+       int i, j;
+       char dirname[PATH_MAX];
+       char devname[PATH_MAX]; /* contains the /dev/uioX */
+       void *mapaddr;
+       int uio_num;
+       uint64_t phaddr;
+       uint64_t offset;
+       uint64_t pagesz;
+       ssize_t nb_maps;
+       struct rte_pci_addr *loc = &dev->addr;
+       struct uio_resource *uio_res;
+       struct uio_map *maps;
+
+       dev->intr_handle.fd = -1;
+       dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
+
+       /* secondary processes - use already recorded details */
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return (pci_uio_map_secondary(dev));
+
+       /* find uio resource */
+       uio_num = pci_get_uio_dev(dev, dirname, sizeof(dirname));
+       if (uio_num < 0) {
+               RTE_LOG(WARNING, EAL, "  "PCI_PRI_FMT" not managed by UIO driver, "
+                               "skipping\n", loc->domain, loc->bus, loc->devid, loc->function);
                return -1;
        }
-
-       /* open and mmap /dev/uioX */
        rte_snprintf(devname, sizeof(devname), "/dev/uio%u", uio_num);
-       mapaddr = pci_map_resource(dev, NULL, devname, offset, size);
-       if (mapaddr == NULL)
-               return -1;
-       dev->mem_resource.addr = mapaddr;
 
-       /* save the mapping details for secondary processes*/
-       uio_res = rte_malloc("UIO_RES", sizeof(*uio_res), 0);
-       if (uio_res == NULL) {
-               RTE_LOG(ERR, EAL, "%s(): cannot store uio mmap details\n", __func__);
+       /* save fd if in primary process */
+       dev->intr_handle.fd = open(devname, O_RDWR);
+       if (dev->intr_handle.fd < 0) {
+               RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
+                       devname, strerror(errno));
                return -1;
        }
-       uio_res->addr = mapaddr;
-       uio_res->offset = offset;
-       uio_res->size = size;
+       dev->intr_handle.type = RTE_INTR_HANDLE_UIO;
+
+       /* allocate the mapping details for secondary processes*/
+       if ((uio_res = rte_zmalloc("UIO_RES", sizeof (*uio_res), 0)) == NULL) {
+               RTE_LOG(ERR, EAL,
+                       "%s(): cannot store uio mmap details\n", __func__);
+               return (-1);
+       }
+
        rte_snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname);
        memcpy(&uio_res->pci_addr, &dev->addr, sizeof(uio_res->pci_addr));
 
+       /* collect info about device mappings */
+       nb_maps = pci_uio_get_mappings(dirname, uio_res->maps,
+                                      RTE_DIM(uio_res->maps));
+       if (nb_maps < 0) {
+               rte_free(uio_res);
+               return (nb_maps);
+       }
+
+       uio_res->nb_maps = nb_maps;
+
+       /* Map all BARs */
+       pagesz = sysconf(_SC_PAGESIZE);
+
+       maps = uio_res->maps;
+       for (i = 0; i != PCI_MAX_RESOURCE; i++) {
+
+               /* skip empty BAR */
+               if ((phaddr = dev->mem_resource[i].phys_addr) == 0)
+                       continue;
+
+               for (j = 0; j != nb_maps && (phaddr != maps[j].phaddr ||
+                               dev->mem_resource[i].len != maps[j].size);
+                               j++)
+                       ;
+
+               /* if matching map is found, then use it */
+               if (j != nb_maps) {
+                       offset = j * pagesz;
+                       if (maps[j].addr != NULL ||
+                           (mapaddr = pci_map_resource(NULL, devname,
+                                                       (off_t)offset,
+                                                       (size_t)maps[j].size)
+                           ) == NULL) {
+                               rte_free(uio_res);
+                               return (-1);
+                       }
+
+                       maps[j].addr = mapaddr;
+                       maps[j].offset = offset;
+                       dev->mem_resource[i].addr = mapaddr;
+               }
+       }
+
        TAILQ_INSERT_TAIL(uio_res_list, uio_res, next);
 
-       return 0;
+       return (0);
 }
 
 /* parse the "resource" sysfs file */
@@ -452,12 +521,14 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
        for (i = 0; i<PCI_MAX_RESOURCE; i++) {
 
                if (fgets(buf, sizeof(buf), f) == NULL) {
-                       RTE_LOG(ERR, EAL, "%s(): cannot read resource\n", __func__);
+                       RTE_LOG(ERR, EAL,
+                               "%s(): cannot read resource\n", __func__);
                        goto error;
                }
 
                if (rte_strsplit(buf, sizeof(buf), res_info.ptrs, 3, ' ') != 3) {
-                       RTE_LOG(ERR, EAL, "%s(): bad resource format\n", __func__);
+                       RTE_LOG(ERR, EAL,
+                               "%s(): bad resource format\n", __func__);
                        goto error;
                }
                errno = 0;
@@ -465,15 +536,16 @@ pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
                end_addr = strtoull(res_info.end_addr, NULL, 16);
                flags = strtoull(res_info.flags, NULL, 16);
                if (errno != 0) {
-                       RTE_LOG(ERR, EAL, "%s(): bad resource format\n", __func__);
+                       RTE_LOG(ERR, EAL,
+                               "%s(): bad resource format\n", __func__);
                        goto error;
                }
 
                if (flags & IORESOURCE_MEM) {
-                       dev->mem_resource.phys_addr = phys_addr;
-                       dev->mem_resource.len = end_addr - phys_addr + 1;
-                       dev->mem_resource.addr = NULL; /* not mapped for now */
-                       break;
+                       dev->mem_resource[i].phys_addr = phys_addr;
+                       dev->mem_resource[i].len = end_addr - phys_addr + 1;
+                       /* not mapped for now */
+                       dev->mem_resource[i].addr = NULL;
                }
        }
        fclose(f);
@@ -484,18 +556,52 @@ error:
        return -1;
 }
 
+/*
+ * parse a sysfs file containing one integer value
+ * different to the eal version, as it needs to work with 64-bit values
+ */
+static int
+pci_parse_sysfs_value(const char *filename, uint64_t *val)
+{
+        FILE *f;
+        char buf[BUFSIZ];
+        char *end = NULL;
+
+        f = fopen(filename, "r");
+        if (f == NULL) {
+                RTE_LOG(ERR, EAL, "%s(): cannot open sysfs value %s\n",
+                        __func__, filename);
+                return -1;
+        }
+
+        if (fgets(buf, sizeof(buf), f) == NULL) {
+                RTE_LOG(ERR, EAL, "%s(): cannot read sysfs value %s\n",
+                        __func__, filename);
+                fclose(f);
+                return -1;
+        }
+        *val = strtoull(buf, &end, 0);
+        if ((buf[0] == '\0') || (end == NULL) || (*end != '\n')) {
+                RTE_LOG(ERR, EAL, "%s(): cannot parse sysfs value %s\n",
+                                __func__, filename);
+                fclose(f);
+                return -1;
+        }
+        fclose(f);
+        return 0;
+}
 
 /* Compare two PCI device addresses. */
 static int
 pci_addr_comparison(struct rte_pci_addr *addr, struct rte_pci_addr *addr2)
 {
-        uint64_t dev_addr = (addr->domain << 24) + (addr->bus << 16) + (addr->devid << 8) + addr->function;
-        uint64_t dev_addr2 = (addr2->domain << 24) + (addr2->bus << 16) + (addr2->devid << 8) + addr2->function;
+       uint64_t dev_addr = (addr->domain << 24) + (addr->bus << 16) + (addr->devid << 8) + addr->function;
+       uint64_t dev_addr2 = (addr2->domain << 24) + (addr2->bus << 16) + (addr2->devid << 8) + addr2->function;
 
-        if (dev_addr > dev_addr2) 
-                return 1;      
-        else 
-                return 0;
+       if (dev_addr > dev_addr2)
+               return 1;
+       else
+               return 0;
 }
 
 
@@ -553,6 +659,28 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        }
        dev->id.subsystem_device_id = (uint16_t)tmp;
 
+       /* get max_vfs */
+       dev->max_vfs = 0;
+       rte_snprintf(filename, sizeof(filename), "%s/max_vfs", dirname);
+       if (!access(filename, F_OK) &&
+           eal_parse_sysfs_value(filename, &tmp) == 0) {
+               dev->max_vfs = (uint16_t)tmp;
+       }
+
+       /* get numa node */
+       rte_snprintf(filename, sizeof(filename), "%s/numa_node",
+                dirname);
+       if (access(filename, R_OK) != 0) {
+               /* if no NUMA support just set node to 0 */
+               dev->numa_node = -1;
+       } else {
+               if (eal_parse_sysfs_value(filename, &tmp) < 0) {
+                       free(dev);
+                       return -1;
+               }
+               dev->numa_node = tmp;
+       }
+
        /* parse resources */
        rte_snprintf(filename, sizeof(filename), "%s/resource", dirname);
        if (pci_parse_sysfs_resource(filename, dev) < 0) {
@@ -562,13 +690,13 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
        }
 
        /* device is valid, add in list (sorted) */
-       if (TAILQ_EMPTY(&device_list)) {
-               TAILQ_INSERT_TAIL(&device_list, dev, next);
-       }       
+       if (TAILQ_EMPTY(&pci_device_list)) {
+               TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
+       }
        else {
                struct rte_pci_device *dev2 = NULL;
 
-               TAILQ_FOREACH(dev2, &device_list, next) {
+               TAILQ_FOREACH(dev2, &pci_device_list, next) {
                        if (pci_addr_comparison(&dev->addr, &dev2->addr))
                                continue;
                        else {
@@ -576,9 +704,9 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus,
                                return 0;
                        }
                }
-               TAILQ_INSERT_TAIL(&device_list, dev, next);
+               TAILQ_INSERT_TAIL(&pci_device_list, dev, next);
        }
-                               
+
        return 0;
 }
 
@@ -670,104 +798,6 @@ error:
        return -1;
 }
 
-/* unbind kernel driver for this device */
-static int
-pci_unbind_kernel_driver(struct rte_pci_device *dev)
-{
-       int n;
-       FILE *f;
-       char filename[PATH_MAX];
-       char buf[BUFSIZ];
-       struct rte_pci_addr *loc = &dev->addr;
-
-       /* open /sys/bus/pci/devices/AAAA:BB:CC.D/driver */
-       rte_snprintf(filename, sizeof(filename),
-                SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/driver/unbind",
-                loc->domain, loc->bus, loc->devid, loc->function);
-
-       RTE_LOG(DEBUG, EAL, "unbind kernel driver %s\n", filename);
-
-       f = fopen(filename, "w");
-       if (f == NULL) /* device was not bound */
-               return 0;
-
-       n = rte_snprintf(buf, sizeof(buf), PCI_PRI_FMT "\n",
-                    loc->domain, loc->bus, loc->devid, loc->function);
-       if ((n < 0) || (n >= (int)sizeof(buf))) {
-               RTE_LOG(ERR, EAL, "%s(): rte_snprintf failed\n", __func__);
-               goto error;
-       }
-       if (fwrite(buf, n, 1, f) == 0) {
-               RTE_LOG(ERR, EAL, "%s(): could not write to %s\n", __func__,
-                               filename);
-               goto error;
-       }
-
-       fclose(f);
-       return 0;
-
-error:
-       fclose(f);
-       return -1;
-}
-
-static int
-pci_exit_process(struct rte_pci_device *dev)
-{
-       if (munmap(dev->mem_resource.addr, dev->mem_resource.len) == -1){
-               RTE_LOG(ERR, EAL, "Error with munmap\n");
-               return -1;
-       }
-       if (close(dev->intr_handle.fd) == -1){
-               RTE_LOG(ERR, EAL, "Error closing interrupt handle\n");
-               return -1;
-       }
-       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-               if (pci_unbind_kernel_driver(dev) < 0){
-                       RTE_LOG(ERR, EAL, "Error unbinding\n");
-                       return -1;
-               }
-               if (pci_bind_device(dev, dev->previous_dr) < 0){
-                       RTE_LOG(ERR, EAL, "Error binding\n");
-                       return -1;
-               }
-       }
-
-       return 0;
-}
-
-static void
-pci_get_previous_driver_path(struct rte_pci_device *dev)
-{
-       int n;
-       char dev_path[PATH_MAX];
-       char dr_path[PATH_MAX];
-       struct rte_pci_addr *loc = &dev->addr;
-
-       n = rte_snprintf(dev_path, sizeof(dev_path), SYSFS_PCI_DEVICES "/"
-                       PCI_PRI_FMT "/driver", loc->domain, loc->bus, loc->devid, loc->function );
-       if ((n < 0) || (n >= (int)sizeof(dev_path)))
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf device filepath\n");
-
-       n = readlink(dev_path, dr_path, sizeof(dr_path));
-       if ((n < 0) || (n >= (int)sizeof(dr_path))){
-               RTE_LOG(ERR, EAL, "Cannot readlink driver filepath\n");
-               dev->previous_dr[0] = '\0';
-               return;
-       }
-       dr_path[n] = '\0';
-
-       if (dr_path[0] != '/')
-               n = rte_snprintf(dev->previous_dr, sizeof(dev->previous_dr),
-                               SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/%s",
-                               loc->domain, loc->bus, loc->devid, loc->function, dr_path);
-       else
-               n = rte_snprintf(dev->previous_dr, sizeof(dev->previous_dr),
-                               "%s", dr_path);
-       if ((n < 0) || (n >= (int)sizeof(dev_path)))
-               RTE_LOG(ERR, EAL, "Cannot rte_snprintf driver filepath\n");
-}
-
 /*
  * If vendor/device ID match, call the devinit() function of the
  * driver.
@@ -776,11 +806,6 @@ int
 rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
 {
        struct rte_pci_id *id_table;
-       const char *module_name = NULL;
-       int uio_status = -1;
-
-       if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO)
-               module_name = IGB_UIO_NAME;
 
        for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
 
@@ -798,64 +823,49 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
                                id_table->subsystem_device_id != PCI_ANY_ID)
                        continue;
 
-               RTE_LOG(DEBUG, EAL, "probe driver: %x:%x %s\n", dev->id.vendor_id,
-                               dev->id.device_id, dr->name);
+               struct rte_pci_addr *loc = &dev->addr;
 
-               /* reference driver structure */
-               dev->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);
+
+               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->blacklisted)
+               if (dev->devargs != NULL &&
+                       dev->devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) {
+                       RTE_LOG(DEBUG, EAL, "  Device is blacklisted, not initializing\n");
                        return 0;
+               }
 
-               /* Unbind PCI devices if needed */
-               if (module_name != NULL) {
-
-                       if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-                               /* check that our driver is loaded */
-                               if (uio_status != 0 &&
-                                               (uio_status = pci_uio_check_module(module_name)) != 0)
-                                       rte_exit(EXIT_FAILURE, "The %s module is required by the "
-                                                       "%s driver\n", module_name, dr->name);
-
-                               /* unbind current driver, bind ours */
-                               pci_get_previous_driver_path(dev);
-                               if (pci_unbind_kernel_driver(dev) < 0)
-                                       return -1;
-                               if (pci_uio_bind_device(dev, module_name) < 0)
-                                       return -1;
-                       }
-                       /* map the NIC resources */
+               if (dr->drv_flags & RTE_PCI_DRV_NEED_IGB_UIO) {
+                       /* map resources for devices that use igb_uio */
                        if (pci_uio_map_resource(dev) < 0)
                                return -1;
+               } else if (dr->drv_flags & RTE_PCI_DRV_FORCE_UNBIND &&
+                          rte_eal_process_type() == RTE_PROC_PRIMARY) {
+                       /* unbind current driver */
+                       if (pci_unbind_kernel_driver(dev) < 0)
+                               return -1;
                }
 
+               /* reference driver structure */
+               dev->driver = dr;
+
                /* call the driver devinit() function */
                return dr->devinit(dr, dev);
        }
-       return -1;
-}
-
-/*Start the exit process for each dev in use*/
-void
-rte_eal_pci_exit(void)
-{
-       struct rte_pci_device *dev = NULL;
-
-       TAILQ_FOREACH(dev, &device_list, next){
-               if (dev->previous_dr[0] == '\0')
-                       continue;
-               if(pci_exit_process(dev) == 1)
-                       RTE_LOG(ERR, EAL, "Exit process failure\n");
-       }
+       /* return positive value if driver is not found */
+       return 1;
 }
 
 /* Init the PCI EAL subsystem */
 int
 rte_eal_pci_init(void)
 {
-       TAILQ_INIT(&driver_list);
-       TAILQ_INIT(&device_list);
+       TAILQ_INIT(&pci_driver_list);
+       TAILQ_INIT(&pci_device_list);
        uio_res_list = RTE_TAILQ_RESERVE_BY_IDX(RTE_TAILQ_PCI, uio_res_list);
 
        /* for debug purposes, PCI can be disabled */