pci: initialize lists statically

[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 ff56cd3..a73cbb0 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -51,6 +51,11 @@
 #include <sys/pciio.h>
 #include <dev/pci/pcireg.h>
 
+#if defined(RTE_ARCH_X86)
+#include <sys/types.h>
+#include <machine/cpufunc.h>
+#endif
+
 #include <rte_interrupts.h>
 #include <rte_log.h>
 #include <rte_pci.h>
@@ -93,7 +98,7 @@ pci_unbind_kernel_driver(struct rte_pci_device *dev __rte_unused)
 
 /* Map pci device */
 int
-pci_map_device(struct rte_pci_device *dev)
+rte_eal_pci_map_device(struct rte_pci_device *dev)
 {
        int ret = -1;
 
@@ -115,7 +120,7 @@ pci_map_device(struct rte_pci_device *dev)
 
 /* Unmap pci device */
 void
-pci_unmap_device(struct rte_pci_device *dev)
+rte_eal_pci_unmap_device(struct rte_pci_device *dev)
 {
        /* try unmapping the NIC resources */
        switch (dev->kdrv) {
@@ -273,6 +278,11 @@ pci_scan_one(int dev_pci_fd, struct pci_conf *conf)
        /* get subsystem_device id */
        dev->id.subsystem_device_id = conf->pc_subdevice;
 
+       /* get class id */
+       dev->id.class_id = (conf->pc_class << 16) |
+                          (conf->pc_subclass << 8) |
+                          (conf->pc_progif);
+
        /* TODO: get max_vfs */
        dev->max_vfs = 0;
 
@@ -417,7 +427,7 @@ int rte_eal_pci_read_config(const struct rte_pci_device *dev,
                goto error;
        }
 
-       fd = open("/dev/pci", O_RDONLY);
+       fd = open("/dev/pci", O_RDWR);
        if (fd < 0) {
                RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__);
                goto error;
@@ -450,7 +460,7 @@ int rte_eal_pci_write_config(const struct rte_pci_device *dev,
                        .pc_func = dev->addr.function,
                },
                .pi_reg = offset,
-               .pi_data = *(u_int32_t *)buf,
+               .pi_data = *(const uint32_t *)buf,
                .pi_width = len,
        };
 
@@ -459,9 +469,9 @@ int rte_eal_pci_write_config(const struct rte_pci_device *dev,
                goto error;
        }
 
-       memcpy(pi.pi_data, buf, len);
+       memcpy(&pi.pi_data, buf, len);
 
-       fd = open("/dev/pci", O_RDONLY);
+       fd = open("/dev/pci", O_RDWR);
        if (fd < 0) {
                RTE_LOG(ERR, EAL, "%s(): error opening /dev/pci\n", __func__);
                goto error;
@@ -479,13 +489,140 @@ int rte_eal_pci_write_config(const struct rte_pci_device *dev,
        return -1;
 }
 
+int
+rte_eal_pci_ioport_map(struct rte_pci_device *dev, int bar,
+                      struct rte_pci_ioport *p)
+{
+       int ret;
+
+       switch (dev->kdrv) {
+#if defined(RTE_ARCH_X86)
+       case RTE_KDRV_NIC_UIO:
+               if ((uintptr_t) dev->mem_resource[bar].addr <= UINT16_MAX) {
+                       p->base = (uintptr_t)dev->mem_resource[bar].addr;
+                       ret = 0;
+               } else
+                       ret = -1;
+               break;
+#endif
+       default:
+               ret = -1;
+               break;
+       }
+
+       if (!ret)
+               p->dev = dev;
+
+       return ret;
+}
+
+static void
+pci_uio_ioport_read(struct rte_pci_ioport *p,
+                   void *data, size_t len, off_t offset)
+{
+#if defined(RTE_ARCH_X86)
+       uint8_t *d;
+       int size;
+       unsigned short reg = p->base + offset;
+
+       for (d = data; len > 0; d += size, reg += size, len -= size) {
+               if (len >= 4) {
+                       size = 4;
+                       *(uint32_t *)d = inl(reg);
+               } else if (len >= 2) {
+                       size = 2;
+                       *(uint16_t *)d = inw(reg);
+               } else {
+                       size = 1;
+                       *d = inb(reg);
+               }
+       }
+#else
+       RTE_SET_USED(p);
+       RTE_SET_USED(data);
+       RTE_SET_USED(len);
+       RTE_SET_USED(offset);
+#endif
+}
+
+void
+rte_eal_pci_ioport_read(struct rte_pci_ioport *p,
+                       void *data, size_t len, off_t offset)
+{
+       switch (p->dev->kdrv) {
+       case RTE_KDRV_NIC_UIO:
+               pci_uio_ioport_read(p, data, len, offset);
+               break;
+       default:
+               break;
+       }
+}
+
+static void
+pci_uio_ioport_write(struct rte_pci_ioport *p,
+                    const void *data, size_t len, off_t offset)
+{
+#if defined(RTE_ARCH_X86)
+       const uint8_t *s;
+       int size;
+       unsigned short reg = p->base + offset;
+
+       for (s = data; len > 0; s += size, reg += size, len -= size) {
+               if (len >= 4) {
+                       size = 4;
+                       outl(*(const uint32_t *)s, reg);
+               } else if (len >= 2) {
+                       size = 2;
+                       outw(*(const uint16_t *)s, reg);
+               } else {
+                       size = 1;
+                       outb(*s, reg);
+               }
+       }
+#else
+       RTE_SET_USED(p);
+       RTE_SET_USED(data);
+       RTE_SET_USED(len);
+       RTE_SET_USED(offset);
+#endif
+}
+
+void
+rte_eal_pci_ioport_write(struct rte_pci_ioport *p,
+                        const void *data, size_t len, off_t offset)
+{
+       switch (p->dev->kdrv) {
+       case RTE_KDRV_NIC_UIO:
+               pci_uio_ioport_write(p, data, len, offset);
+               break;
+       default:
+               break;
+       }
+}
+
+int
+rte_eal_pci_ioport_unmap(struct rte_pci_ioport *p)
+{
+       int ret;
+
+       switch (p->dev->kdrv) {
+#if defined(RTE_ARCH_X86)
+       case RTE_KDRV_NIC_UIO:
+               ret = 0;
+               break;
+#endif
+       default:
+               ret = -1;
+               break;
+       }
+
+       return ret;
+}
+
 /* Init the PCI EAL subsystem */
 int
 rte_eal_pci_init(void)
 {
-       TAILQ_INIT(&pci_driver_list);
-       TAILQ_INIT(&pci_device_list);
-
        /* for debug purposes, PCI can be disabled */
        if (internal_config.no_pci)
                return 0;