From c5ce06fdc0138144acfd22cc197a534ea1bf8b53 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Fri, 25 Oct 2019 13:29:00 +0100 Subject: [PATCH] FROMLIST: 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 Bug: 140290589 Link: https://lore.kernel.org/lkml/20191121114918.2293-3-will@kernel.org/ Signed-off-by: Will Deacon Change-Id: I3c689845ca493fbe037a2def2050a089036fb7d3 --- drivers/iommu/of_iommu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 614a93aa5305..78faa9f73a91 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -177,6 +177,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)) {