diff options
| author | Will Deacon <will@kernel.org> | 2019-12-19 12:03:38 +0000 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-12-23 14:06:05 +0100 |
| commit | 6bf6c24720d33ac239f7207b8b3a8d7bd9d2d691 (patch) | |
| tree | cfb2c4072ec0851ebb9e99e7ffbf6a264267e0af | |
| parent | a7ba5c3d008dd78d881a1658eae5a2275ebd5087 (diff) | |
iommu/of: Request ACS from the PCI core when configuring IOMMU linkage
To avoid having to export 'pci_request_acs()' to modular IOMMU drivers,
move the call into the 'of_dma_configure()' path in a similar manner to
the way in which ACS is configured when probing via ACPI/IORT.
Signed-off-by: Will Deacon <will@kernel.org>
Tested-by: John Garry <john.garry@huawei.com> # smmu v3
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | drivers/iommu/of_iommu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 026ad2b29dcd..4d2f02132e7a 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -179,6 +179,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)) { |