By removing the redundant call to 'pci_request_acs()' we can allow the ARM SMMUv3 driver to be built as a module.
Signed-off-by: Will Deacon <[email protected]> --- drivers/iommu/Kconfig | 2 +- drivers/iommu/arm-smmu-v3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index e3842eabcfdd..7583d47fc4d5 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -388,7 +388,7 @@ config ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT config. config ARM_SMMU_V3 - bool "ARM Ltd. System MMU Version 3 (SMMUv3) Support" + tristate "ARM Ltd. System MMU Version 3 (SMMUv3) Support" depends on ARM64 select IOMMU_API select IOMMU_IO_PGTABLE_LPAE diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 2ad8e2ca0583..d54ceb80c28d 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -2733,6 +2733,7 @@ static struct iommu_ops arm_smmu_ops = { .get_resv_regions = arm_smmu_get_resv_regions, .put_resv_regions = arm_smmu_put_resv_regions, .pgsize_bitmap = -1UL, /* Restricted during device attach */ + .owner = THIS_MODULE, }; /* Probing and initialisation functions */ @@ -3657,7 +3658,6 @@ static int arm_smmu_device_probe(struct platform_device *pdev) #ifdef CONFIG_PCI if (pci_bus_type.iommu_ops != &arm_smmu_ops) { - pci_request_acs(); ret = bus_set_iommu(&pci_bus_type, &arm_smmu_ops); if (ret) return ret; -- 2.24.0.rc1.363.gb1bccd3e3d-goog _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
