pci/bsd: rename structures

[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 4d2fbbb..05314fc 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -58,7 +58,6 @@
 #include <rte_launch.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_per_lcore.h>
@@ -84,7 +83,7 @@
  * enabling bus master.
  */
 
-struct uio_map {
+struct pci_map {
        void *addr;
        uint64_t offset;
        uint64_t size;
@@ -95,18 +94,21 @@ struct uio_map {
  * For multi-process we need to reproduce all PCI mappings in secondary
  * processes, so save them in a tailq.
  */
-struct uio_resource {
-       TAILQ_ENTRY(uio_resource) next;
+struct mapped_pci_resource {
+       TAILQ_ENTRY(mapped_pci_resource) next;
 
        struct rte_pci_addr pci_addr;
        char path[PATH_MAX];
        size_t nb_maps;
-       struct uio_map maps[PCI_MAX_RESOURCE];
+       struct pci_map maps[PCI_MAX_RESOURCE];
 };
 
-TAILQ_HEAD(uio_res_list, uio_resource);
+TAILQ_HEAD(mapped_pci_res_list, mapped_pci_resource);
 
-static struct uio_res_list *uio_res_list = NULL;
+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
@@ -159,8 +161,10 @@ fail:
 static int
 pci_uio_map_secondary(struct rte_pci_device *dev)
 {
-        size_t i;
-        struct uio_resource *uio_res;
+       size_t i;
+       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) {
 
@@ -176,10 +180,10 @@ pci_uio_map_secondary(struct rte_pci_device *dev)
                            != uio_res->maps[i].addr) {
                                RTE_LOG(ERR, EAL,
                                        "Cannot mmap device resource\n");
-                               return (-1);
+                               return -1;
                        }
                }
-               return (0);
+               return 0;
        }
 
        RTE_LOG(ERR, EAL, "Cannot find resource for device\n");
@@ -197,15 +201,17 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        uint64_t offset;
        uint64_t pagesz;
        struct rte_pci_addr *loc = &dev->addr;
-       struct uio_resource *uio_res;
-       struct uio_map *maps;
+       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);
+       struct pci_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));
+               return pci_uio_map_secondary(dev);
 
        snprintf(devname, sizeof(devname), "/dev/uio@pci:%u:%u:%u",
                        dev->addr.bus, dev->addr.devid, dev->addr.function);
@@ -221,7 +227,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        if (dev->intr_handle.fd < 0) {
                RTE_LOG(ERR, EAL, "Cannot open %s: %s\n",
                        devname, strerror(errno));
-               return -1;
+               goto error;
        }
        dev->intr_handle.type = RTE_INTR_HANDLE_UIO;
 
@@ -229,7 +235,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        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);
+               goto error;
        }
 
        snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname);
@@ -256,8 +262,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
                    (mapaddr = pci_map_resource(NULL, devname, (off_t)offset,
                                                (size_t)maps[j].size)
                    ) == NULL) {
-                       rte_free(uio_res);
-                       return (-1);
+                       goto error;
                }
 
                maps[j].addr = mapaddr;
@@ -267,7 +272,16 @@ pci_uio_map_resource(struct rte_pci_device *dev)
 
        TAILQ_INSERT_TAIL(uio_res_list, uio_res, next);
 
-       return (0);
+       return 0;
+
+error:
+       rte_free(uio_res);
+       if (dev->intr_handle.fd >= 0) {
+               close(dev->intr_handle.fd);
+               dev->intr_handle.fd = -1;
+               dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
+       }
+       return -1;
 }
 
 /* Scan one pci sysfs entry, and fill the devices list from it. */
@@ -307,7 +321,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
        /* FreeBSD has no NUMA support (yet) */
        dev->numa_node = 0;
 
-/* parse resources */
+       /* parse resources */
        switch (conf->pc_hdr & PCIM_HDRTYPE) {
        case PCIM_HDRTYPE_NORMAL:
                max = PCIR_MAX_BAR_0;
@@ -352,8 +366,7 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
                                TAILQ_INSERT_BEFORE(dev2, dev, next);
                                return 0;
                        } else { /* already registered */
-                               /* update pt_driver */
-                               dev2->pt_driver = dev->pt_driver;
+                               dev2->kdrv = dev->kdrv;
                                dev2->max_vfs = dev->max_vfs;
                                memmove(dev2->mem_resource,
                                        dev->mem_resource,
@@ -429,7 +442,7 @@ error:
 int
 rte_eal_pci_probe_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;
        int ret;
 
        for (id_table = dr->id_table ; id_table->vendor_id != 0; id_table++) {
@@ -493,7 +506,6 @@ rte_eal_pci_init(void)
 {
        TAILQ_INIT(&pci_driver_list);
        TAILQ_INIT(&pci_device_list);
-       uio_res_list = RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_PCI, uio_res_list);
 
        /* for debug purposes, PCI can be disabled */
        if (internal_config.no_pci)