These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / iommu / of_iommu.c

diff --git a/kernel/drivers/iommu/of_iommu.c b/kernel/drivers/iommu/of_iommu.c
index 43429ab..60ba238 100644 (file)
--- a/kernel/drivers/iommu/of_iommu.c
+++ b/kernel/drivers/iommu/of_iommu.c
@@ -141,10 +141,12 @@ struct iommu_ops *of_iommu_configure(struct device *dev,
        struct iommu_ops *ops = NULL;
        int idx = 0;
 
-       if (dev_is_pci(dev)) {
-               dev_err(dev, "IOMMU is currently not supported for PCI\n");
+       /*
+        * We can't do much for PCI devices without knowing how
+        * device IDs are wired up from the PCI bus to the IOMMU.
+        */
+       if (dev_is_pci(dev))
                return NULL;
-       }
 
        /*
         * We don't currently walk up the tree looking for a parent IOMMU.