Skip to content

Commit fa4afd7

Browse files
Jean-Philippe Bruckerjoergroedel
authored andcommitted
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 <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
1 parent f8788d8 commit fa4afd7

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

drivers/iommu/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,8 +506,8 @@ config HYPERV_IOMMU
506506
guests to run with x2APIC mode enabled.
507507

508508
config VIRTIO_IOMMU
509-
bool "Virtio IOMMU driver"
510-
depends on VIRTIO=y
509+
tristate "Virtio IOMMU driver"
510+
depends on VIRTIO
511511
depends on ARM64
512512
select IOMMU_API
513513
select INTERVAL_TREE

drivers/iommu/virtio-iommu.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,6 @@ static int viommu_probe(struct virtio_device *vdev)
10821082

10831083
#ifdef CONFIG_PCI
10841084
if (pci_bus_type.iommu_ops != &viommu_ops) {
1085-
pci_request_acs();
10861085
ret = bus_set_iommu(&pci_bus_type, &viommu_ops);
10871086
if (ret)
10881087
goto err_unregister;

0 commit comments

Comments
 (0)