From: Jean-Philippe Brucker Date: Fri, 14 Feb 2020 16:38:27 +0000 (+0100) Subject: iommu/virtio: Build virtio-iommu as module X-Git-Tag: v5.7-rc1~46^2^8~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa4afd78ea12cf31113f8b146b696c500d6a9dc3;p=thirdparty%2Fkernel%2Flinux.git iommu/virtio: Build virtio-iommu as module Now that the infrastructure changes are in place, enable virtio-iommu to be built as a module. Remove the redundant pci_request_acs() call, since it's not exported but is already invoked during DMA setup. Signed-off-by: Jean-Philippe Brucker Signed-off-by: Joerg Roedel --- diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig index d2fade9849997..c5df570ef84a6 100644 --- a/drivers/iommu/Kconfig +++ b/drivers/iommu/Kconfig @@ -506,8 +506,8 @@ config HYPERV_IOMMU guests to run with x2APIC mode enabled. config VIRTIO_IOMMU - bool "Virtio IOMMU driver" - depends on VIRTIO=y + tristate "Virtio IOMMU driver" + depends on VIRTIO depends on ARM64 select IOMMU_API select INTERVAL_TREE diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c index cce329d71fbad..93ff58632452c 100644 --- a/drivers/iommu/virtio-iommu.c +++ b/drivers/iommu/virtio-iommu.c @@ -1082,7 +1082,6 @@ static int viommu_probe(struct virtio_device *vdev) #ifdef CONFIG_PCI if (pci_bus_type.iommu_ops != &viommu_ops) { - pci_request_acs(); ret = bus_set_iommu(&pci_bus_type, &viommu_ops); if (ret) goto err_unregister;