* [2/6] iommu/of: Use device_iommu_mapped()
@ 2018-12-11 13:43 Joerg Roedel
0 siblings, 0 replies; only message in thread
From: Joerg Roedel @ 2018-12-11 13:43 UTC (permalink / raw)
To: iommu
Cc: Russell Currey, Sam Bobroff, oohall, Benjamin Herrenschmidt,
Paul Mackerras, Michael Ellerman, Lorenzo Pieralisi, Hanjun Guo,
Sudeep Holla, Dan Williams, Vinod Koul, Joerg Roedel, jroedel,
Mathias Nyman, Greg Kroah-Hartman, linux-kernel, linux-acpi,
dmaengine, linux-usb
From: Joerg Roedel <jroedel@suse.de>
Use Use device_iommu_mapped() to check if the device is
already mapped by an IOMMU.
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/of_iommu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index c5dd63072529..bfcf139503f0 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -220,7 +220,7 @@ const struct iommu_ops *of_iommu_configure(struct device *dev,
* If we have reason to believe the IOMMU driver missed the initial
* add_device callback for dev, replay it to get things in order.
*/
- if (ops && ops->add_device && dev->bus && !dev->iommu_group)
+ if (ops && ops->add_device && dev->bus && !device_iommu_mapped(dev))
err = ops->add_device(dev);
/* Ignore all other errors apart from EPROBE_DEFER */
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2018-12-11 13:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-11 13:43 [2/6] iommu/of: Use device_iommu_mapped() Joerg Roedel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).