[PATCH] arm: socfpga: fix build break for allyesconfig

[PATCH] arm: socfpga: fix build break for allyesconfig

[Arnd Bergmann]

On Friday 26 October 2012, dinguyen at altera.com wrote:
>  ENTRY(secondary_trampoline)
> +#if __LINUX_ARM_ARCH__ >= 7
>         movw    r0, #:lower16:CPU1_START_ADDR
>         movt  r0, #:upper16:CPU1_START_ADDR
> +#endif

I don't think this is the right fix, because it will break
running on SMP socfpga machines if you enable both socfpga
and picoxcell in a multiplatform configuration.

	Arnd

[PATCH] arm: socfpga: fix build break for allyesconfig

[Russell King - ARM Linux]

On Fri, Oct 26, 2012 at 04:17:41PM -0600, dinguyen at altera.com wrote:
> From: Dinh Nguyen <dinguyen@altera.com>
> 
> Add check for armv7 in headsmp.S.
> 
> Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
> ---
>  arch/arm/mach-socfpga/headsmp.S |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
> index 17d6eaf..9031a3c 100644
> --- a/arch/arm/mach-socfpga/headsmp.S
> +++ b/arch/arm/mach-socfpga/headsmp.S
> @@ -15,8 +15,10 @@
>  #define CPU1_START_ADDR 	        0xffd08010
>  
>  ENTRY(secondary_trampoline)
> +#if __LINUX_ARM_ARCH__ >= 7
>  	movw	r0, #:lower16:CPU1_START_ADDR
>  	movt  r0, #:upper16:CPU1_START_ADDR
> +#endif

If you do that, then it effectively means you don't need these instructions
and you might as well just delete them... but looking at the following one:

>  	ldr	r1, [r0]

it's clear that you do need it.  So you need to find a different solution.
If the above assembly file can only run on ARMv7, consider putting

	.march	armv7

or similar before it.

[PATCH] arm: socfpga: fix build break for allyesconfig

[dinguyen at altera.com]

From: Dinh Nguyen <dinguyen@altera.com>

Add check for armv7 in headsmp.S.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
---
 arch/arm/mach-socfpga/headsmp.S |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-socfpga/headsmp.S b/arch/arm/mach-socfpga/headsmp.S
index 17d6eaf..9031a3c 100644
--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -15,8 +15,10 @@
 #define CPU1_START_ADDR 	        0xffd08010
 
 ENTRY(secondary_trampoline)
+#if __LINUX_ARM_ARCH__ >= 7
 	movw	r0, #:lower16:CPU1_START_ADDR
 	movt  r0, #:upper16:CPU1_START_ADDR
+#endif
 
 	ldr	r1, [r0]
 	bx	r1
-- 
1.7.9.5

[PATCH] arm: socfpga: fix build break for allyesconfig

[Pavel Machek]

Hi!

> > index 17d6eaf..9031a3c 100644
> > --- a/arch/arm/mach-socfpga/headsmp.S
> > +++ b/arch/arm/mach-socfpga/headsmp.S
> > @@ -15,8 +15,10 @@
> >  #define CPU1_START_ADDR 	        0xffd08010
> >  
> >  ENTRY(secondary_trampoline)
> > +#if __LINUX_ARM_ARCH__ >= 7
> >  	movw	r0, #:lower16:CPU1_START_ADDR
> >  	movt  r0, #:upper16:CPU1_START_ADDR
> > +#endif
> 
> If you do that, then it effectively means you don't need these instructions
> and you might as well just delete them... but looking at the following one:
> 
> >  	ldr	r1, [r0]
> 
> it's clear that you do need it.  So you need to find a different solution.
> If the above assembly file can only run on ARMv7, consider putting
> 
> 	.march	armv7
> 
> or similar before it.

My version of gas does not seem to recognize .march

(  AS      arch/arm/mach-socfpga/headsmp.o
arch/arm/mach-socfpga/headsmp.S: Assembler messages:
arch/arm/mach-socfpga/headsmp.S:17: Error: unknown pseudo-op: `.march'
arch/arm/mach-socfpga/headsmp.S:24: Error: selected processor does not
support `movw r0,#:lower16:(0xffd08000+0x10)'
arch/arm/mach-socfpga/headsmp.S:25: Error: selected processor does not
support `movt r0,#:upper16:(0xffd08000+0x10)'
)

This seems to do the trick:

Fix compilation with CPU_V6 option.

Signed-off-by: Pavel Machek <pavel@denx.de>

diff --git a/arch/arm/mach-socfpga/Makefile b/arch/arm/mach-socfpga/Makefile
index a0fc372..6956e93 100644
--- a/arch/arm/mach-socfpga/Makefile
+++ b/arch/arm/mach-socfpga/Makefile
@@ -4,3 +4,5 @@
 
 obj-y			:= socfpga.o
 obj-$(CONFIG_SMP)	+= headsmp.o platsmp.o hotplug.o
+
+AFLAGS_headsmp.o	:= -Wa,-march=armv7-a

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[PATCH] arm: socfpga: fix build break for allyesconfig

[Russell King - ARM Linux]

On Sat, Oct 27, 2012 at 12:36:54AM +0200, Pavel Machek wrote:
> Hi!
> 
> > > index 17d6eaf..9031a3c 100644
> > > --- a/arch/arm/mach-socfpga/headsmp.S
> > > +++ b/arch/arm/mach-socfpga/headsmp.S
> > > @@ -15,8 +15,10 @@
> > >  #define CPU1_START_ADDR 	        0xffd08010
> > >  
> > >  ENTRY(secondary_trampoline)
> > > +#if __LINUX_ARM_ARCH__ >= 7
> > >  	movw	r0, #:lower16:CPU1_START_ADDR
> > >  	movt  r0, #:upper16:CPU1_START_ADDR
> > > +#endif
> > 
> > If you do that, then it effectively means you don't need these instructions
> > and you might as well just delete them... but looking at the following one:
> > 
> > >  	ldr	r1, [r0]
> > 
> > it's clear that you do need it.  So you need to find a different solution.
> > If the above assembly file can only run on ARMv7, consider putting
> > 
> > 	.march	armv7
> > 
> > or similar before it.
> 
> My version of gas does not seem to recognize .march

Ah, that's because it's .arch not .march.  Please could you check with
.arch instead.  If proven successful we should move the existing
AFLAGS_xxx.o Makefile stuff into the assembly files concerned.

[PATCH] arm: socfpga: fix build break for allyesconfig

[Pavel Machek]

Hi!

> > > If the above assembly file can only run on ARMv7, consider putting
> > > 
> > > 	.march	armv7
> > > 
> > > or similar before it.
> > 
> > My version of gas does not seem to recognize .march
> 
> Ah, that's because it's .arch not .march.  Please could you check with
> .arch instead.  If proven successful we should move the existing
> AFLAGS_xxx.o Makefile stuff into the assembly files concerned.

        .arch  armv7

results in

arch/arm/mach-socfpga/headsmp.S:21: Error: attempt to use an ARM
instruction on a Thumb-only processor -- `movw
r0,#:lower16:(0xffd08000+0x10)'
...

Using .arch armv7-a indeed works and is a very nice solution.

Signed-off-by: Pavel Machek <pavel@denx.de>

--- a/arch/arm/mach-socfpga/headsmp.S
+++ b/arch/arm/mach-socfpga/headsmp.S
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 
 	__INIT
+	.arch	armv7-a
 
 #define HPS_SYSMGR_ADDRESS	0xffd08000
 #define CONFIG_SYSTEM_MANAGER	HPS_SYSMGR_ADDRESS


-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[PATCH] arm: socfpga: fix build break for allyesconfig

[Arnd Bergmann]

On Friday 26 October 2012, Pavel Machek wrote:
> arch/arm/mach-socfpga/headsmp.S:21: Error: attempt to use an ARM
> instruction on a Thumb-only processor -- `movw
> r0,#:lower16:(0xffd08000+0x10)'
> ...
> 
> Using .arch armv7-a indeed works and is a very nice solution.
> 
> Signed-off-by: Pavel Machek <pavel@denx.de>
> 
> --- a/arch/arm/mach-socfpga/headsmp.S
> +++ b/arch/arm/mach-socfpga/headsmp.S
> @@ -11,6 +11,7 @@
>  #include <linux/init.h>
>  
>         __INIT
> +       .arch   armv7-a
>  
>  #define HPS_SYSMGR_ADDRESS     0xffd08000
>  #define CONFIG_SYSTEM_MANAGER  HPS_SYSMGR_ADDRESS
> 

Thanks, applied with new commit message.

	Arnd

[PATCH] arm: socfpga: fix build break for allyesconfig

[Pavel Machek]

On Sat 2012-10-27 10:43:40, Arnd Bergmann wrote:
> On Friday 26 October 2012, Pavel Machek wrote:
> > arch/arm/mach-socfpga/headsmp.S:21: Error: attempt to use an ARM
> > instruction on a Thumb-only processor -- `movw
> > r0,#:lower16:(0xffd08000+0x10)'
> > ...
> > 
> > Using .arch armv7-a indeed works and is a very nice solution.
> > 
> > Signed-off-by: Pavel Machek <pavel@denx.de>
> > 
> > --- a/arch/arm/mach-socfpga/headsmp.S
> > +++ b/arch/arm/mach-socfpga/headsmp.S
> > @@ -11,6 +11,7 @@
> >  #include <linux/init.h>
> >  
> >         __INIT
> > +       .arch   armv7-a
> >  
> >  #define HPS_SYSMGR_ADDRESS     0xffd08000
> >  #define CONFIG_SYSTEM_MANAGER  HPS_SYSMGR_ADDRESS
> > 
> 
> Thanks, applied with new commit message.

Thanks!
									Pavel

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html