eal: add synchronous interrupt unregister

[dpdk.git] / drivers / bus / pci / linux / pci.c

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index bf27594..0dc99e9 100644 (file)
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -352,6 +352,7 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
                                if (!rte_dev_is_probed(&dev2->device)) {
                                        dev2->kdrv = dev->kdrv;
                                        dev2->max_vfs = dev->max_vfs;
+                                       dev2->id = dev->id;
                                        pci_name_set(dev2);
                                        memmove(dev2->mem_resource,
                                                dev->mem_resource,
@@ -365,7 +366,8 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
                                         * need to do anything here unless...
                                         **/
                                        if (dev2->kdrv != dev->kdrv ||
-                                               dev2->max_vfs != dev->max_vfs)
+                                               dev2->max_vfs != dev->max_vfs ||
+                                               memcmp(&dev2->id, &dev->id, sizeof(dev2->id)))
                                                /*
                                                 * This should not happens.
                                                 * But it is still possible if
@@ -395,18 +397,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
        return 0;
 }
 
-int
-pci_update_device(const struct rte_pci_addr *addr)
-{
-       char filename[PATH_MAX];
-
-       snprintf(filename, sizeof(filename), "%s/" PCI_PRI_FMT,
-                rte_pci_get_sysfs_path(), addr->domain, addr->bus, addr->devid,
-                addr->function);
-
-       return pci_scan_one(filename, addr);
-}
-
 /*
  * split up a pci address into its constituent parts.
  */
@@ -687,71 +677,6 @@ int rte_pci_write_config(const struct rte_pci_device *device,
        }
 }
 
-#if defined(RTE_ARCH_X86)
-static int
-pci_ioport_map(struct rte_pci_device *dev, int bar __rte_unused,
-               struct rte_pci_ioport *p)
-{
-       uint16_t start, end;
-       FILE *fp;
-       char *line = NULL;
-       char pci_id[16];
-       int found = 0;
-       size_t linesz;
-
-       if (rte_eal_iopl_init() != 0) {
-               RTE_LOG(ERR, EAL, "%s(): insufficient ioport permissions for PCI device %s\n",
-                       __func__, dev->name);
-               return -1;
-       }
-
-       snprintf(pci_id, sizeof(pci_id), PCI_PRI_FMT,
-                dev->addr.domain, dev->addr.bus,
-                dev->addr.devid, dev->addr.function);
-
-       fp = fopen("/proc/ioports", "r");
-       if (fp == NULL) {
-               RTE_LOG(ERR, EAL, "%s(): can't open ioports\n", __func__);
-               return -1;
-       }
-
-       while (getdelim(&line, &linesz, '\n', fp) > 0) {
-               char *ptr = line;
-               char *left;
-               int n;
-
-               n = strcspn(ptr, ":");
-               ptr[n] = 0;
-               left = &ptr[n + 1];
-
-               while (*left && isspace(*left))
-                       left++;
-
-               if (!strncmp(left, pci_id, strlen(pci_id))) {
-                       found = 1;
-
-                       while (*ptr && isspace(*ptr))
-                               ptr++;
-
-                       sscanf(ptr, "%04hx-%04hx", &start, &end);
-
-                       break;
-               }
-       }
-
-       free(line);
-       fclose(fp);
-
-       if (!found)
-               return -1;
-
-       p->base = start;
-       RTE_LOG(DEBUG, EAL, "PCI Port IO found start=0x%x\n", start);
-
-       return 0;
-}
-#endif
-
 int
 rte_pci_ioport_map(struct rte_pci_device *dev, int bar,
                struct rte_pci_ioport *p)
@@ -766,14 +691,8 @@ rte_pci_ioport_map(struct rte_pci_device *dev, int bar,
                break;
 #endif
        case RTE_PCI_KDRV_IGB_UIO:
-               ret = pci_uio_ioport_map(dev, bar, p);
-               break;
        case RTE_PCI_KDRV_UIO_GENERIC:
-#if defined(RTE_ARCH_X86)
-               ret = pci_ioport_map(dev, bar, p);
-#else
                ret = pci_uio_ioport_map(dev, bar, p);
-#endif
                break;
        default:
                break;
@@ -796,8 +715,6 @@ rte_pci_ioport_read(struct rte_pci_ioport *p,
                break;
 #endif
        case RTE_PCI_KDRV_IGB_UIO:
-               pci_uio_ioport_read(p, data, len, offset);
-               break;
        case RTE_PCI_KDRV_UIO_GENERIC:
                pci_uio_ioport_read(p, data, len, offset);
                break;
@@ -817,8 +734,6 @@ rte_pci_ioport_write(struct rte_pci_ioport *p,
                break;
 #endif
        case RTE_PCI_KDRV_IGB_UIO:
-               pci_uio_ioport_write(p, data, len, offset);
-               break;
        case RTE_PCI_KDRV_UIO_GENERIC:
                pci_uio_ioport_write(p, data, len, offset);
                break;
@@ -840,14 +755,8 @@ rte_pci_ioport_unmap(struct rte_pci_ioport *p)
                break;
 #endif
        case RTE_PCI_KDRV_IGB_UIO:
-               ret = pci_uio_ioport_unmap(p);
-               break;
        case RTE_PCI_KDRV_UIO_GENERIC:
-#if defined(RTE_ARCH_X86)
-               ret = 0;
-#else
                ret = pci_uio_ioport_unmap(p);
-#endif
                break;
        default:
                break;