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

Commit ad849a22 authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: EXYNOS4: Fix wrong constants in the hotplug assembly code. 



This patch fixes wrong constants in the hotplug assembly code for
Exynos4 such as Russell's changing in vexpress hotplug and fixes
hard-coded control register constatns also.

Reported-by: default avatarChanghwan Youn <chaos.youn@samsung.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 9c0ff728

arch/arm/mach-exynos4/hotplug.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -30,13 +30,13 @@ static inline void cpu_enter_lowpower(void) 
	 * Turn off coherency

	 * Turn off coherency

	 */

	 */

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	bic	%0, %0, #0x20\n"

	"	bic	%0, %0, %3\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	"	mrc	p15, 0, %0, c1, c0, 0\n"

	"	mrc	p15, 0, %0, c1, c0, 0\n"

	"	bic	%0, %0, %2\n"

	"	bic	%0, %0, %2\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	  : "=&r" (v)

	  : "=&r" (v)

	  : "r" (0), "Ir" (CR_C)

	  : "r" (0), "Ir" (CR_C), "Ir" (0x40)

	  : "cc");

	  : "cc");

}

}
@@ -49,10 +49,10 @@ static inline void cpu_leave_lowpower(void) 
	"	orr	%0, %0, %1\n"

	"	orr	%0, %0, %1\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	"	mcr	p15, 0, %0, c1, c0, 0\n"

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	mrc	p15, 0, %0, c1, c0, 1\n"

	"	orr	%0, %0, #0x20\n"

	"	orr	%0, %0, %2\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	"	mcr	p15, 0, %0, c1, c0, 1\n"

	  : "=&r" (v)

	  : "=&r" (v)

	  : "Ir" (CR_C)

	  : "Ir" (CR_C), "Ir" (0x40)

	  : "cc");

	  : "cc");

}

}