summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2019-06-25 05:01:35 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2019-07-01 05:17:00 -0400
commit69878ef47562f32e02d0b7975c990e1c0339320d (patch)
tree8a33017b7cacf7905dc0c2a85c6b64d283c51610
parent34dc63a5fb9b7f5dcb49f61552226c6314f347f6 (diff)
m68k: Implement arch_dma_prep_coherent()
When we remap memory as non-cached, to be used as a DMA coherent buffer, we should writeback all cache and invalidate the cache lines so that we make sure we have a clean slate. Implement this using the cache_push() helper. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
-rw-r--r--arch/m68k/Kconfig1
-rw-r--r--arch/m68k/kernel/dma.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 3a52bf46e043..00f5c98a5e05 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,6 +4,7 @@ config M68K
4 default y 4 default y
5 select ARCH_32BIT_OFF_T 5 select ARCH_32BIT_OFF_T
6 select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE 6 select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE
7 select ARCH_HAS_DMA_PREP_COHERENT
7 select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA 8 select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
8 select ARCH_MIGHT_HAVE_PC_PARPORT if ISA 9 select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
9 select ARCH_NO_COHERENT_DMA_MMAP if !MMU 10 select ARCH_NO_COHERENT_DMA_MMAP if !MMU
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c
index e7bf355589e7..30cd59caf037 100644
--- a/arch/m68k/kernel/dma.c
+++ b/arch/m68k/kernel/dma.c
@@ -18,6 +18,11 @@
18#include <asm/pgalloc.h> 18#include <asm/pgalloc.h>
19 19
20#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE) 20#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
21void arch_dma_prep_coherent(struct page *page, size_t size)
22{
23 cache_push(page_to_phys(page), size);
24}
25
21pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot, 26pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot,
22 unsigned long attrs) 27 unsigned long attrs)
23{ 28{