Message ID | 20221117185424.2359687-5-thierry.reding@gmail.com |
---|---|
State | Changes Requested |
Headers | show |
Series | iommu: Support mappings/reservations in reserved-memory regions | expand |
On 2022-11-17 18:54, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > For device tree nodes, use the standard of_iommu_get_resv_regions() > implementation to obtain the reserved memory regions associated with a > device. Acked-by: Robin Murphy <robin.murphy@arm.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Frank Rowand <frowand.list@gmail.com> > Cc: devicetree@vger.kernel.org > Signed-off-by: Thierry Reding <treding@nvidia.com> > --- > drivers/iommu/dma-iommu.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index 9297b741f5e8..709b05d3aad2 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -23,6 +23,7 @@ > #include <linux/memremap.h> > #include <linux/mm.h> > #include <linux/mutex.h> > +#include <linux/of_iommu.h> > #include <linux/pci.h> > #include <linux/scatterlist.h> > #include <linux/spinlock.h> > @@ -391,6 +392,8 @@ void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list) > if (!is_of_node(dev_iommu_fwspec_get(dev)->iommu_fwnode)) > iort_iommu_get_resv_regions(dev, list); > > + if (dev->of_node) > + of_iommu_get_resv_regions(dev, list); > } > EXPORT_SYMBOL(iommu_dma_get_resv_regions); >
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 9297b741f5e8..709b05d3aad2 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c @@ -23,6 +23,7 @@ #include <linux/memremap.h> #include <linux/mm.h> #include <linux/mutex.h> +#include <linux/of_iommu.h> #include <linux/pci.h> #include <linux/scatterlist.h> #include <linux/spinlock.h> @@ -391,6 +392,8 @@ void iommu_dma_get_resv_regions(struct device *dev, struct list_head *list) if (!is_of_node(dev_iommu_fwspec_get(dev)->iommu_fwnode)) iort_iommu_get_resv_regions(dev, list); + if (dev->of_node) + of_iommu_get_resv_regions(dev, list); } EXPORT_SYMBOL(iommu_dma_get_resv_regions);