New upstream version 18.08

[deb_dpdk.git] / kernel / linux / igb_uio / igb_uio.c

diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/kernel/linux/igb_uio/igb_uio.c
similarity index 95%
rename from lib/librte_eal/linuxapp/igb_uio/igb_uio.c
rename to kernel/linux/igb_uio/igb_uio.c
index 4cae4dd..3398eac 100644 (file)
--- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c
+++ b/kernel/linux/igb_uio/igb_uio.c
@@ -30,6 +30,7 @@ struct rte_uio_pci_dev {
        int refcnt;
 };
 
+static int wc_activate;
 static char *intr_mode;
 static enum rte_intr_mode igbuio_intr_mode_preferred = RTE_INTR_MODE_MSIX;
 /* sriov sysfs */
@@ -375,9 +376,13 @@ igbuio_pci_setup_iomem(struct pci_dev *dev, struct uio_info *info,
        len = pci_resource_len(dev, pci_bar);
        if (addr == 0 || len == 0)
                return -1;
-       internal_addr = ioremap(addr, len);
-       if (internal_addr == NULL)
-               return -1;
+       if (wc_activate == 0) {
+               internal_addr = ioremap(addr, len);
+               if (internal_addr == NULL)
+                       return -1;
+       } else {
+               internal_addr = NULL;
+       }
        info->mem[n].name = name;
        info->mem[n].addr = addr;
        info->mem[n].internal_addr = internal_addr;
@@ -473,6 +478,13 @@ igbuio_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        void *map_addr;
        int err;
 
+#ifdef HAVE_PCI_IS_BRIDGE_API
+       if (pci_is_bridge(dev)) {
+               dev_warn(&dev->dev, "Ignoring PCI bridge device\n");
+               return -ENODEV;
+       }
+#endif
+
        udev = kzalloc(sizeof(struct rte_uio_pci_dev), GFP_KERNEL);
        if (!udev)
                return -ENOMEM;
@@ -614,6 +626,14 @@ igbuio_pci_init_module(void)
 {
        int ret;
 
+       if (igbuio_kernel_is_locked_down()) {
+               pr_err("Not able to use module, kernel lock down is enabled\n");
+               return -EINVAL;
+       }
+
+       if (wc_activate != 0)
+               pr_info("wc_activate is set\n");
+
        ret = igbuio_config_intr_mode(intr_mode);
        if (ret < 0)
                return ret;
@@ -638,6 +658,12 @@ MODULE_PARM_DESC(intr_mode,
 "    " RTE_INTR_MODE_LEGACY_NAME "     Use Legacy interrupt\n"
 "\n");
 
+module_param(wc_activate, int, 0);
+MODULE_PARM_DESC(wc_activate,
+"Activate support for write combining (WC) (default=0)\n"
+"    0 - disable\n"
+"    other - enable\n");
+
 MODULE_DESCRIPTION("UIO driver for Intel IGB PCI cards");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Intel Corporation");