summaryrefslogtreecommitdiffstats
path: root/arch/sparc/mm/srmmu.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-03-23 09:43:42 +0100
committerDavid S. Miller <davem@davemloft.net>2020-04-02 18:11:55 -0700
commit255a69a94b8cbbcfef142137b5e7f99b5d168771 (patch)
treeba40d43db66dcc086bb1b7ad634589b01f8a0569 /arch/sparc/mm/srmmu.c
parentbef7b2a7be28638770972ab2709adf11d601c11a (diff)
downloadlinux-255a69a94b8cbbcfef142137b5e7f99b5d168771.tar.bz2
sparc32: use per-device dma_ops
sparc32 is the last platform making dynamic decisions in get_arch_dma_ops based on the bus passed in. Instead set the iommu dma_ops at iommu probing and propagate them in of_propagate_archdata, falling back to the NULL ops for the direct mapping in the Leon or PCI case. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm/srmmu.c')
-rw-r--r--arch/sparc/mm/srmmu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index f56c3c9a9793..b7c94de70cca 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -1865,9 +1865,7 @@ void __init load_mmu(void)
&smp_cachetlb_ops;
#endif
- if (sparc_cpu_model == sun4d)
- ld_mmu_iounit();
- else
+ if (sparc_cpu_model != sun4d)
ld_mmu_iommu();
#ifdef CONFIG_SMP
if (sparc_cpu_model == sun4d)