New upstream version 17.11-rc3

[deb_dpdk.git] / drivers / bus / pci / linux / pci_uio.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/drivers/bus/pci/linux/pci_uio.c
similarity index 97%
rename from lib/librte_eal/linuxapp/eal/eal_pci_uio.c
rename to drivers/bus/pci/linux/pci_uio.c
index fa10329..92b7f02 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
+++ b/drivers/bus/pci/linux/pci_uio.c
@@ -47,12 +47,13 @@
 
 #include <rte_log.h>
 #include <rte_pci.h>
+#include <rte_bus_pci.h>
 #include <rte_eal_memconfig.h>
 #include <rte_common.h>
 #include <rte_malloc.h>
 
 #include "eal_filesystem.h"
-#include "eal_pci_init.h"
+#include "pci_init.h"
 
 void *pci_map_addr = NULL;
 
@@ -154,7 +155,7 @@ pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf,
                           unsigned int buflen, int create)
 {
        struct rte_pci_addr *loc = &dev->addr;
-       unsigned int uio_num;
+       int uio_num = -1;
        struct dirent *e;
        DIR *dir;
        char dirname[PATH_MAX];
@@ -163,14 +164,14 @@ pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf,
         * or uio:uioX */
 
        snprintf(dirname, sizeof(dirname),
-                       "%s/" PCI_PRI_FMT "/uio", pci_get_sysfs_path(),
+                       "%s/" PCI_PRI_FMT "/uio", rte_pci_get_sysfs_path(),
                        loc->domain, loc->bus, loc->devid, loc->function);
 
        dir = opendir(dirname);
        if (dir == NULL) {
                /* retry with the parent directory */
                snprintf(dirname, sizeof(dirname),
-                               "%s/" PCI_PRI_FMT, pci_get_sysfs_path(),
+                               "%s/" PCI_PRI_FMT, rte_pci_get_sysfs_path(),
                                loc->domain, loc->bus, loc->devid, loc->function);
                dir = opendir(dirname);
 
@@ -214,7 +215,7 @@ pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf,
                return -1;
 
        /* create uio device if we've been asked to */
-       if (internal_config.create_uio_dev && create &&
+       if (rte_eal_create_uio_dev() && create &&
                        pci_mknod_uio_dev(dstbuf, uio_num) < 0)
                RTE_LOG(WARNING, EAL, "Cannot create /dev/uio%u\n", uio_num);
 
@@ -322,7 +323,7 @@ pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx,
        /* update devname for mmap  */
        snprintf(devname, sizeof(devname),
                        "%s/" PCI_PRI_FMT "/resource%d",
-                       pci_get_sysfs_path(),
+                       rte_pci_get_sysfs_path(),
                        loc->domain, loc->bus, loc->devid,
                        loc->function, res_idx);
 
@@ -431,7 +432,7 @@ pci_uio_ioport_map(struct rte_pci_device *dev, int bar,
 
        /* open and read addresses of the corresponding resource in sysfs */
        snprintf(filename, sizeof(filename), "%s/" PCI_PRI_FMT "/resource",
-               pci_get_sysfs_path(), dev->addr.domain, dev->addr.bus,
+               rte_pci_get_sysfs_path(), dev->addr.domain, dev->addr.bus,
                dev->addr.devid, dev->addr.function);
        f = fopen(filename, "r");
        if (f == NULL) {
@@ -453,7 +454,7 @@ pci_uio_ioport_map(struct rte_pci_device *dev, int bar,
                goto error;
        }
        snprintf(filename, sizeof(filename), "%s/" PCI_PRI_FMT "/resource%d",
-               pci_get_sysfs_path(), dev->addr.domain, dev->addr.bus,
+               rte_pci_get_sysfs_path(), dev->addr.domain, dev->addr.bus,
                dev->addr.devid, dev->addr.function, bar);
 
        /* mmap the pci resource */