[U-Boot] [PATCH 1/4] asm: dma-mapping.h: Fix dma mapping functions

[Rick Chen]

> From: Vignesh Raghavendra [mailto:vigneshr at 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 at 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 at ti.com>

Reviewed-by: Rick Chen <rick at 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
>