Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9c9147e authored by Russell King's avatar Russell King
Browse files

ARM: dma-mapping: provide per-cpu type map/unmap functions 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Tested-By: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent 93f1d629

arch/arm/include/asm/cacheflush.h

+9 −0
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ struct cpu_cache_fns { 
	void (*coherent_user_range)(unsigned long, unsigned long);

	void (*flush_kern_dcache_area)(void *, size_t);



	void (*dma_map_area)(const void *, size_t, int);

	void (*dma_unmap_area)(const void *, size_t, int);



	void (*dma_inv_range)(const void *, const void *);

	void (*dma_clean_range)(const void *, const void *);

	void (*dma_flush_range)(const void *, const void *);
@@ -244,6 +247,8 @@ extern struct cpu_cache_fns cpu_cache; 
 * is visible to DMA, or data written by DMA to system memory is

 * visible to the CPU.

 */

#define dmac_map_area			cpu_cache.dma_map_area

#define dmac_unmap_area		cpu_cache.dma_unmap_area

#define dmac_inv_range			cpu_cache.dma_inv_range

#define dmac_clean_range		cpu_cache.dma_clean_range

#define dmac_flush_range		cpu_cache.dma_flush_range
@@ -270,10 +275,14 @@ extern void __cpuc_flush_dcache_area(void *, size_t); 
 * is visible to DMA, or data written by DMA to system memory is

 * visible to the CPU.

 */

#define dmac_map_area			__glue(_CACHE,_dma_map_area)

#define dmac_unmap_area		__glue(_CACHE,_dma_unmap_area)

#define dmac_inv_range			__glue(_CACHE,_dma_inv_range)

#define dmac_clean_range		__glue(_CACHE,_dma_clean_range)

#define dmac_flush_range		__glue(_CACHE,_dma_flush_range)



extern void dmac_map_area(const void *, size_t, int);

extern void dmac_unmap_area(const void *, size_t, int);

extern void dmac_inv_range(const void *, const void *);

extern void dmac_clean_range(const void *, const void *);

extern void dmac_flush_range(const void *, const void *);

arch/arm/kernel/asm-offsets.c

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */

#include <linux/sched.h>

#include <linux/mm.h>

#include <linux/dma-mapping.h>

#include <asm/mach/arch.h>

#include <asm/thread_info.h>

#include <asm/memory.h>
@@ -112,5 +113,9 @@ int main(void) 
#ifdef MULTI_PABORT

  DEFINE(PROCESSOR_PABT_FUNC,	offsetof(struct processor, _prefetch_abort));

#endif

  BLANK();

  DEFINE(DMA_BIDIRECTIONAL,	DMA_BIDIRECTIONAL);

  DEFINE(DMA_TO_DEVICE,		DMA_TO_DEVICE);

  DEFINE(DMA_FROM_DEVICE,	DMA_FROM_DEVICE);

  return 0; 

}

arch/arm/mm/cache-fa.S

+26 −0
Original line number Diff line number Diff line
@@ -205,6 +205,30 @@ ENTRY(fa_dma_flush_range) 
	mcr	p15, 0, r0, c7, c10, 4		@ drain write buffer

	mov	pc, lr



/*

 *	dma_map_area(start, size, dir)

 *	- start	- kernel virtual start address

 *	- size	- size of region

 *	- dir	- DMA direction

 */

ENTRY(fa_dma_map_area)

	add	r1, r1, r0

	cmp	r2, #DMA_TO_DEVICE

	beq	fa_dma_clean_range

	bcs	fa_dma_inv_range

	b	fa_dma_flush_range

ENDPROC(fa_dma_map_area)



/*

 *	dma_unmap_area(start, size, dir)

 *	- start	- kernel virtual start address

 *	- size	- size of region

 *	- dir	- DMA direction

 */

ENTRY(fa_dma_unmap_area)

	mov	pc, lr

ENDPROC(fa_dma_unmap_area)



	__INITDATA



	.type	fa_cache_fns, #object
@@ -215,6 +239,8 @@ ENTRY(fa_cache_fns) 
	.long	fa_coherent_kern_range

	.long	fa_coherent_user_range

	.long	fa_flush_kern_dcache_area

	.long	fa_dma_map_area

	.long	fa_dma_unmap_area

	.long	fa_dma_inv_range

	.long	fa_dma_clean_range

	.long	fa_dma_flush_range

arch/arm/mm/cache-v3.S

+24 −0
Original line number Diff line number Diff line
@@ -121,6 +121,28 @@ ENTRY(v3_dma_flush_range) 
ENTRY(v3_dma_clean_range)

	mov	pc, lr



/*

 *	dma_unmap_area(start, size, dir)

 *	- start	- kernel virtual start address

 *	- size	- size of region

 *	- dir	- DMA direction

 */

ENTRY(v3_dma_unmap_area)

	teq	r2, #DMA_TO_DEVICE

	bne	v3_dma_inv_range

	/* FALLTHROUGH */



/*

 *	dma_map_area(start, size, dir)

 *	- start	- kernel virtual start address

 *	- size	- size of region

 *	- dir	- DMA direction

 */

ENTRY(v3_dma_map_area)

	mov	pc, lr

ENDPROC(v3_dma_unmap_area)

ENDPROC(v3_dma_map_area)



	__INITDATA



	.type	v3_cache_fns, #object
@@ -131,6 +153,8 @@ ENTRY(v3_cache_fns) 
	.long	v3_coherent_kern_range

	.long	v3_coherent_user_range

	.long	v3_flush_kern_dcache_area

	.long	v3_dma_map_area

	.long	v3_dma_unmap_area

	.long	v3_dma_inv_range

	.long	v3_dma_clean_range

	.long	v3_dma_flush_range

arch/arm/mm/cache-v4.S

+24 −0
Original line number Diff line number Diff line
@@ -133,6 +133,28 @@ ENTRY(v4_dma_flush_range) 
ENTRY(v4_dma_clean_range)

	mov	pc, lr



/*

 *	dma_unmap_area(start, size, dir)

 *	- start	- kernel virtual start address

 *	- size	- size of region

 *	- dir	- DMA direction

 */

ENTRY(v4_dma_unmap_area)

	teq	r2, #DMA_TO_DEVICE

	bne	v4_dma_inv_range

	/* FALLTHROUGH */



/*

 *	dma_map_area(start, size, dir)

 *	- start	- kernel virtual start address

 *	- size	- size of region

 *	- dir	- DMA direction

 */

ENTRY(v4_dma_map_area)

	mov	pc, lr

ENDPROC(v4_dma_unmap_area)

ENDPROC(v4_dma_map_area)



	__INITDATA



	.type	v4_cache_fns, #object
@@ -143,6 +165,8 @@ ENTRY(v4_cache_fns) 
	.long	v4_coherent_kern_range

	.long	v4_coherent_user_range

	.long	v4_flush_kern_dcache_area

	.long	v4_dma_map_area

	.long	v4_dma_unmap_area

	.long	v4_dma_inv_range

	.long	v4_dma_clean_range

	.long	v4_dma_flush_range