pci: merge uio functions for linux and bsd

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

diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
index dc4608d..51b1afd 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -82,10 +82,6 @@
  * network card, only providing access to PCI BAR to applications, and
  * enabling bus master.
  */
-static struct rte_tailq_elem rte_uio_tailq = {
-       .name = "UIO_RESOURCE_LIST",
-};
-EAL_REGISTER_TAILQ(rte_uio_tailq)
 
 /* unbind kernel driver for this device */
 static int
@@ -96,52 +92,7 @@ pci_unbind_kernel_driver(struct rte_pci_device *dev __rte_unused)
        return -ENOTSUP;
 }
 
-static int
-pci_uio_map_secondary(struct rte_pci_device *dev)
-{
-       int i, fd;
-       struct mapped_pci_resource *uio_res;
-       struct mapped_pci_res_list *uio_res_list =
-                       RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
-
-       TAILQ_FOREACH(uio_res, uio_res_list, next) {
-
-               /* skip this element if it doesn't match our PCI address */
-               if (rte_eal_compare_pci_addr(&uio_res->pci_addr, &dev->addr))
-                       continue;
-
-               for (i = 0; i != uio_res->nb_maps; i++) {
-                       /*
-                        * open devname, to mmap it
-                        */
-                       fd = open(uio_res->maps[i].path, O_RDWR);
-                       if (fd < 0) {
-                               RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
-                                       uio_res->maps[i].path, strerror(errno));
-                               return -1;
-                       }
-
-                       void *mapaddr = pci_map_resource(uio_res->maps[i].addr,
-                                       fd, (off_t)uio_res->maps[i].offset,
-                                       (size_t)uio_res->maps[i].size, 0);
-                       /* fd is not needed in slave process, close it */
-                       close(fd);
-                       if (mapaddr != uio_res->maps[i].addr) {
-                               RTE_LOG(ERR, EAL,
-                                       "Cannot mmap device resource file %s to address: %p\n",
-                                       uio_res->maps[i].path,
-                                       uio_res->maps[i].addr);
-                               return -1;
-                       }
-               }
-               return 0;
-       }
-
-       RTE_LOG(ERR, EAL, "Cannot find resource for device\n");
-       return 1;
-}
-
-static void
+void
 pci_uio_free_resource(struct rte_pci_device *dev,
                struct mapped_pci_resource *uio_res)
 {
@@ -154,7 +105,7 @@ pci_uio_free_resource(struct rte_pci_device *dev,
        }
 }
 
-static int
+int
 pci_uio_alloc_resource(struct rte_pci_device *dev,
                struct mapped_pci_resource **uio_res)
 {
@@ -199,7 +150,7 @@ error:
        return -1;
 }
 
-static int
+int
 pci_uio_map_resource_by_index(struct rte_pci_device *dev, int res_idx,
                struct mapped_pci_resource *uio_res, int map_idx)
 {
@@ -254,55 +205,6 @@ error:
        return -1;
 }
 
-/* map the PCI resource of a PCI device in virtual memory */
-static int
-pci_uio_map_resource(struct rte_pci_device *dev)
-{
-       int i, map_idx = 0, ret;
-       uint64_t phaddr;
-       struct mapped_pci_resource *uio_res = NULL;
-       struct mapped_pci_res_list *uio_res_list =
-               RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list);
-
-       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);
-
-       /* allocate uio resource */
-       ret = pci_uio_alloc_resource(dev, &uio_res);
-       if (ret)
-               return ret;
-
-       /* Map all BARs */
-       for (i = 0; i != PCI_MAX_RESOURCE; i++) {
-               /* skip empty BAR */
-               if ((phaddr = dev->mem_resource[i].phys_addr) == 0)
-                       continue;
-
-               ret = pci_uio_map_resource_by_index(dev, i,
-                               uio_res, map_idx);
-               if (ret)
-                       goto error;
-
-               map_idx++;
-       }
-
-       uio_res->nb_maps = map_idx;
-
-       TAILQ_INSERT_TAIL(uio_res_list, uio_res, next);
-
-       return 0;
-error:
-       for (i = 0; i < map_idx; i++)
-               rte_free(uio_res->maps[i].path);
-       pci_uio_free_resource(dev, uio_res);
-       return -1;
-}
-
-/* Scan one pci sysfs entry, and fill the devices list from it. */
 static int
 pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
 {