From: Will Deacon <will@kernel.org>
Date: Thu, 19 Dec 2019 12:03:38 +0000 (+0000)
Subject: iommu/of: Request ACS from the PCI core when configuring IOMMU linkage
X-Git-Tag: v5.15~4539^2^2~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bf6c24720d33ac239f7207b8b3a8d7bd9d2d691;p=platform%2Fkernel%2Flinux-starfive.git

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>
---

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 026ad2b..4d2f021 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)) {