diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-03-23 09:43:42 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-04-02 18:11:55 -0700 |
| commit | 255a69a94b8cbbcfef142137b5e7f99b5d168771 (patch) | |
| tree | ba40d43db66dcc086bb1b7ad634589b01f8a0569 /arch/sparc/kernel | |
| parent | bef7b2a7be28638770972ab2709adf11d601c11a (diff) | |
| download | linux-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/kernel')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 3 | ||||
| -rw-r--r-- | arch/sparc/kernel/of_device_common.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index e59461d03b9a..d6874c9b639f 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c @@ -373,9 +373,6 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, dma_make_coherent(paddr, PAGE_ALIGN(size)); } -const struct dma_map_ops *dma_ops; -EXPORT_SYMBOL(dma_ops); - #ifdef CONFIG_PROC_FS static int sparc_io_proc_show(struct seq_file *m, void *v) diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c index b32cc5610712..e717a56efc5d 100644 --- a/arch/sparc/kernel/of_device_common.c +++ b/arch/sparc/kernel/of_device_common.c @@ -67,6 +67,7 @@ void of_propagate_archdata(struct platform_device *bus) op->dev.archdata.stc = bus_sd->stc; op->dev.archdata.host_controller = bus_sd->host_controller; op->dev.archdata.numa_node = bus_sd->numa_node; + op->dev.dma_ops = bus->dev.dma_ops; if (dp->child) of_propagate_archdata(op); |