Merge branch 'pipe-exclusive-wakeup'

[linux.git] / drivers / iommu / of_iommu.c

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 026ad2b29dcd549f0b6e8681b96a2ff89dcfe935..20738aacac89e29f23c28370b75cfce30374fabd 100644 (file)
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -8,11 +8,12 @@
 #include <linux/export.h>
 #include <linux/iommu.h>
 #include <linux/limits.h>
-#include <linux/pci.h>
+#include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of.h>
 #include <linux/of_iommu.h>
 #include <linux/of_pci.h>
+#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/fsl/mc.h>
 
@@ -91,16 +92,16 @@ static int of_iommu_xlate(struct device *dev,
 {
        const struct iommu_ops *ops;
        struct fwnode_handle *fwnode = &iommu_spec->np->fwnode;
-       int err;
+       int ret;
 
        ops = iommu_ops_from_fwnode(fwnode);
        if ((ops && !ops->of_xlate) ||
            !of_device_is_available(iommu_spec->np))
                return NO_IOMMU;
 
-       err = iommu_fwspec_init(dev, &iommu_spec->np->fwnode, ops);
-       if (err)
-               return err;
+       ret = iommu_fwspec_init(dev, &iommu_spec->np->fwnode, ops);
+       if (ret)
+               return ret;
        /*
         * The otherwise-empty fwspec handily serves to indicate the specific
         * IOMMU device we're waiting for, which will be useful if we ever get
@@ -109,7 +110,12 @@ static int of_iommu_xlate(struct device *dev,
        if (!ops)
                return driver_deferred_probe_check_state(dev);
 
-       return ops->of_xlate(dev, iommu_spec);
+       if (!try_module_get(ops->owner))
+               return -ENODEV;
+
+       ret = ops->of_xlate(dev, iommu_spec);
+       module_put(ops->owner);
+       return ret;
 }
 
 struct of_pci_iommu_alias_info {
@@ -179,6 +185,7 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
                        .np = master_np,
                };
 
+               pci_request_acs();
                err = pci_for_each_dma_alias(to_pci_dev(dev),
                                             of_pci_iommu_init, &info);
        } else if (dev_is_fsl_mc(dev)) {
@@ -196,8 +203,12 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
                        if (err)
                                break;
                }
-       }
 
+               fwspec = dev_iommu_fwspec_get(dev);
+               if (!err && fwspec)
+                       of_property_read_u32(master_np, "pasid-num-bits",
+                                            &fwspec->num_pasid_bits);
+       }
 
        /*
         * Two success conditions can be represented by non-negative err here: