iommu/amd: Prepare for multiple DMA domain types
authorRobin Murphy <robin.murphy@arm.com>
Wed, 11 Aug 2021 12:21:31 +0000 (13:21 +0100)
committerJoerg Roedel <jroedel@suse.de>
Wed, 18 Aug 2021 11:27:49 +0000 (13:27 +0200)
The DMA ops reset/setup can simply be unconditional, since
iommu-dma already knows only to touch DMA domains.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/6450b4f39a5a086d505297b4a53ff1e4a7a0fe7c.1628682049.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/amd/iommu.c

index 0fd98d3..02f9b4f 100644 (file)
@@ -1707,14 +1707,9 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev)
 
 static void amd_iommu_probe_finalize(struct device *dev)
 {
-       struct iommu_domain *domain;
-
        /* Domains are initialized for this device - have a look what we ended up with */
-       domain = iommu_get_domain_for_dev(dev);
-       if (domain->type == IOMMU_DOMAIN_DMA)
-               iommu_setup_dma_ops(dev, 0, U64_MAX);
-       else
-               set_dma_ops(dev, NULL);
+       set_dma_ops(dev, NULL);
+       iommu_setup_dma_ops(dev, 0, U64_MAX);
 }
 
 static void amd_iommu_release_device(struct device *dev)