mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-27 23:20:26 +09:00
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>
This commit is contained in:
parent
1fdbad021f
commit
c0a5a81f74
@ -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 */
|
||||
|
@ -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 */
|
||||
|
@ -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 */
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user