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

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

Merge branch 'cache-louis' of git://linux-arm.org/linux-2.6-lp into devel-stable

parents 6f0f9b6b 6323fa22

arch/arm/include/asm/cacheflush.h

+15 −0
Original line number Diff line number Diff line
@@ -49,6 +49,13 @@ 
 *

 *		Unconditionally clean and invalidate the entire cache.

 *

 *     flush_kern_louis()

 *

 *             Flush data cache levels up to the level of unification

 *             inner shareable and invalidate the I-cache.

 *             Only needed from v7 onwards, falls back to flush_cache_all()

 *             for all other processor versions.

 *

 *	flush_user_all()

 *

 *		Clean and invalidate all user space cache entries
@@ -97,6 +104,7 @@ 
struct cpu_cache_fns {

	void (*flush_icache_all)(void);

	void (*flush_kern_all)(void);

	void (*flush_kern_louis)(void);

	void (*flush_user_all)(void);

	void (*flush_user_range)(unsigned long, unsigned long, unsigned int);
@@ -119,6 +127,7 @@ extern struct cpu_cache_fns cpu_cache; 


#define __cpuc_flush_icache_all		cpu_cache.flush_icache_all

#define __cpuc_flush_kern_all		cpu_cache.flush_kern_all

#define __cpuc_flush_kern_louis		cpu_cache.flush_kern_louis

#define __cpuc_flush_user_all		cpu_cache.flush_user_all

#define __cpuc_flush_user_range		cpu_cache.flush_user_range

#define __cpuc_coherent_kern_range	cpu_cache.coherent_kern_range
@@ -139,6 +148,7 @@ extern struct cpu_cache_fns cpu_cache; 


extern void __cpuc_flush_icache_all(void);

extern void __cpuc_flush_kern_all(void);

extern void __cpuc_flush_kern_louis(void);

extern void __cpuc_flush_user_all(void);

extern void __cpuc_flush_user_range(unsigned long, unsigned long, unsigned int);

extern void __cpuc_coherent_kern_range(unsigned long, unsigned long);
@@ -204,6 +214,11 @@ static inline void __flush_icache_all(void) 
	__flush_icache_preferred();

}



/*

 * Flush caches up to Level of Unification Inner Shareable

 */

#define flush_cache_louis()		__cpuc_flush_kern_louis()



#define flush_cache_all()		__cpuc_flush_kern_all()



static inline void vivt_flush_cache_mm(struct mm_struct *mm)

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

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ 
#ifndef MULTI_CACHE

#define __cpuc_flush_icache_all		__glue(_CACHE,_flush_icache_all)

#define __cpuc_flush_kern_all		__glue(_CACHE,_flush_kern_cache_all)

#define __cpuc_flush_kern_louis		__glue(_CACHE,_flush_kern_cache_louis)

#define __cpuc_flush_user_all		__glue(_CACHE,_flush_user_cache_all)

#define __cpuc_flush_user_range		__glue(_CACHE,_flush_user_cache_range)

#define __cpuc_coherent_kern_range	__glue(_CACHE,_coherent_kern_range)

arch/arm/kernel/smp.c

+4 −1
Original line number Diff line number Diff line
@@ -134,8 +134,11 @@ int __cpu_disable(void) 
	/*

	 * Flush user cache and TLB mappings, and then remove this CPU

	 * from the vm mask set of all processes.

	 *

	 * Caches are flushed to the Level of Unification Inner Shareable

	 * to write-back dirty lines to unified caches shared by all CPUs.

	 */

	flush_cache_all();

	flush_cache_louis();

	local_flush_tlb_all();



	clear_tasks_mm_cpumask(cpu);

arch/arm/kernel/suspend.c

+16 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ extern void cpu_resume_mmu(void); 
 */

void __cpu_suspend_save(u32 *ptr, u32 ptrsz, u32 sp, u32 *save_ptr)

{

	u32 *ctx = ptr;



	*save_ptr = virt_to_phys(ptr);



	/* This must correspond to the LDM in cpu_resume() assembly */
@@ -26,7 +28,20 @@ void __cpu_suspend_save(u32 *ptr, u32 ptrsz, u32 sp, u32 *save_ptr) 


	cpu_do_suspend(ptr);



	flush_cache_all();

	flush_cache_louis();



	/*

	 * flush_cache_louis does not guarantee that

	 * save_ptr and ptr are cleaned to main memory,

	 * just up to the Level of Unification Inner Shareable.

	 * Since the context pointer and context itself

	 * are to be retrieved with the MMU off that

	 * data must be cleaned from all cache levels

	 * to main memory using "area" cache primitives.

	*/

	__cpuc_flush_dcache_area(ctx, ptrsz);

	__cpuc_flush_dcache_area(save_ptr, sizeof(*save_ptr));



	outer_clean_range(*save_ptr, *save_ptr + ptrsz);

	outer_clean_range(virt_to_phys(save_ptr),

			  virt_to_phys(save_ptr) + sizeof(*save_ptr));

arch/arm/mm/cache-fa.S

+3 −0
Original line number Diff line number Diff line
@@ -240,6 +240,9 @@ ENTRY(fa_dma_unmap_area) 
	mov	pc, lr

ENDPROC(fa_dma_unmap_area)



	.globl	fa_flush_kern_cache_louis

	.equ	fa_flush_kern_cache_louis, fa_flush_kern_cache_all



	__INITDATA



	@ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)