New upstream version 16.11.5

[deb_dpdk.git] / lib / librte_eal / linuxapp / igb_uio / igb_uio.c

diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
index 72b2692..9f00f07 100644 (file)
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
@@ -81,62 +81,10 @@ store_max_vfs(struct device *dev, struct device_attribute *attr,
        return err ? err : count;
 }
 
-#ifdef RTE_PCI_CONFIG
-static ssize_t
-show_extended_tag(struct device *dev, struct device_attribute *attr, char *buf)
-{
-       dev_info(dev, "Deprecated\n");
-
-       return 0;
-}
-
-static ssize_t
-store_extended_tag(struct device *dev,
-                  struct device_attribute *attr,
-                  const char *buf,
-                  size_t count)
-{
-       dev_info(dev, "Deprecated\n");
-
-       return 0;
-}
-
-static ssize_t
-show_max_read_request_size(struct device *dev,
-                          struct device_attribute *attr,
-                          char *buf)
-{
-       dev_info(dev, "Deprecated\n");
-
-       return 0;
-}
-
-static ssize_t
-store_max_read_request_size(struct device *dev,
-                           struct device_attribute *attr,
-                           const char *buf,
-                           size_t count)
-{
-       dev_info(dev, "Deprecated\n");
-
-       return 0;
-}
-#endif
-
 static DEVICE_ATTR(max_vfs, S_IRUGO | S_IWUSR, show_max_vfs, store_max_vfs);
-#ifdef RTE_PCI_CONFIG
-static DEVICE_ATTR(extended_tag, S_IRUGO | S_IWUSR, show_extended_tag,
-       store_extended_tag);
-static DEVICE_ATTR(max_read_request_size, S_IRUGO | S_IWUSR,
-       show_max_read_request_size, store_max_read_request_size);
-#endif
 
 static struct attribute *dev_attrs[] = {
        &dev_attr_max_vfs.attr,
-#ifdef RTE_PCI_CONFIG
-       &dev_attr_extended_tag.attr,
-       &dev_attr_max_read_request_size.attr,
-#endif
        NULL,
 };
 
@@ -377,7 +325,9 @@ static int
 igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
        struct rte_uio_pci_dev *udev;
+#ifndef HAVE_ALLOC_IRQ_VECTORS
        struct msix_entry msix_entry;
+#endif
        int err;
 
        udev = kzalloc(sizeof(struct rte_uio_pci_dev), GFP_KERNEL);
@@ -394,16 +344,6 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                goto fail_free;
        }
 
-       /*
-        * reserve device's PCI memory regions for use by this
-        * module
-        */
-       err = pci_request_regions(dev, "igb_uio");
-       if (err != 0) {
-               dev_err(&dev->dev, "Cannot request regions\n");
-               goto fail_disable;
-       }
-
        /* enable bus mastering on the device */
        pci_set_master(dev);
 
@@ -441,6 +381,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        switch (igbuio_intr_mode_preferred) {
        case RTE_INTR_MODE_MSIX:
                /* Only 1 msi-x vector needed */
+#ifndef HAVE_ALLOC_IRQ_VECTORS
                msix_entry.entry = 0;
                if (pci_enable_msix(dev, &msix_entry, 1) == 0) {
                        dev_dbg(&dev->dev, "using MSI-X");
@@ -448,6 +389,15 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                        udev->mode = RTE_INTR_MODE_MSIX;
                        break;
                }
+#else
+               if (pci_alloc_irq_vectors(dev, 1, 1, PCI_IRQ_MSIX) == 1) {
+                       dev_dbg(&dev->dev, "using MSI-X");
+                       udev->info.irq_flags = IRQF_NO_THREAD;
+                       udev->info.irq = pci_irq_vector(dev, 0);
+                       udev->mode = RTE_INTR_MODE_MSIX;
+                       break;
+               }
+#endif
                /* fall back to INTX */
        case RTE_INTR_MODE_LEGACY:
                if (pci_intx_mask_supported(dev)) {
@@ -491,10 +441,13 @@ fail_remove_group:
        sysfs_remove_group(&dev->dev.kobj, &dev_attr_grp);
 fail_release_iomem:
        igbuio_pci_release_iomem(&udev->info);
+#ifndef HAVE_ALLOC_IRQ_VECTORS
        if (udev->mode == RTE_INTR_MODE_MSIX)
                pci_disable_msix(udev->pdev);
-       pci_release_regions(dev);
-fail_disable:
+#else
+       if (udev->mode == RTE_INTR_MODE_MSIX)
+               pci_free_irq_vectors(udev->pdev);
+#endif
        pci_disable_device(dev);
 fail_free:
        kfree(udev);
@@ -510,9 +463,13 @@ igbuio_pci_remove(struct pci_dev *dev)
        sysfs_remove_group(&dev->dev.kobj, &dev_attr_grp);
        uio_unregister_device(&udev->info);
        igbuio_pci_release_iomem(&udev->info);
+#ifndef HAVE_ALLOC_IRQ_VECTORS
        if (udev->mode == RTE_INTR_MODE_MSIX)
                pci_disable_msix(dev);
-       pci_release_regions(dev);
+#else
+       if (udev->mode == RTE_INTR_MODE_MSIX)
+               pci_free_irq_vectors(dev);
+#endif
        pci_disable_device(dev);
        pci_set_drvdata(dev, NULL);
        kfree(udev);