pci: merge mapping functions for linux and bsd

[dpdk.git] / lib / librte_eal / linuxapp / eal / eal_pci.c

diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
index 9cb0ffd..7e8df7d 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_pci.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
@@ -33,7 +33,6 @@
 
 #include <string.h>
 #include <dirent.h>
-#include <sys/mman.h>
 
 #include <rte_log.h>
 #include <rte_pci.h>
@@ -142,46 +141,6 @@ pci_find_max_end_va(void)
        return RTE_PTR_ADD(last->addr, last->len);
 }
 
-
-/* map a particular resource from a file */
-void *
-pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size,
-                int additional_flags)
-{
-       void *mapaddr;
-
-       /* Map the PCI memory resource of device */
-       mapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
-                       MAP_SHARED | additional_flags, fd, offset);
-       if (mapaddr == MAP_FAILED) {
-               RTE_LOG(ERR, EAL, "%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\n",
-                       __func__, fd, requested_addr,
-                       (unsigned long)size, (unsigned long)offset,
-                       strerror(errno), mapaddr);
-       } else {
-               RTE_LOG(DEBUG, EAL, "  PCI memory mapped at %p\n", mapaddr);
-       }
-
-       return mapaddr;
-}
-
-/* unmap a particular resource */
-void
-pci_unmap_resource(void *requested_addr, size_t size)
-{
-       if (requested_addr == NULL)
-               return;
-
-       /* Unmap the PCI memory resource of device */
-       if (munmap(requested_addr, size)) {
-               RTE_LOG(ERR, EAL, "%s(): cannot munmap(%p, 0x%lx): %s\n",
-                       __func__, requested_addr, (unsigned long)size,
-                       strerror(errno));
-       } else
-               RTE_LOG(DEBUG, EAL, "  PCI memory unmapped at %p\n",
-                               requested_addr);
-}
-
 /* parse the "resource" sysfs file */
 static int
 pci_parse_sysfs_resource(const char *filename, struct rte_pci_device *dev)
@@ -563,59 +522,6 @@ pci_config_space_set(struct rte_pci_device *dev)
 }
 #endif
 
-static int
-pci_map_device(struct rte_pci_device *dev)
-{
-       int ret = -1;
-
-       /* try mapping the NIC resources using VFIO if it exists */
-       switch (dev->kdrv) {
-       case RTE_KDRV_VFIO:
-#ifdef VFIO_PRESENT
-               if (pci_vfio_is_enabled())
-                       ret = pci_vfio_map_resource(dev);
-#endif
-               break;
-       case RTE_KDRV_IGB_UIO:
-       case RTE_KDRV_UIO_GENERIC:
-               /* map resources for devices that use uio */
-               ret = pci_uio_map_resource(dev);
-               break;
-       default:
-               RTE_LOG(DEBUG, EAL, "  Not managed by a supported kernel driver,"
-                       " skipped\n");
-               ret = 1;
-               break;
-       }
-
-       return ret;
-}
-
-#ifdef RTE_LIBRTE_EAL_HOTPLUG
-static void
-pci_unmap_device(struct rte_pci_device *dev)
-{
-       if (dev == NULL)
-               return;
-
-       /* try unmapping the NIC resources using VFIO if it exists */
-       switch (dev->kdrv) {
-       case RTE_KDRV_VFIO:
-               RTE_LOG(ERR, EAL, "Hotplug doesn't support vfio yet\n");
-               break;
-       case RTE_KDRV_IGB_UIO:
-       case RTE_KDRV_UIO_GENERIC:
-               /* unmap resources for devices that use uio */
-               pci_uio_unmap_resource(dev);
-               break;
-       default:
-               RTE_LOG(DEBUG, EAL, "  Not managed by a supported kernel driver,"
-                       " skipped\n");
-               break;
-       }
-}
-#endif /* RTE_LIBRTE_EAL_HOTPLUG */
-
 /*
  * If vendor/device ID match, call the devinit() function of the
  * driver.
@@ -624,9 +530,9 @@ int
 rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *dev)
 {
        int ret;
-       struct rte_pci_id *id_table;
+       const struct rte_pci_id *id_table;
 
-       for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
+       for (id_table = dr->id_table; id_table->vendor_id != 0; id_table++) {
 
                /* check if device's identifiers match the driver's ones */
                if (id_table->vendor_id != dev->id.vendor_id &&
@@ -696,12 +602,12 @@ int
 rte_eal_pci_close_one_driver(struct rte_pci_driver *dr,
                struct rte_pci_device *dev)
 {
-       struct rte_pci_id *id_table;
+       const struct rte_pci_id *id_table;
 
        if ((dr == NULL) || (dev == NULL))
                return -EINVAL;
 
-       for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
+       for (id_table = dr->id_table; id_table->vendor_id != 0; id_table++) {
 
                /* check if device's identifiers match the driver's ones */
                if (id_table->vendor_id != dev->id.vendor_id &&