iommu/of: support iommu configuration for fsl-mc devices

With of_pci_map_rid available for all the busses, use the function
for configuration of devices on fsl-mc bus

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index c13eeca..c5dd630 100644 (file)
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -24,6 +24,7 @@
 #include <linux/of_iommu.h>
 #include <linux/of_pci.h>
 #include <linux/slab.h>
+#include <linux/fsl/mc.h>
 
 #define NO_IOMMU       1
 
@@ -142,6 +143,23 @@ static int of_pci_iommu_init(struct pci_dev *pdev, u16 alias, void *data)
        return err;
 }
 
+static int of_fsl_mc_iommu_init(struct fsl_mc_device *mc_dev,
+                               struct device_node *master_np)
+{
+       struct of_phandle_args iommu_spec = { .args_count = 1 };
+       int err;
+
+       err = of_map_rid(master_np, mc_dev->icid, "iommu-map",
+                        "iommu-map-mask", &iommu_spec.np,
+                        iommu_spec.args);
+       if (err)
+               return err == -ENODEV ? NO_IOMMU : err;
+
+       err = of_iommu_xlate(&mc_dev->dev, &iommu_spec);
+       of_node_put(iommu_spec.np);
+       return err;
+}
+
 const struct iommu_ops *of_iommu_configure(struct device *dev,
                                           struct device_node *master_np)
 {
@@ -173,6 +191,8 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
 
                err = pci_for_each_dma_alias(to_pci_dev(dev),
                                             of_pci_iommu_init, &info);
+       } else if (dev_is_fsl_mc(dev)) {
+               err = of_fsl_mc_iommu_init(to_fsl_mc_device(dev), master_np);
        } else {
                struct of_phandle_args iommu_spec;
                int idx = 0;