igb_uio: use non-threaded ISR

[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..41bf6ea 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,
 };
 
@@ -366,7 +314,7 @@ igbuio_setup_bars(struct pci_dev *dev, struct uio_info *info)
                }
        }
 
-       return (iom != 0) ? ret : -ENOENT;
+       return (iom != 0 || iop != 0) ? ret : -ENOENT;
 }
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
@@ -378,6 +326,8 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
        struct rte_uio_pci_dev *udev;
        struct msix_entry msix_entry;
+       dma_addr_t map_dma_addr;
+       void *map_addr;
        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);
 
@@ -444,6 +384,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                msix_entry.entry = 0;
                if (pci_enable_msix(dev, &msix_entry, 1) == 0) {
                        dev_dbg(&dev->dev, "using MSI-X");
+                       udev->info.irq_flags = IRQF_NO_THREAD;
                        udev->info.irq = msix_entry.vector;
                        udev->mode = RTE_INTR_MODE_MSIX;
                        break;
@@ -452,7 +393,7 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        case RTE_INTR_MODE_LEGACY:
                if (pci_intx_mask_supported(dev)) {
                        dev_dbg(&dev->dev, "using INTX");
-                       udev->info.irq_flags = IRQF_SHARED;
+                       udev->info.irq_flags = IRQF_SHARED | IRQF_NO_THREAD;
                        udev->info.irq = dev->irq;
                        udev->mode = RTE_INTR_MODE_LEGACY;
                        break;
@@ -485,6 +426,25 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        dev_info(&dev->dev, "uio device registered with irq %lx\n",
                 udev->info.irq);
 
+       /*
+        * Doing a harmless dma mapping for attaching the device to
+        * the iommu identity mapping if kernel boots with iommu=pt.
+        * Note this is not a problem if no IOMMU at all.
+        */
+       map_addr = dma_zalloc_coherent(&dev->dev, 1024,
+                                      &map_dma_addr, GFP_KERNEL);
+
+       if (!map_addr)
+               dev_info(&dev->dev, "dma mapping failed\n");
+       else {
+               dev_info(&dev->dev, "mapping 1K dma=%#llx host=%p\n",
+                        (unsigned long long)map_dma_addr, map_addr);
+
+               dma_free_coherent(&dev->dev, 1024, map_addr, map_dma_addr);
+               dev_info(&dev->dev, "unmapping 1K dma=%#llx host=%p\n",
+                        (unsigned long long)map_dma_addr, map_addr);
+       }
+
        return 0;
 
 fail_remove_group:
@@ -493,8 +453,6 @@ fail_release_iomem:
        igbuio_pci_release_iomem(&udev->info);
        if (udev->mode == RTE_INTR_MODE_MSIX)
                pci_disable_msix(udev->pdev);
-       pci_release_regions(dev);
-fail_disable:
        pci_disable_device(dev);
 fail_free:
        kfree(udev);
@@ -512,7 +470,6 @@ igbuio_pci_remove(struct pci_dev *dev)
        igbuio_pci_release_iomem(&udev->info);
        if (udev->mode == RTE_INTR_MODE_MSIX)
                pci_disable_msix(dev);
-       pci_release_regions(dev);
        pci_disable_device(dev);
        pci_set_drvdata(dev, NULL);
        kfree(udev);