diff options
author | Christoph Hellwig <hch@lst.de> | 2022-02-14 14:11:44 +0100 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2022-04-18 07:21:10 +0200 |
commit | 78013eaadf696d2105982abb4018fbae394ca08f (patch) | |
tree | 018da6dc9f81f26fc4d5ce8df7e1a9e9903593ed /arch/x86/kernel/amd_gart_64.c | |
parent | f39f8d0eb081407e470396fd4cc376c526d13066 (diff) | |
download | linux-stable-78013eaadf696d2105982abb4018fbae394ca08f.tar.gz linux-stable-78013eaadf696d2105982abb4018fbae394ca08f.tar.bz2 linux-stable-78013eaadf696d2105982abb4018fbae394ca08f.zip |
x86: remove the IOMMU table infrastructure
The IOMMU table tries to separate the different IOMMUs into different
backends, but actually requires various cross calls.
Rewrite the code to do the generic swiotlb/swiotlb-xen setup directly
in pci-dma.c and then just call into the IOMMU drivers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Diffstat (limited to 'arch/x86/kernel/amd_gart_64.c')
-rw-r--r-- | arch/x86/kernel/amd_gart_64.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c index ed837383de5c..194d54eed537 100644 --- a/arch/x86/kernel/amd_gart_64.c +++ b/arch/x86/kernel/amd_gart_64.c @@ -38,11 +38,9 @@ #include <asm/iommu.h> #include <asm/gart.h> #include <asm/set_memory.h> -#include <asm/swiotlb.h> #include <asm/dma.h> #include <asm/amd_nb.h> #include <asm/x86_init.h> -#include <asm/iommu_table.h> static unsigned long iommu_bus_base; /* GART remapping area (physical) */ static unsigned long iommu_size; /* size of remapping area bytes */ @@ -808,7 +806,7 @@ int __init gart_iommu_init(void) flush_gart(); dma_ops = &gart_dma_ops; x86_platform.iommu_shutdown = gart_iommu_shutdown; - swiotlb = 0; + x86_swiotlb_enable = false; return 0; } @@ -842,4 +840,3 @@ void __init gart_parse_options(char *p) } } } -IOMMU_INIT_POST(gart_iommu_hole_init); |