[PATCH] ARM: EXYNOS4: Bugfix Hotplug

[PATCH] ARM: EXYNOS4: Bugfix Hotplug

[MyungJoo Ham]

When tested with "NURI" board, Exynos4 has not been working
properly and showed error messages when the secondary core is being
enabled with hotplug. The NURI board has Exynos4 of revision 1.

This patch enables Exynos4's hotplug to work properly.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 arch/arm/mach-exynos4/hotplug.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-exynos4/hotplug.c b/arch/arm/mach-exynos4/hotplug.c
index 2b5909e..b81a24a 100644
--- a/arch/arm/mach-exynos4/hotplug.c
+++ b/arch/arm/mach-exynos4/hotplug.c
@@ -30,13 +30,13 @@ static inline void cpu_enter_lowpower(void)
 	 * Turn off coherency
 	 */
 	"	mrc	p15, 0, %0, c1, c0, 1\n"
-	"	bic	%0, %0, %3\n"
+	"	bic	%0, %0, #0x41\n"
 	"	mcr	p15, 0, %0, c1, c0, 1\n"
 	"	mrc	p15, 0, %0, c1, c0, 0\n"
-	"	bic	%0, %0, %2\n"
+	"	bic	%0, %0, #0x04\n"
 	"	mcr	p15, 0, %0, c1, c0, 0\n"
 	  : "=&r" (v)
-	  : "r" (0), "Ir" (CR_C), "Ir" (0x40)
+	  : "r" (0)
 	  : "cc");
 }
 
@@ -45,14 +45,14 @@ static inline void cpu_leave_lowpower(void)
 	unsigned int v;
 
 	asm volatile(
-	"mrc	p15, 0, %0, c1, c0, 0\n"
-	"	orr	%0, %0, %1\n"
+	"	mrc	p15, 0, %0, c1, c0, 0\n"
+	"	orr	%0, %0, #0x04\n"
 	"	mcr	p15, 0, %0, c1, c0, 0\n"
 	"	mrc	p15, 0, %0, c1, c0, 1\n"
-	"	orr	%0, %0, %2\n"
+	"	orr	%0, %0, #0x41\n"
 	"	mcr	p15, 0, %0, c1, c0, 1\n"
 	  : "=&r" (v)
-	  : "Ir" (CR_C), "Ir" (0x40)
+	  :
 	  : "cc");
 }
 
-- 
1.7.4.1

[PATCH] ARM: EXYNOS4: Bugfix Hotplug

[MyungJoo Ham]

On Wed, May 4, 2011 at 9:51 AM, MyungJoo Ham <myungjoo.ham@samsung.com> wrote:
> When tested with "NURI" board, Exynos4 has not been working
> properly and showed error messages when the secondary core is being
> enabled with hotplug. The NURI board has Exynos4 of revision 1.
>
> This patch enables Exynos4's hotplug to work properly.
>
> Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>

Sorry, but it requires further modifications at platsmp.c to run
hotplug in Exynos4 without another issue and I've missed that file in
this patch.

I'll submit it as soon as the patch is cleaned up.

-- 
MyungJoo Ham, Ph.D.
Mobile Software Platform Lab,
Digital Media and Communications (DMC) Business
Samsung Electronics
cell: 82-10-6714-2858

[PATCH] ARM: EXYNOS4: Bugfix Hotplug

[Russell King - ARM Linux]

On Wed, May 04, 2011 at 09:51:24AM +0900, MyungJoo Ham wrote:
> When tested with "NURI" board, Exynos4 has not been working
> properly and showed error messages when the secondary core is being
> enabled with hotplug. The NURI board has Exynos4 of revision 1.

NAK.

> diff --git a/arch/arm/mach-exynos4/hotplug.c b/arch/arm/mach-exynos4/hotplug.c
> index 2b5909e..b81a24a 100644
> --- a/arch/arm/mach-exynos4/hotplug.c
> +++ b/arch/arm/mach-exynos4/hotplug.c
> @@ -30,13 +30,13 @@ static inline void cpu_enter_lowpower(void)
>  	 * Turn off coherency
>  	 */
>  	"	mrc	p15, 0, %0, c1, c0, 1\n"
> -	"	bic	%0, %0, %3\n"
> +	"	bic	%0, %0, #0x41\n"
>  	"	mcr	p15, 0, %0, c1, c0, 1\n"
>  	"	mrc	p15, 0, %0, c1, c0, 0\n"
> -	"	bic	%0, %0, %2\n"
> +	"	bic	%0, %0, #0x04\n"
>  	"	mcr	p15, 0, %0, c1, c0, 0\n"
>  	  : "=&r" (v)
> -	  : "r" (0), "Ir" (CR_C), "Ir" (0x40)
> +	  : "r" (0)

Why not just change the '0x40' to '0x41' ?

> @@ -45,14 +45,14 @@ static inline void cpu_leave_lowpower(void)
>  	unsigned int v;
>  
>  	asm volatile(
> -	"mrc	p15, 0, %0, c1, c0, 0\n"
> -	"	orr	%0, %0, %1\n"
> +	"	mrc	p15, 0, %0, c1, c0, 0\n"
> +	"	orr	%0, %0, #0x04\n"
>  	"	mcr	p15, 0, %0, c1, c0, 0\n"
>  	"	mrc	p15, 0, %0, c1, c0, 1\n"
> -	"	orr	%0, %0, %2\n"
> +	"	orr	%0, %0, #0x41\n"
>  	"	mcr	p15, 0, %0, c1, c0, 1\n"
>  	  : "=&r" (v)
> -	  : "Ir" (CR_C), "Ir" (0x40)
> +	  :

Same comment.