[PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Nick Bowler]

Current Versatile Express CPU hotplug code includes a hardcoded WFI
instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
mode, this is invalid and causes the machine to hang hard when a CPU
is offlined.

Using the assembler mnemonic instead of hardcoding it causes the correct
instruction to be emitted in either case.

Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
---
 arch/arm/mach-vexpress/hotplug.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

OK.  I assume that the reason for the hardcoded instruction is that
older versions of binutils did not support the mnemonic.  Looking at the
binutils CVS history, support seems to have been added in 2005, and was
included in the 2.16 release.  If we care about those old assembler
versions, I can resubmit this patch using ARM/THUMB macros instead,
which should work just as well.

I imagine that other platforms which use this same construct, such as
realview, will have similar problems in thumb mode.  I can't test
changes on those platforms, unfortunately.

diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
index ea4cbfb..d6be197 100644
--- a/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@ -62,10 +62,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
 	 * code will have already disabled interrupts
 	 */
 	for (;;) {
-		/*
-		 * here's the WFI
-		 */
-		asm(".word	0xe320f003\n"
+		asm("wfi\n"
 		    :
 		    :
 		    : "memory", "cc");
-- 
1.7.3.4

[PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Nick Bowler]

Current Versatile Express CPU hotplug code includes a hardcoded WFI
instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
mode, this is invalid and causes the machine to hang hard when a CPU
is offlined.

Using the assembler mnemonic instead of hardcoding it causes the correct
instruction to be emitted in either case.

Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
---
 arch/arm/mach-vexpress/hotplug.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

OK.  I assume that the reason for the hardcoded instruction is that
older versions of binutils did not support the mnemonic.  Looking at the
binutils CVS history, support seems to have been added in 2005, and was
included in the 2.16 release.  If we care about those old assembler
versions, I can resubmit this patch using ARM/THUMB macros instead,
which should work just as well.

I imagine that other platforms which use this same construct, such as
realview, will have similar problems in thumb mode.  I can't test
changes on those platforms, unfortunately.

diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
index ea4cbfb..d6be197 100644
--- a/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@ -62,10 +62,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
 	 * code will have already disabled interrupts
 	 */
 	for (;;) {
-		/*
-		 * here's the WFI
-		 */
-		asm(".word	0xe320f003\n"
+		asm("wfi\n"
 		    :
 		    :
 		    : "memory", "cc");
-- 
1.7.3.4

Re: [PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Jamie Iles]

Hi Nick,

On Fri, Aug 19, 2011 at 02:03:24PM -0400, Nick Bowler wrote:
> Current Versatile Express CPU hotplug code includes a hardcoded WFI
> instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
> mode, this is invalid and causes the machine to hang hard when a CPU
> is offlined.
> 
> Using the assembler mnemonic instead of hardcoding it causes the correct
> instruction to be emitted in either case.
> 
> Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
> ---
>  arch/arm/mach-vexpress/hotplug.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> OK.  I assume that the reason for the hardcoded instruction is that
> older versions of binutils did not support the mnemonic.  Looking at the
> binutils CVS history, support seems to have been added in 2005, and was
> included in the 2.16 release.  If we care about those old assembler
> versions, I can resubmit this patch using ARM/THUMB macros instead,
> which should work just as well.
> 
> I imagine that other platforms which use this same construct, such as
> realview, will have similar problems in thumb mode.  I can't test
> changes on those platforms, unfortunately.
> 
> diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
> index ea4cbfb..d6be197 100644
> --- a/arch/arm/mach-vexpress/hotplug.c
> +++ b/arch/arm/mach-vexpress/hotplug.c
> @@ -62,10 +62,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
>  	 * code will have already disabled interrupts
>  	 */
>  	for (;;) {
> -		/*
> -		 * here's the WFI
> -		 */
> -		asm(".word	0xe320f003\n"
> +		asm("wfi\n"
>  		    :
>  		    :
>  		    : "memory", "cc");

There's a wfi() macro defined in arch/arm/include/asm/system.h that 
could be used here.

Jamie

[PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Jamie Iles]

Hi Nick,

On Fri, Aug 19, 2011 at 02:03:24PM -0400, Nick Bowler wrote:
> Current Versatile Express CPU hotplug code includes a hardcoded WFI
> instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
> mode, this is invalid and causes the machine to hang hard when a CPU
> is offlined.
> 
> Using the assembler mnemonic instead of hardcoding it causes the correct
> instruction to be emitted in either case.
> 
> Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
> ---
>  arch/arm/mach-vexpress/hotplug.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> OK.  I assume that the reason for the hardcoded instruction is that
> older versions of binutils did not support the mnemonic.  Looking at the
> binutils CVS history, support seems to have been added in 2005, and was
> included in the 2.16 release.  If we care about those old assembler
> versions, I can resubmit this patch using ARM/THUMB macros instead,
> which should work just as well.
> 
> I imagine that other platforms which use this same construct, such as
> realview, will have similar problems in thumb mode.  I can't test
> changes on those platforms, unfortunately.
> 
> diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
> index ea4cbfb..d6be197 100644
> --- a/arch/arm/mach-vexpress/hotplug.c
> +++ b/arch/arm/mach-vexpress/hotplug.c
> @@ -62,10 +62,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
>  	 * code will have already disabled interrupts
>  	 */
>  	for (;;) {
> -		/*
> -		 * here's the WFI
> -		 */
> -		asm(".word	0xe320f003\n"
> +		asm("wfi\n"
>  		    :
>  		    :
>  		    : "memory", "cc");

There's a wfi() macro defined in arch/arm/include/asm/system.h that 
could be used here.

Jamie

Re: [PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Nick Bowler]

On 2011-08-19 19:15 +0100, Jamie Iles wrote:
> On Fri, Aug 19, 2011 at 02:03:24PM -0400, Nick Bowler wrote:
[...]
> > -		/*
> > -		 * here's the WFI
> > -		 */
> > -		asm(".word	0xe320f003\n"
> > +		asm("wfi\n"
> >  		    :
> >  		    :
> >  		    : "memory", "cc");
> 
> There's a wfi() macro defined in arch/arm/include/asm/system.h that 
> could be used here.

Indeed, thanks for pointing that out.

I'm a little wary, however: the wfi macro does not include the "cc"
clobber that this code has currently, and I don't know what the
implications of removing it are.  There appears to be no current
users of the wfi macro.

Taking a closer look, there appear to be five platforms that have a
hardcoded WFI just like the above (including the "cc" clobber):
exynos4, realview, shmobile, tegra and vexpress.  omap defines its
own do_wfi macro, *without* the "cc" clobber.

Nevertheless, using the macro seems to work just fine, so I can
certainly re-spin the patch with that instead.

-- 
Nick Bowler, Elliptic Technologies (http://www.elliptictech.com/)

[PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Nick Bowler]

On 2011-08-19 19:15 +0100, Jamie Iles wrote:
> On Fri, Aug 19, 2011 at 02:03:24PM -0400, Nick Bowler wrote:
[...]
> > -		/*
> > -		 * here's the WFI
> > -		 */
> > -		asm(".word	0xe320f003\n"
> > +		asm("wfi\n"
> >  		    :
> >  		    :
> >  		    : "memory", "cc");
> 
> There's a wfi() macro defined in arch/arm/include/asm/system.h that 
> could be used here.

Indeed, thanks for pointing that out.

I'm a little wary, however: the wfi macro does not include the "cc"
clobber that this code has currently, and I don't know what the
implications of removing it are.  There appears to be no current
users of the wfi macro.

Taking a closer look, there appear to be five platforms that have a
hardcoded WFI just like the above (including the "cc" clobber):
exynos4, realview, shmobile, tegra and vexpress.  omap defines its
own do_wfi macro, *without* the "cc" clobber.

Nevertheless, using the macro seems to work just fine, so I can
certainly re-spin the patch with that instead.

-- 
Nick Bowler, Elliptic Technologies (http://www.elliptictech.com/)

Re: [PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Jamie Iles]

On Fri, Aug 19, 2011 at 03:26:38PM -0400, Nick Bowler wrote:
> On 2011-08-19 19:15 +0100, Jamie Iles wrote:
> > On Fri, Aug 19, 2011 at 02:03:24PM -0400, Nick Bowler wrote:
> [...]
> > > -		/*
> > > -		 * here's the WFI
> > > -		 */
> > > -		asm(".word	0xe320f003\n"
> > > +		asm("wfi\n"
> > >  		    :
> > >  		    :
> > >  		    : "memory", "cc");
> > 
> > There's a wfi() macro defined in arch/arm/include/asm/system.h that 
> > could be used here.
> 
> Indeed, thanks for pointing that out.
> 
> I'm a little wary, however: the wfi macro does not include the "cc"
> clobber that this code has currently, and I don't know what the
> implications of removing it are.  There appears to be no current
> users of the wfi macro.

As far as I can tell from the ARM ARM, the instruction shouldn't alter 
the condition flags so the cc clobber shouldn't be necessary.  I'm not 
sure that my reading of the ARM ARM should be considered authoritative 
though!

Jamie

[PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Jamie Iles]

On Fri, Aug 19, 2011 at 03:26:38PM -0400, Nick Bowler wrote:
> On 2011-08-19 19:15 +0100, Jamie Iles wrote:
> > On Fri, Aug 19, 2011 at 02:03:24PM -0400, Nick Bowler wrote:
> [...]
> > > -		/*
> > > -		 * here's the WFI
> > > -		 */
> > > -		asm(".word	0xe320f003\n"
> > > +		asm("wfi\n"
> > >  		    :
> > >  		    :
> > >  		    : "memory", "cc");
> > 
> > There's a wfi() macro defined in arch/arm/include/asm/system.h that 
> > could be used here.
> 
> Indeed, thanks for pointing that out.
> 
> I'm a little wary, however: the wfi macro does not include the "cc"
> clobber that this code has currently, and I don't know what the
> implications of removing it are.  There appears to be no current
> users of the wfi macro.

As far as I can tell from the ARM ARM, the instruction shouldn't alter 
the condition flags so the cc clobber shouldn't be necessary.  I'm not 
sure that my reading of the ARM ARM should be considered authoritative 
though!

Jamie

Re: [PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Catalin Marinas]

On 19 August 2011 22:14, Jamie Iles <jamie@jamieiles.com> wrote:
> On Fri, Aug 19, 2011 at 03:26:38PM -0400, Nick Bowler wrote:
>> On 2011-08-19 19:15 +0100, Jamie Iles wrote:
>> > On Fri, Aug 19, 2011 at 02:03:24PM -0400, Nick Bowler wrote:
>> [...]
>> > > -         /*
>> > > -          * here's the WFI
>> > > -          */
>> > > -         asm(".word      0xe320f003\n"
>> > > +         asm("wfi\n"
>> > >               :
>> > >               :
>> > >               : "memory", "cc");
>> >
>> > There's a wfi() macro defined in arch/arm/include/asm/system.h that
>> > could be used here.
>>
>> Indeed, thanks for pointing that out.
>>
>> I'm a little wary, however: the wfi macro does not include the "cc"
>> clobber that this code has currently, and I don't know what the
>> implications of removing it are.  There appears to be no current
>> users of the wfi macro.
>
> As far as I can tell from the ARM ARM, the instruction shouldn't alter
> the condition flags so the cc clobber shouldn't be necessary.

I also don't see why we need the 'cc' flag in here. Just use the wfi() macro.

-- 
Catalin

[PATCH RFC] ARM: vexpress: Use assembler mnemonic for WFI in platform_do_lowpower.

[Catalin Marinas]

On 19 August 2011 22:14, Jamie Iles <jamie@jamieiles.com> wrote:
> On Fri, Aug 19, 2011 at 03:26:38PM -0400, Nick Bowler wrote:
>> On 2011-08-19 19:15 +0100, Jamie Iles wrote:
>> > On Fri, Aug 19, 2011 at 02:03:24PM -0400, Nick Bowler wrote:
>> [...]
>> > > - ? ? ? ? /*
>> > > - ? ? ? ? ?* here's the WFI
>> > > - ? ? ? ? ?*/
>> > > - ? ? ? ? asm(".word ? ? ?0xe320f003\n"
>> > > + ? ? ? ? asm("wfi\n"
>> > > ? ? ? ? ? ? ? :
>> > > ? ? ? ? ? ? ? :
>> > > ? ? ? ? ? ? ? : "memory", "cc");
>> >
>> > There's a wfi() macro defined in arch/arm/include/asm/system.h that
>> > could be used here.
>>
>> Indeed, thanks for pointing that out.
>>
>> I'm a little wary, however: the wfi macro does not include the "cc"
>> clobber that this code has currently, and I don't know what the
>> implications of removing it are. ?There appears to be no current
>> users of the wfi macro.
>
> As far as I can tell from the ARM ARM, the instruction shouldn't alter
> the condition flags so the cc clobber shouldn't be necessary.

I also don't see why we need the 'cc' flag in here. Just use the wfi() macro.

-- 
Catalin

[PATCH v2] ARM: vexpress: Use wfi macro in platform_do_lowpower.

[Nick Bowler]

Current Versatile Express CPU hotplug code includes a hardcoded WFI
instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
mode, this is invalid and causes the machine to hang hard when a CPU
is offlined.

Using the wfi macro (which uses the appropriate assembler mnemonic)
causes the correct instruction to be emitted in either case.  As a
consequence of this change, an apparently vestigial "cc" clobber is
dropped from the asm (the macro uses "memory" only).

Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
---
 arch/arm/mach-vexpress/hotplug.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

OK.  If this version is acceptable, I'll follow up with patches for the
other platforms.

diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
index ea4cbfb..3668cf9 100644
--- a/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@ -13,6 +13,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/system.h>
 
 extern volatile int pen_release;
 
@@ -62,13 +63,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
 	 * code will have already disabled interrupts
 	 */
 	for (;;) {
-		/*
-		 * here's the WFI
-		 */
-		asm(".word	0xe320f003\n"
-		    :
-		    :
-		    : "memory", "cc");
+		wfi();
 
 		if (pen_release == cpu) {
 			/*
-- 
1.7.3.4

[PATCH v2] ARM: vexpress: Use wfi macro in platform_do_lowpower.

[Nick Bowler]

Current Versatile Express CPU hotplug code includes a hardcoded WFI
instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
mode, this is invalid and causes the machine to hang hard when a CPU
is offlined.

Using the wfi macro (which uses the appropriate assembler mnemonic)
causes the correct instruction to be emitted in either case.  As a
consequence of this change, an apparently vestigial "cc" clobber is
dropped from the asm (the macro uses "memory" only).

Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
---
 arch/arm/mach-vexpress/hotplug.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

OK.  If this version is acceptable, I'll follow up with patches for the
other platforms.

diff --git a/arch/arm/mach-vexpress/hotplug.c b/arch/arm/mach-vexpress/hotplug.c
index ea4cbfb..3668cf9 100644
--- a/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@ -13,6 +13,7 @@
 #include <linux/smp.h>
 
 #include <asm/cacheflush.h>
+#include <asm/system.h>
 
 extern volatile int pen_release;
 
@@ -62,13 +63,7 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
 	 * code will have already disabled interrupts
 	 */
 	for (;;) {
-		/*
-		 * here's the WFI
-		 */
-		asm(".word	0xe320f003\n"
-		    :
-		    :
-		    : "memory", "cc");
+		wfi();
 
 		if (pen_release == cpu) {
 			/*
-- 
1.7.3.4

Re: [PATCH v2] ARM: vexpress: Use wfi macro in platform_do_lowpower.

[Jamie Iles]

On Mon, Aug 22, 2011 at 09:54:19AM -0400, Nick Bowler wrote:
> Current Versatile Express CPU hotplug code includes a hardcoded WFI
> instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
> mode, this is invalid and causes the machine to hang hard when a CPU
> is offlined.
> 
> Using the wfi macro (which uses the appropriate assembler mnemonic)
> causes the correct instruction to be emitted in either case.  As a
> consequence of this change, an apparently vestigial "cc" clobber is
> dropped from the asm (the macro uses "memory" only).
> 
> Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
> ---

Reviewed-by: Jamie Iles <jamie@jamieiles.com>

if it helps!

Jamie

[PATCH v2] ARM: vexpress: Use wfi macro in platform_do_lowpower.

[Jamie Iles]

On Mon, Aug 22, 2011 at 09:54:19AM -0400, Nick Bowler wrote:
> Current Versatile Express CPU hotplug code includes a hardcoded WFI
> instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
> mode, this is invalid and causes the machine to hang hard when a CPU
> is offlined.
> 
> Using the wfi macro (which uses the appropriate assembler mnemonic)
> causes the correct instruction to be emitted in either case.  As a
> consequence of this change, an apparently vestigial "cc" clobber is
> dropped from the asm (the macro uses "memory" only).
> 
> Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
> ---

Reviewed-by: Jamie Iles <jamie@jamieiles.com>

if it helps!

Jamie

Re: [PATCH v2] ARM: vexpress: Use wfi macro in platform_do_lowpower.

[Nick Bowler]

On 2011-08-22 14:59 +0100, Jamie Iles wrote:
> On Mon, Aug 22, 2011 at 09:54:19AM -0400, Nick Bowler wrote:
> > Current Versatile Express CPU hotplug code includes a hardcoded WFI
> > instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
> > mode, this is invalid and causes the machine to hang hard when a CPU
> > is offlined.
> > 
> > Using the wfi macro (which uses the appropriate assembler mnemonic)
> > causes the correct instruction to be emitted in either case.  As a
> > consequence of this change, an apparently vestigial "cc" clobber is
> > dropped from the asm (the macro uses "memory" only).
> > 
> > Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
> > ---
> 
> Reviewed-by: Jamie Iles <jamie@jamieiles.com>
> 
> if it helps!

Thanks!

Since there seem to be no objections, I'll send this off to Russell's
tracker.

Cheers,
-- 
Nick Bowler, Elliptic Technologies (http://www.elliptictech.com/)

[PATCH v2] ARM: vexpress: Use wfi macro in platform_do_lowpower.

[Nick Bowler]

On 2011-08-22 14:59 +0100, Jamie Iles wrote:
> On Mon, Aug 22, 2011 at 09:54:19AM -0400, Nick Bowler wrote:
> > Current Versatile Express CPU hotplug code includes a hardcoded WFI
> > instruction, in ARM encoding.  When the kernel is compiled in Thumb-2
> > mode, this is invalid and causes the machine to hang hard when a CPU
> > is offlined.
> > 
> > Using the wfi macro (which uses the appropriate assembler mnemonic)
> > causes the correct instruction to be emitted in either case.  As a
> > consequence of this change, an apparently vestigial "cc" clobber is
> > dropped from the asm (the macro uses "memory" only).
> > 
> > Signed-off-by: Nick Bowler <nbowler@elliptictech.com>
> > ---
> 
> Reviewed-by: Jamie Iles <jamie@jamieiles.com>
> 
> if it helps!

Thanks!

Since there seem to be no objections, I'll send this off to Russell's
tracker.

Cheers,
-- 
Nick Bowler, Elliptic Technologies (http://www.elliptictech.com/)