Merge tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU updates from Joerg Roedel:

 - support for interrupt virtualization in the AMD IOMMU driver. These
   patches were shared with the KVM tree and are already merged through
   that tree.

 - generic DT-binding support for the ARM-SMMU driver. With this the
   driver now makes use of the generic DMA-API code. This also required
   some changes outside of the IOMMU code, but these are acked by the
   respective maintainers.

 - more cleanups and fixes all over the place.

* tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (40 commits)
  iommu/amd: No need to wait iommu completion if no dte irq entry change
  iommu/amd: Free domain id when free a domain of struct dma_ops_domain
  iommu/amd: Use standard bitmap operation to set bitmap
  iommu/amd: Clean up the cmpxchg64 invocation
  iommu/io-pgtable-arm: Check for v7s-incapable systems
  iommu/dma: Avoid PCI host bridge windows
  iommu/dma: Add support for mapping MSIs
  iommu/arm-smmu: Set domain geometry
  iommu/arm-smmu: Wire up generic configuration support
  Docs: dt: document ARM SMMU generic binding usage
  iommu/arm-smmu: Convert to iommu_fwspec
  iommu/arm-smmu: Intelligent SMR allocation
  iommu/arm-smmu: Add a stream map entry iterator
  iommu/arm-smmu: Streamline SMMU data lookups
  iommu/arm-smmu: Refactor mmu-masters handling
  iommu/arm-smmu: Keep track of S2CR state
  iommu/arm-smmu: Consolidate stream map entry state
  iommu/arm-smmu: Handle stream IDs more dynamically
  iommu/arm-smmu: Set PRIVCFG in stage 1 STEs
  iommu/arm-smmu: Support non-PCI devices with SMMUv3
  ...

1 files changed, 46 insertions, 6 deletions

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 57f23eaaa2f9..5b82862f571f 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -22,6 +22,7 @@
 #include <linux/limits.h>
 #include <linux/of.h>
 #include <linux/of_iommu.h>
+#include <linux/of_pci.h>
 #include <linux/slab.h>
 
 static const struct of_device_id __iommu_of_table_sentinel
@@ -134,6 +135,47 @@ const struct iommu_ops *of_iommu_get_ops(struct device_node *np)
         return ops;
 }
 
+static int __get_pci_rid(struct pci_dev *pdev, u16 alias, void *data)
+{
+        struct of_phandle_args *iommu_spec = data;
+
+        iommu_spec->args[0] = alias;
+        return iommu_spec->np == pdev->bus->dev.of_node;
+}
+
+static const struct iommu_ops
+*of_pci_iommu_configure(struct pci_dev *pdev, struct device_node *bridge_np)
+{
+        const struct iommu_ops *ops;
+        struct of_phandle_args iommu_spec;
+
+        /*
+         * Start by tracing the RID alias down the PCI topology as
+         * far as the host bridge whose OF node we have...
+         * (we're not even attempting to handle multi-alias devices yet)
+         */
+        iommu_spec.args_count = 1;
+        iommu_spec.np = bridge_np;
+        pci_for_each_dma_alias(pdev, __get_pci_rid, &iommu_spec);
+        /*
+         * ...then find out what that becomes once it escapes the PCI
+         * bus into the system beyond, and which IOMMU it ends up at.
+         */
+        iommu_spec.np = NULL;
+        if (of_pci_map_rid(bridge_np, iommu_spec.args[0], "iommu-map",
+                           "iommu-map-mask", &iommu_spec.np, iommu_spec.args))
+                return NULL;
+
+        ops = of_iommu_get_ops(iommu_spec.np);
+        if (!ops || !ops->of_xlate ||
+            iommu_fwspec_init(&pdev->dev, &iommu_spec.np->fwnode, ops) ||
+            ops->of_xlate(&pdev->dev, &iommu_spec))
+                ops = NULL;
+
+        of_node_put(iommu_spec.np);
+        return ops;
+}
+
 const struct iommu_ops *of_iommu_configure(struct device *dev,
                                            struct device_node *master_np)
 {
@@ -142,12 +184,8 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
         const struct iommu_ops *ops = NULL;
         int idx = 0;
 
-        /*
-         * 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;
+                return of_pci_iommu_configure(to_pci_dev(dev), master_np);
 
         /*
          * We don't currently walk up the tree looking for a parent IOMMU.
@@ -160,7 +198,9 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
                 np = iommu_spec.np;
                 ops = of_iommu_get_ops(np);
 
-                if (!ops || !ops->of_xlate || ops->of_xlate(dev, &iommu_spec))
+                if (!ops || !ops->of_xlate ||
+                    iommu_fwspec_init(dev, &np->fwnode, ops) ||
+                    ops->of_xlate(dev, &iommu_spec))
                         goto err_put_node;
 
                 of_node_put(np);