summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/dma.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2022-08-25 11:51:42 +0300
committerArnd Bergmann <arnd@arndb.de>2022-09-15 16:59:16 +0300
commitbe7f3f901c619e24c93b8044c074306feedd8ee9 (patch)
treeab75c282a3d657d40bd3a15d3fb81057cafba8ee /arch/arm/include/asm/dma.h
parente7536617baec3b4717a37795cec306df9d655d07 (diff)
downloadlinux-be7f3f901c619e24c93b8044c074306feedd8ee9.tar.xz
ARM: footbridge: remove custom DMA address handling
Footbridge is the last Arm platform that has its own __virt_to_bus()/__bus_to_virt()/phys_to_dma()/dma_to_phys() abstraction, but this is just a simple offset now. For PCI devices, the offset that is programmed into the PCI bridge must also be set in each device using dma_direct_set_offset(). As Arm does not have a pcibios_bus_add_device() helper yet, just use a bus notifier for this. For the ISA DMA, drivers now pass a non-translated physical address into set_dma_addr(), so they have to be converted back with the corresponding isa_bus_to_virt() function and then into the correct bus address with the offset using the isa_dma_dev. Tested-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/include/asm/dma.h')
-rw-r--r--arch/arm/include/asm/dma.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h
index 05f29a72150b..c6aded1b069c 100644
--- a/arch/arm/include/asm/dma.h
+++ b/arch/arm/include/asm/dma.h
@@ -106,7 +106,7 @@ extern void set_dma_sg(unsigned int chan, struct scatterlist *sg, int nr_sg);
*/
extern void __set_dma_addr(unsigned int chan, void *addr);
#define set_dma_addr(chan, addr) \
- __set_dma_addr(chan, (void *)__bus_to_virt(addr))
+ __set_dma_addr(chan, (void *)isa_bus_to_virt(addr))
/* Set the DMA byte count for this channel
*