asm: dma-mapping.h: Fix dma mapping functions

Subsystems such as USB expect dma_map_single() and dma_unmap_single() to
do dcache flush/invalidate operations as required. For example, see
see drivers/usb/gadget/udc/udc-core.c::usb_gadget_map_request().
Currently drivers do this locally, (see drivers/usb/dwc3/ep0.c,
drivers/mtd/nand/raw/denali.c etc..)
Update arch specific dma_map_single() and dma_unmap_single() APIs to do
cache flush/invalidate  operations, so that drivers need not implement
them locally.

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Rick Chen <rick@andestech.com>

diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index fc5b8f634d546dcc26503169a648d31127a95bb6..d20703739fad24824c6299c4f8c505b565e56ac5 100644 (file)
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -7,7 +7,11 @@
 #ifndef __ASM_ARM_DMA_MAPPING_H
 #define __ASM_ARM_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
+#include <cpu_func.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define        dma_mapping_error(x, y) 0
 
@@ -25,12 +29,27 @@ static inline void dma_free_coherent(void *addr)
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
                                           enum dma_data_direction dir)
 {
-       return (unsigned long)vaddr;
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir == DMA_FROM_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
+       else
+               flush_dcache_range(addr, addr + len);
+
+       return addr;
 }
 
 static inline void dma_unmap_single(volatile void *vaddr, size_t len,
-                                   unsigned long paddr)
+                                   enum dma_data_direction dir)
 {
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir != DMA_TO_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
 }
 
 #endif /* __ASM_ARM_DMA_MAPPING_H */

diff --git a/arch/nds32/include/asm/dma-mapping.h b/arch/nds32/include/asm/dma-mapping.h
index e6808dc84089da299d537578302db38230671835..c8876ceadda6a2e1eae73515ad8b9b2aef1e531e 100644 (file)
--- a/arch/nds32/include/asm/dma-mapping.h
+++ b/arch/nds32/include/asm/dma-mapping.h
@@ -6,7 +6,11 @@
 #ifndef __ASM_NDS_DMA_MAPPING_H
 #define __ASM_NDS_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
+#include <cpu_func.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 static void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
@@ -17,12 +21,27 @@ static void *dma_alloc_coherent(size_t len, unsigned long *handle)
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
                                           enum dma_data_direction dir)
 {
-       return (unsigned long)vaddr;
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir == DMA_FROM_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
+       else
+               flush_dcache_range(addr, addr + len);
+
+       return addr;
 }
 
 static inline void dma_unmap_single(volatile void *vaddr, size_t len,
-                                   unsigned long paddr)
+                                   enum dma_data_direction dir)
 {
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir != DMA_TO_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
 }
 
 #endif /* __ASM_NDS_DMA_MAPPING_H */

diff --git a/arch/riscv/include/asm/dma-mapping.h b/arch/riscv/include/asm/dma-mapping.h
index 3d930c90eceb3fb8f99ee756dcb47f235f39bc34..6cc39469590a047f121e0b481816f4f4e319d86e 100644 (file)
--- a/arch/riscv/include/asm/dma-mapping.h
+++ b/arch/riscv/include/asm/dma-mapping.h
@@ -9,7 +9,11 @@
 #ifndef __ASM_RISCV_DMA_MAPPING_H
 #define __ASM_RISCV_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
+#include <cpu_func.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define dma_mapping_error(x, y)        0
 
@@ -27,12 +31,27 @@ static inline void dma_free_coherent(void *addr)
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
                                           enum dma_data_direction dir)
 {
-       return (unsigned long)vaddr;
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir == DMA_FROM_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
+       else
+               flush_dcache_range(addr, addr + len);
+
+       return addr;
 }
 
 static inline void dma_unmap_single(volatile void *vaddr, size_t len,
-                                   unsigned long paddr)
+                                   enum dma_data_direction dir)
 {
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir != DMA_TO_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
 }
 
 #endif /* __ASM_RISCV_DMA_MAPPING_H */

diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index b353ff0bef5926ec382c726ec422537fa3325ca2..900b99b8a69a194f5b3f1203829a65f62222b302 100644 (file)
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -7,7 +7,11 @@
 #ifndef __ASM_X86_DMA_MAPPING_H
 #define __ASM_X86_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
+#include <cpu_func.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define        dma_mapping_error(x, y) 0
 
@@ -25,12 +29,27 @@ static inline void dma_free_coherent(void *addr)
 static inline unsigned long dma_map_single(volatile void *vaddr, size_t len,
                                           enum dma_data_direction dir)
 {
-       return (unsigned long)vaddr;
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir == DMA_FROM_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
+       else
+               flush_dcache_range(addr, addr + len);
+
+       return addr;
 }
 
 static inline void dma_unmap_single(volatile void *vaddr, size_t len,
-                                   unsigned long paddr)
+                                   enum dma_data_direction dir)
 {
+       unsigned long addr = (unsigned long)vaddr;
+
+       len = ALIGN(len, ARCH_DMA_MINALIGN);
+
+       if (dir != DMA_TO_DEVICE)
+               invalidate_dcache_range(addr, addr + len);
 }
 
 #endif /* __ASM_X86_DMA_MAPPING_H */