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

Commit 8f2739ee authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ARM: dma-mapping: remove dmac_clean_range and dmac_inv_range"" into msm-4.9

parents c9a5a1d0 d7e23e79

arch/arm/include/asm/cacheflush.h

+21 −0
Original line number Diff line number Diff line
@@ -94,6 +94,21 @@ 
 *	DMA Cache Coherency

 *	===================

 *

 *	dma_inv_range(start, end)

 *

 *		Invalidate (discard) the specified virtual address range.

 *		May not write back any entries.  If 'start' or 'end'

 *		are not cache line aligned, those lines must be written

 *		back.

 *		- start  - virtual start address

 *		- end    - virtual end address

 *

 *	dma_clean_range(start, end)

 *

 *		Clean (write back) the specified virtual address range.

 *		- start  - virtual start address

 *		- end    - virtual end address

 *

 *	dma_flush_range(start, end)

 *

 *		Clean and invalidate the specified virtual address range.
@@ -115,6 +130,8 @@ struct cpu_cache_fns { 
	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 *);

};
@@ -140,6 +157,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_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



#else
@@ -159,6 +178,8 @@ 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.

 */

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 *);



#endif

arch/arm/include/asm/glue-cache.h

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } 
#define __cpuc_flush_dcache_area	__glue(_CACHE,_flush_kern_dcache_area)



#define dmac_flush_range		__glue(_CACHE,_dma_flush_range)

#define dmac_inv_range			__glue(_CACHE, _dma_inv_range)

#define dmac_clean_range		__glue(_CACHE, _dma_clean_range)

#endif



#endif

arch/arm/mm/cache-v7.S

+2 −2
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ ENDPROC(v7_flush_kern_dcache_area) 
 *	- start   - virtual start address of region

 *	- end     - virtual end address of region

 */

v7_dma_inv_range:

ENTRY(v7_dma_inv_range)

	dcache_line_size r2, r3

	sub	r3, r2, #1

	tst	r0, r3
@@ -377,7 +377,7 @@ ENDPROC(v7_dma_inv_range) 
 *	- start   - virtual start address of region

 *	- end     - virtual end address of region

 */

v7_dma_clean_range:

ENTRY(v7_dma_clean_range)

	dcache_line_size r2, r3

	sub	r3, r2, #1

	bic	r0, r0, r3

arch/arm/mm/proc-macros.S

+2 −0
Original line number Diff line number Diff line
@@ -325,6 +325,8 @@ ENTRY(\name\()_cache_fns) 
	.long	\name\()_flush_kern_dcache_area

	.long	\name\()_dma_map_area

	.long	\name\()_dma_unmap_area

	.long   \name\()_dma_inv_range

	.long   \name\()_dma_clean_range

	.long	\name\()_dma_flush_range

	.size	\name\()_cache_fns, . - \name\()_cache_fns

.endm

arch/arm/mm/proc-syms.c

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ EXPORT_SYMBOL(__cpuc_flush_user_all); 
EXPORT_SYMBOL(__cpuc_flush_user_range);

EXPORT_SYMBOL(__cpuc_coherent_kern_range);

EXPORT_SYMBOL(__cpuc_flush_dcache_area);

EXPORT_SYMBOL(dmac_inv_range);

EXPORT_SYMBOL(dmac_clean_range);

EXPORT_SYMBOL(dmac_flush_range);

#else

EXPORT_SYMBOL(cpu_cache);

#endif