diff options
author | Christoph Hellwig <hch@lst.de> | 2019-08-13 10:25:06 +0300 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2019-08-16 21:33:57 +0300 |
commit | df43acac8e32e2ee51a1e9376993c5ac18598d92 (patch) | |
tree | fd86e0604c0485dd2116e38575806f93189bddb3 /arch/ia64/hp/common/sba_iommu.c | |
parent | 2e0f2b1659ddd7bb005ca0bf9f92915904974676 (diff) |
ia64: remove the zx1 swiotlb machvec
The aim of this machvec is to support devices with < 32-bit dma
masks. But given that ia64 only has a ZONE_DMA32 and not a ZONE_DMA
that isn't supported by swiotlb either.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20190813072514.23299-21-hch@lst.de
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/hp/common/sba_iommu.c')
-rw-r--r-- | arch/ia64/hp/common/sba_iommu.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c index 18321ce8bfa0..215fa688b729 100644 --- a/arch/ia64/hp/common/sba_iommu.c +++ b/arch/ia64/hp/common/sba_iommu.c @@ -2059,7 +2059,7 @@ arch_initcall(acpi_sba_ioc_init_acpi); static int __init sba_init(void) { - if (!ia64_platform_is("hpzx1") && !ia64_platform_is("hpzx1_swiotlb")) + if (!ia64_platform_is("hpzx1")) return 0; #if defined(CONFIG_IA64_GENERIC) @@ -2102,19 +2102,6 @@ sba_init(void) return 0; } -#if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_HP_ZX1_SWIOTLB) - /* - * hpzx1_swiotlb needs to have a fairly small swiotlb bounce - * buffer setup to support devices with smaller DMA masks than - * sba_iommu can handle. - */ - if (ia64_platform_is("hpzx1_swiotlb")) { - extern void hwsw_init(void); - - hwsw_init(); - } -#endif - { struct pci_bus *b = NULL; while ((b = pci_find_next_bus(b)) != NULL) |