[U-Boot,1/4] asm: dma-mapping.h: Fix dma mapping functions
diff mbox series

Message ID 20191115115505.893-2-vigneshr@ti.com
State New
Delegated to: Tom Rini
Headers show
Series
  • dma-mapping: Add cache flush/invalidation to dma_{un}map_single
Related show

Commit Message

Vignesh Raghavendra Nov. 15, 2019, 11:55 a.m. UTC
Subsystems such as USB expect dma_map_single() and dma_unmap_single() to
do dcache flush/invalidate operations as required. For example, 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>
---
 arch/arm/include/asm/dma-mapping.h   | 22 ++++++++++++++++++++--
 arch/nds32/include/asm/dma-mapping.h | 22 ++++++++++++++++++++--
 arch/riscv/include/asm/dma-mapping.h | 22 ++++++++++++++++++++--
 arch/x86/include/asm/dma-mapping.h   | 22 ++++++++++++++++++++--
 4 files changed, 80 insertions(+), 8 deletions(-)

Comments

Masahiro Yamada Nov. 15, 2019, 12:19 p.m. UTC | #1
On Fri, Nov 15, 2019 at 8:55 PM Vignesh Raghavendra <vigneshr@ti.com> wrote:
>
> Subsystems such as USB expect dma_map_single() and dma_unmap_single() to
> do dcache flush/invalidate operations as required. For example, 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>


> ---
>  arch/arm/include/asm/dma-mapping.h   | 22 ++++++++++++++++++++--
>  arch/nds32/include/asm/dma-mapping.h | 22 ++++++++++++++++++++--
>  arch/riscv/include/asm/dma-mapping.h | 22 ++++++++++++++++++++--
>  arch/x86/include/asm/dma-mapping.h   | 22 ++++++++++++++++++++--
>  4 files changed, 80 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
> index fc5b8f634d54..4b02320dfbd3 100644
> --- a/arch/arm/include/asm/dma-mapping.h
> +++ b/arch/arm/include/asm/dma-mapping.h
> @@ -7,7 +7,10 @@
>  #ifndef __ASM_ARM_DMA_MAPPING_H
>  #define __ASM_ARM_DMA_MAPPING_H
>
> +#include <common.h>
> +#include <asm/cache.h>
>  #include <linux/dma-direction.h>
> +#include <malloc.h>
>
>  #define        dma_mapping_error(x, y) 0
>
> @@ -25,12 +28,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 e6808dc84089..33c4582f4614 100644
> --- a/arch/nds32/include/asm/dma-mapping.h
> +++ b/arch/nds32/include/asm/dma-mapping.h
> @@ -6,7 +6,10 @@
>  #ifndef __ASM_NDS_DMA_MAPPING_H
>  #define __ASM_NDS_DMA_MAPPING_H
>
> +#include <common.h>
> +#include <asm/cache.h>
>  #include <linux/dma-direction.h>
> +#include <malloc.h>
>
>  static void *dma_alloc_coherent(size_t len, unsigned long *handle)
>  {
> @@ -17,12 +20,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 3d930c90eceb..01f8a9219a38 100644
> --- a/arch/riscv/include/asm/dma-mapping.h
> +++ b/arch/riscv/include/asm/dma-mapping.h
> @@ -9,7 +9,10 @@
>  #ifndef __ASM_RISCV_DMA_MAPPING_H
>  #define __ASM_RISCV_DMA_MAPPING_H
>
> +#include <common.h>
> +#include <asm/cache.h>
>  #include <linux/dma-direction.h>
> +#include <malloc.h>
>
>  #define dma_mapping_error(x, y)        0
>
> @@ -27,12 +30,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 b353ff0bef59..c228f684665f 100644
> --- a/arch/x86/include/asm/dma-mapping.h
> +++ b/arch/x86/include/asm/dma-mapping.h
> @@ -7,7 +7,10 @@
>  #ifndef __ASM_X86_DMA_MAPPING_H
>  #define __ASM_X86_DMA_MAPPING_H
>
> +#include <common.h>
> +#include <asm/cache.h>
>  #include <linux/dma-direction.h>
> +#include <malloc.h>
>
>  #define        dma_mapping_error(x, y) 0
>
> @@ -25,12 +28,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 */
> --
> 2.24.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Rick Chen Nov. 19, 2019, 12:51 a.m. UTC | #2
> From: Vignesh Raghavendra [mailto:vigneshr@ti.com]
> Sent: Friday, November 15, 2019 7:55 PM
> To: Rick Jian-Zhi Chen(陳建志); Simon Glass; Bin Meng; Peng Fan; Joe Hershberger
> Cc: Vignesh Raghavendra; Ye Li; Anup Patel; Alexander Graf; Lukas Auer; Masahiro Yamada; u-boot@lists.denx.de; Lokesh Vutla; Tom Rini
> Subject: [PATCH 1/4] 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 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: Rick Chen <rick@andestech.com>

> ---
>  arch/arm/include/asm/dma-mapping.h   | 22 ++++++++++++++++++++--
>  arch/nds32/include/asm/dma-mapping.h | 22 ++++++++++++++++++++--  arch/riscv/include/asm/dma-mapping.h | 22 ++++++++++++++++++++--
>  arch/x86/include/asm/dma-mapping.h   | 22 ++++++++++++++++++++--
>  4 files changed, 80 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
> index fc5b8f634d54..4b02320dfbd3 100644
> --- a/arch/arm/include/asm/dma-mapping.h
> +++ b/arch/arm/include/asm/dma-mapping.h
> @@ -7,7 +7,10 @@
>  #ifndef __ASM_ARM_DMA_MAPPING_H
>  #define __ASM_ARM_DMA_MAPPING_H
>
> +#include <common.h>
> +#include <asm/cache.h>
>  #include <linux/dma-direction.h>
> +#include <malloc.h>
>
>  #define        dma_mapping_error(x, y) 0
>
> @@ -25,12 +28,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 e6808dc84089..33c4582f4614 100644
> --- a/arch/nds32/include/asm/dma-mapping.h
> +++ b/arch/nds32/include/asm/dma-mapping.h
> @@ -6,7 +6,10 @@
>  #ifndef __ASM_NDS_DMA_MAPPING_H
>  #define __ASM_NDS_DMA_MAPPING_H
>
> +#include <common.h>
> +#include <asm/cache.h>
>  #include <linux/dma-direction.h>
> +#include <malloc.h>
>
>  static void *dma_alloc_coherent(size_t len, unsigned long *handle)  { @@ -17,12 +20,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 3d930c90eceb..01f8a9219a38 100644
> --- a/arch/riscv/include/asm/dma-mapping.h
> +++ b/arch/riscv/include/asm/dma-mapping.h
> @@ -9,7 +9,10 @@
>  #ifndef __ASM_RISCV_DMA_MAPPING_H
>  #define __ASM_RISCV_DMA_MAPPING_H
>
> +#include <common.h>
> +#include <asm/cache.h>
>  #include <linux/dma-direction.h>
> +#include <malloc.h>
>
>  #define dma_mapping_error(x, y)        0
>
> @@ -27,12 +30,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 b353ff0bef59..c228f684665f 100644
> --- a/arch/x86/include/asm/dma-mapping.h
> +++ b/arch/x86/include/asm/dma-mapping.h
> @@ -7,7 +7,10 @@
>  #ifndef __ASM_X86_DMA_MAPPING_H
>  #define __ASM_X86_DMA_MAPPING_H
>
> +#include <common.h>
> +#include <asm/cache.h>
>  #include <linux/dma-direction.h>
> +#include <malloc.h>
>
>  #define        dma_mapping_error(x, y) 0
>
> @@ -25,12 +28,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 */
> --
> 2.24.0
>

Patch
diff mbox series

diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index fc5b8f634d54..4b02320dfbd3 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -7,7 +7,10 @@ 
 #ifndef __ASM_ARM_DMA_MAPPING_H
 #define __ASM_ARM_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define	dma_mapping_error(x, y)	0
 
@@ -25,12 +28,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 e6808dc84089..33c4582f4614 100644
--- a/arch/nds32/include/asm/dma-mapping.h
+++ b/arch/nds32/include/asm/dma-mapping.h
@@ -6,7 +6,10 @@ 
 #ifndef __ASM_NDS_DMA_MAPPING_H
 #define __ASM_NDS_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 static void *dma_alloc_coherent(size_t len, unsigned long *handle)
 {
@@ -17,12 +20,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 3d930c90eceb..01f8a9219a38 100644
--- a/arch/riscv/include/asm/dma-mapping.h
+++ b/arch/riscv/include/asm/dma-mapping.h
@@ -9,7 +9,10 @@ 
 #ifndef __ASM_RISCV_DMA_MAPPING_H
 #define __ASM_RISCV_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define dma_mapping_error(x, y)	0
 
@@ -27,12 +30,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 b353ff0bef59..c228f684665f 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -7,7 +7,10 @@ 
 #ifndef __ASM_X86_DMA_MAPPING_H
 #define __ASM_X86_DMA_MAPPING_H
 
+#include <common.h>
+#include <asm/cache.h>
 #include <linux/dma-direction.h>
+#include <malloc.h>
 
 #define	dma_mapping_error(x, y)	0
 
@@ -25,12 +28,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 */