ARM: EXYNOS: use v7_exit_coherency_flush macro for cache disabling
A common macro v7_exit_coherency_flush available which does the below tasks in the seqeunce. -clearing C bit -clearing L1 cache -exit SMP -instruction and data synchronization So removing the local functions which does the same thing and use the macro instead. Signed-off-by: Leela Krishna Amudala <leela.krishna@linaro.org> Acked-by: Nicolas Pitre <nico@linaro.org> [cw00.choi@samsung.com: tested on exynos3250 based board] Tested-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
		
							parent
							
								
									b5783dcaed
								
							
						
					
					
						commit
						75ad2ab28f
					
				| @ -24,56 +24,6 @@ | |||||||
| #include "common.h" | #include "common.h" | ||||||
| #include "regs-pmu.h" | #include "regs-pmu.h" | ||||||
| 
 | 
 | ||||||
| static inline void cpu_enter_lowpower_a9(void) |  | ||||||
| { |  | ||||||
| 	unsigned int v; |  | ||||||
| 
 |  | ||||||
| 	asm volatile( |  | ||||||
| 	"	mcr	p15, 0, %1, c7, c5, 0\n" |  | ||||||
| 	"	mcr	p15, 0, %1, c7, c10, 4\n" |  | ||||||
| 	/*
 |  | ||||||
| 	 * Turn off coherency |  | ||||||
| 	 */ |  | ||||||
| 	"	mrc	p15, 0, %0, c1, c0, 1\n" |  | ||||||
| 	"	bic	%0, %0, %3\n" |  | ||||||
| 	"	mcr	p15, 0, %0, c1, c0, 1\n" |  | ||||||
| 	"	mrc	p15, 0, %0, c1, c0, 0\n" |  | ||||||
| 	"	bic	%0, %0, %2\n" |  | ||||||
| 	"	mcr	p15, 0, %0, c1, c0, 0\n" |  | ||||||
| 	  : "=&r" (v) |  | ||||||
| 	  : "r" (0), "Ir" (CR_C), "Ir" (0x40) |  | ||||||
| 	  : "cc"); |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| static inline void cpu_enter_lowpower_a15(void) |  | ||||||
| { |  | ||||||
| 	unsigned int v; |  | ||||||
| 
 |  | ||||||
| 	asm volatile( |  | ||||||
| 	"	mrc	p15, 0, %0, c1, c0, 0\n" |  | ||||||
| 	"	bic	%0, %0, %1\n" |  | ||||||
| 	"	mcr	p15, 0, %0, c1, c0, 0\n" |  | ||||||
| 	  : "=&r" (v) |  | ||||||
| 	  : "Ir" (CR_C) |  | ||||||
| 	  : "cc"); |  | ||||||
| 
 |  | ||||||
| 	flush_cache_louis(); |  | ||||||
| 
 |  | ||||||
| 	asm volatile( |  | ||||||
| 	/*
 |  | ||||||
| 	* Turn off coherency |  | ||||||
| 	*/ |  | ||||||
| 	"	mrc	p15, 0, %0, c1, c0, 1\n" |  | ||||||
| 	"	bic	%0, %0, %1\n" |  | ||||||
| 	"	mcr	p15, 0, %0, c1, c0, 1\n" |  | ||||||
| 	: "=&r" (v) |  | ||||||
| 	: "Ir" (0x40) |  | ||||||
| 	: "cc"); |  | ||||||
| 
 |  | ||||||
| 	isb(); |  | ||||||
| 	dsb(); |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| static inline void cpu_leave_lowpower(void) | static inline void cpu_leave_lowpower(void) | ||||||
| { | { | ||||||
| 	unsigned int v; | 	unsigned int v; | ||||||
| @ -132,19 +82,8 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) | |||||||
| void __ref exynos_cpu_die(unsigned int cpu) | void __ref exynos_cpu_die(unsigned int cpu) | ||||||
| { | { | ||||||
| 	int spurious = 0; | 	int spurious = 0; | ||||||
| 	int primary_part = 0; |  | ||||||
| 
 | 
 | ||||||
| 	/*
 | 	v7_exit_coherency_flush(louis); | ||||||
| 	 * we're ready for shutdown now, so do it. |  | ||||||
| 	 * Exynos4 is A9 based while Exynos5 is A15; check the CPU part |  | ||||||
| 	 * number by reading the Main ID register and then perform the |  | ||||||
| 	 * appropriate sequence for entering low power. |  | ||||||
| 	 */ |  | ||||||
| 	asm("mrc p15, 0, %0, c0, c0, 0" : "=r"(primary_part) : : "cc"); |  | ||||||
| 	if ((primary_part & 0xfff0) == 0xc0f0) |  | ||||||
| 		cpu_enter_lowpower_a15(); |  | ||||||
| 	else |  | ||||||
| 		cpu_enter_lowpower_a9(); |  | ||||||
| 
 | 
 | ||||||
| 	platform_do_lowpower(cpu, &spurious); | 	platform_do_lowpower(cpu, &spurious); | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user