linux-next: build warning after merge of the arm tree

linux-next: build warning after merge of the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

Hi Russell,

After merging the arm tree, today's linux-next build (arm defconfig)
produced this warning:

arch/arm/vfp/vfpmodule.c: In function 'vfp_init':
arch/arm/vfp/vfpmodule.c:725:6: warning: unused variable 'mvfr0' [-Wunused-variable]
  u32 mvfr0;
      ^

Introduced by commit 3f4c9f8f0a20 ("ARM: 8197/1: vfp: Fix VFPv3 hwcap
detection on CPUID based cpus").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build warning after merge of the arm tree

[Stephen Boyd]

On 11/18/2014 12:25 AM, Stephen Rothwell wrote:
> Hi Russell,
>
> After merging the arm tree, today's linux-next build (arm defconfig)
> produced this warning:
>
> arch/arm/vfp/vfpmodule.c: In function 'vfp_init':
> arch/arm/vfp/vfpmodule.c:725:6: warning: unused variable 'mvfr0' [-Wunused-variable]
>   u32 mvfr0;
>       ^
>
> Introduced by commit 3f4c9f8f0a20 ("ARM: 8197/1: vfp: Fix VFPv3 hwcap
> detection on CPUID based cpus").
>

Urgh, I thought I fixed that but I guess I only took care of not
assigning it unless we actually need it. Well we can do the #ifdef
thing, or move to IS_ENABLED. Here's both options.

---8<----

diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 5002d002f6e3..216cd78f64aa 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -752,30 +752,30 @@ static int __init vfp_init(void)
 		 * precision floating point operations. Only check
 		 * for NEON if the hardware has the MVFR registers.
 		 */
-#ifdef CONFIG_NEON
-		if ((fmrx(MVFR1) & 0x000fff00) == 0x00011100)
+		if (IS_ENABLED(CONFIG_NEON) &&
+		   (fmrx(MVFR1) & 0x000fff00) == 0x00011100)
 			elf_hwcap |= HWCAP_NEON;
-#endif
-#ifdef CONFIG_VFPv3
-		mvfr0 = fmrx(MVFR0);
-		if (((mvfr0 & MVFR0_DP_MASK) >> MVFR0_DP_BIT) == 0x2 ||
-		    ((mvfr0 & MVFR0_SP_MASK) >> MVFR0_SP_BIT) == 0x2) {
-			elf_hwcap |= HWCAP_VFPv3;
-			/*
-			 * Check for VFPv3 D16 and VFPv4 D16.  CPUs in
-			 * this configuration only have 16 x 64bit
-			 * registers.
-			 */
-			if ((mvfr0 & MVFR0_A_SIMD_MASK) == 1)
-				/* also v4-D16 */
-				elf_hwcap |= HWCAP_VFPv3D16;
-			else
-				elf_hwcap |= HWCAP_VFPD32;
-		}
 
-		if ((fmrx(MVFR1) & 0xf0000000) == 0x10000000)
-			elf_hwcap |= HWCAP_VFPv4;
-#endif
+		if (IS_ENABLED(CONFIG_VFPv3)) {
+			mvfr0 = fmrx(MVFR0);
+			if (((mvfr0 & MVFR0_DP_MASK) >> MVFR0_DP_BIT) == 0x2 ||
+			    ((mvfr0 & MVFR0_SP_MASK) >> MVFR0_SP_BIT) == 0x2) {
+				elf_hwcap |= HWCAP_VFPv3;
+				/*
+				 * Check for VFPv3 D16 and VFPv4 D16.  CPUs in
+				 * this configuration only have 16 x 64bit
+				 * registers.
+				 */
+				if ((mvfr0 & MVFR0_A_SIMD_MASK) == 1)
+					/* also v4-D16 */
+					elf_hwcap |= HWCAP_VFPv3D16;
+				else
+					elf_hwcap |= HWCAP_VFPD32;
+			}
+
+			if ((fmrx(MVFR1) & 0xf0000000) == 0x10000000)
+				elf_hwcap |= HWCAP_VFPv4;
+		}
 	/* Extract the architecture version on pre-cpuid scheme */
 	} else {
 		if (vfpsid & FPSID_NODOUBLE) {



or

---8<----

diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 5002d002f6e3..19a9338117bd 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -722,7 +722,9 @@ static int __init vfp_init(void)
 {
 	unsigned int vfpsid;
 	unsigned int cpu_arch = cpu_architecture();
+#ifdef CONFIG_VFPv3
 	u32 mvfr0;
+#endif
 
 	if (cpu_arch >= CPU_ARCH_ARMv6)
 		on_each_cpu(vfp_enable, NULL, 1);

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: linux-next: build warning after merge of the arm tree

[Russell King - ARM Linux]

On Tue, Nov 18, 2014 at 10:57:26AM -0800, Stephen Boyd wrote:
> Urgh, I thought I fixed that but I guess I only took care of not
> assigning it unless we actually need it. Well we can do the #ifdef
> thing, or move to IS_ENABLED. Here's both options.

I'd prefer the first as it increases compiler coverage.

Thanks.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.

Re: linux-next: build warning after merge of the arm tree

[Stephen Boyd]

On 11/18/2014 11:21 AM, Russell King - ARM Linux wrote:
> On Tue, Nov 18, 2014 at 10:57:26AM -0800, Stephen Boyd wrote:
>> Urgh, I thought I fixed that but I guess I only took care of not
>> assigning it unless we actually need it. Well we can do the #ifdef
>> thing, or move to IS_ENABLED. Here's both options.
> I'd prefer the first as it increases compiler coverage.
>
> Thanks.
>

Ok I'll ship it into your patch system in a little bit with some real
commit text.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

linux-next: build warning after merge of the arm tree

[Stephen Rothwell]

Hi Russell,

After merging the arm tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:

arch/arm/vfp/vfphw.S: Assembler messages:
arch/arm/vfp/vfphw.S:158: Warning: conditional infixes are deprecated in unified syntax
arch/arm/vfp/vfphw.S:233: Warning: conditional infixes are deprecated in unified syntax
arch/arm/kernel/entry-common.S: Assembler messages:
arch/arm/kernel/entry-common.S:285: Warning: conditional infixes are deprecated in unified syntax
arch/arm/kernel/entry-common.S:286: Warning: conditional infixes are deprecated in unified syntax
arch/arm/kernel/entry-common.S:365: Warning: conditional infixes are deprecated in unified syntax

And many more similar.

Presumably introduced by commit

  cabcafe5d1a5 ("ARM: 8723/1: always assume the "unified" syntax for assembly code")

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build warning after merge of the arm tree

[Russell King]

On Wed, Nov 29, 2017 at 10:16:37AM +1100, Stephen Rothwell wrote:
> Hi Russell,
> 
> After merging the arm tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
> 
> arch/arm/vfp/vfphw.S: Assembler messages:
> arch/arm/vfp/vfphw.S:158: Warning: conditional infixes are deprecated in unified syntax
> arch/arm/vfp/vfphw.S:233: Warning: conditional infixes are deprecated in unified syntax
> arch/arm/kernel/entry-common.S: Assembler messages:
> arch/arm/kernel/entry-common.S:285: Warning: conditional infixes are deprecated in unified syntax
> arch/arm/kernel/entry-common.S:286: Warning: conditional infixes are deprecated in unified syntax
> arch/arm/kernel/entry-common.S:365: Warning: conditional infixes are deprecated in unified syntax
> 
> And many more similar.
> 
> Presumably introduced by commit
> 
>   cabcafe5d1a5 ("ARM: 8723/1: always assume the "unified" syntax for assembly code")

Nicolas, was your patch tested?  Is this another binutils weirdness?

Stephen, which binutils version are you using?

Thanks.

-- 
Russell King
ARM architecture Linux Kernel maintainer

Re: linux-next: build warning after merge of the arm tree

[Stephen Rothwell]

Hi Russell,

On Tue, 28 Nov 2017 23:19:59 +0000 Russell King <rmk@armlinux.org.uk> wrote:
>
> Stephen, which binutils version are you using?

GNU ld (GNU Binutils) 2.25.2

built from upstream source some time ago.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build warning after merge of the arm tree

[Russell King]

On Wed, Nov 29, 2017 at 10:38:05AM +1100, Stephen Rothwell wrote:
> Hi Russell,
> 
> On Tue, 28 Nov 2017 23:19:59 +0000 Russell King <rmk@armlinux.org.uk> wrote:
> >
> > Stephen, which binutils version are you using?
> 
> GNU ld (GNU Binutils) 2.25.2
> 
> built from upstream source some time ago.

Hmm, so slightly younger than mine (2.25) which also generates the
warnings.

-- 
Russell King
ARM architecture Linux Kernel maintainer

Re: linux-next: build warning after merge of the arm tree

[Nicolas Pitre]

On Tue, 28 Nov 2017, Russell King wrote:

> On Wed, Nov 29, 2017 at 10:38:05AM +1100, Stephen Rothwell wrote:
> > Hi Russell,
> > 
> > On Tue, 28 Nov 2017 23:19:59 +0000 Russell King <rmk@armlinux.org.uk> wrote:
> > >
> > > Stephen, which binutils version are you using?
> > 
> > GNU ld (GNU Binutils) 2.25.2
> > 
> > built from upstream source some time ago.
> 
> Hmm, so slightly younger than mine (2.25) which also generates the
> warnings.

Well... somehow I failed to notice those warning when I initially tested 
the patch. Sorry about that.

Now that I do see those warnings, that patch just needs the following to 
"fix" them the way they just like we already do for a Thumb2 build:

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 80351e505f..e83f5161fd 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -115,9 +115,11 @@ ifeq ($(CONFIG_ARM_UNWIND),y)
 CFLAGS_ABI	+=-funwind-tables
 endif
 
+# Accept old syntax despite ".syntax unified"
+AFLAGS_NOWARN	:=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
+
 ifeq ($(CONFIG_THUMB2_KERNEL),y)
 AFLAGS_AUTOIT	:=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it)
-AFLAGS_NOWARN	:=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
 CFLAGS_ISA	:=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)
 AFLAGS_ISA	:=$(CFLAGS_ISA) -Wa$(comma)-mthumb
 # Work around buggy relocation from gas if requested:
@@ -125,7 +127,7 @@ ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)
 KBUILD_CFLAGS_MODULE	+=-fno-optimize-sibling-calls
 endif
 else
-CFLAGS_ISA	:=$(call cc-option,-marm,)
+CFLAGS_ISA	:=$(call cc-option,-marm,) $(AFLAGS_NOWARN)
 AFLAGS_ISA	:=$(CFLAGS_ISA)
 endif
 

New patch submitted.


Nicolas

Re: linux-next: build warning after merge of the arm tree

[Russell King]

On Wed, Nov 29, 2017 at 10:16:37AM +1100, Stephen Rothwell wrote:
> Hi Russell,
> 
> After merging the arm tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
> 
> arch/arm/vfp/vfphw.S: Assembler messages:
> arch/arm/vfp/vfphw.S:158: Warning: conditional infixes are deprecated in unified syntax
> arch/arm/vfp/vfphw.S:233: Warning: conditional infixes are deprecated in unified syntax
> arch/arm/kernel/entry-common.S: Assembler messages:
> arch/arm/kernel/entry-common.S:285: Warning: conditional infixes are deprecated in unified syntax
> arch/arm/kernel/entry-common.S:286: Warning: conditional infixes are deprecated in unified syntax
> arch/arm/kernel/entry-common.S:365: Warning: conditional infixes are deprecated in unified syntax
> 
> And many more similar.
> 
> Presumably introduced by commit
> 
>   cabcafe5d1a5 ("ARM: 8723/1: always assume the "unified" syntax for assembly code")

Well, I seem to be missing all results from the various kernel build
systems, so I've no idea what's going on with those - although kernelci
has sent me boot results with no build results... our test systems
seem to be unreliable.

Dropping Nicolas' commit, there's obviously something wrong with it
somewhere.  Nicolas, can you reproduce these problems?

-- 
Russell King
ARM architecture Linux Kernel maintainer

Re: linux-next: build warning after merge of the arm tree

[Nicolas Pitre]

On Tue, 28 Nov 2017, Russell King wrote:

> On Wed, Nov 29, 2017 at 10:16:37AM +1100, Stephen Rothwell wrote:
> > Hi Russell,
> > 
> > After merging the arm tree, today's linux-next build (arm
> > multi_v7_defconfig) produced this warning:
> > 
> > arch/arm/vfp/vfphw.S: Assembler messages:
> > arch/arm/vfp/vfphw.S:158: Warning: conditional infixes are deprecated in unified syntax
> > arch/arm/vfp/vfphw.S:233: Warning: conditional infixes are deprecated in unified syntax
> > arch/arm/kernel/entry-common.S: Assembler messages:
> > arch/arm/kernel/entry-common.S:285: Warning: conditional infixes are deprecated in unified syntax
> > arch/arm/kernel/entry-common.S:286: Warning: conditional infixes are deprecated in unified syntax
> > arch/arm/kernel/entry-common.S:365: Warning: conditional infixes are deprecated in unified syntax
> > 
> > And many more similar.
> > 
> > Presumably introduced by commit
> > 
> >   cabcafe5d1a5 ("ARM: 8723/1: always assume the "unified" syntax for assembly code")
> 
> Well, I seem to be missing all results from the various kernel build
> systems, so I've no idea what's going on with those - although kernelci
> has sent me boot results with no build results... our test systems
> seem to be unreliable.
> 
> Dropping Nicolas' commit, there's obviously something wrong with it
> somewhere.  Nicolas, can you reproduce these problems?

I'll investigate right away.


Nicolas

linux-next: build warning after merge of the arm tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 927 bytes --]

Hi Russell,

After merging the arm tree, today's linux-next build (arm
multi_v7_defconfig) produced this warning:

In file included from /scratch/sfr/next/arch/arm/include/asm/page.h:163:0,
                 from /scratch/sfr/next/include/linux/mmzone.h:20,
                 from /scratch/sfr/next/include/linux/gfp.h:5,
                 from /scratch/sfr/next/include/linux/kmod.h:22,
                 from /scratch/sfr/next/include/linux/module.h:13,
                 from /scratch/sfr/next/init/version.c:10:
/scratch/sfr/next/arch/arm/include/asm/memory.h:297:0: warning: "virt_to_pfn" redefined [enabled by default]
/scratch/sfr/next/arch/arm/include/asm/memory.h:194:0: note: this is the location of the previous definition

Lots of these ...

Introduced by commit e2b5c192c4a6 ("ARM: 8011/1: ARM hibernation /
suspend-to-disk").

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build warning after merge of the arm tree

[Sebastian Capella]

Hi Stephen,

I'm not sure if this is helpful, but the virt_to_pfn macro added in
arch/arm/include/asm/memory.h:300 (I assume the 297 warning in yours),
in the hibernation patch:

#define virt_to_pfn(kaddr)      (__pa(kaddr) >> PAGE_SHIFT)

Should be removed as there is an improved version of virt_to_pfn for
arm in this commit: e26a9e00afc482b971afcaef1db8c9034d4d6d7c

Thanks,

Sebastian

Re: linux-next: build warning after merge of the arm tree

[Russell King - ARM Linux]

On Tue, Apr 22, 2014 at 10:32:23AM +1000, Stephen Rothwell wrote:
> Hi Russell,
> 
> After merging the arm tree, today's linux-next build (arm
> multi_v7_defconfig) produced this warning:
> 
> In file included from /scratch/sfr/next/arch/arm/include/asm/page.h:163:0,
>                  from /scratch/sfr/next/include/linux/mmzone.h:20,
>                  from /scratch/sfr/next/include/linux/gfp.h:5,
>                  from /scratch/sfr/next/include/linux/kmod.h:22,
>                  from /scratch/sfr/next/include/linux/module.h:13,
>                  from /scratch/sfr/next/init/version.c:10:
> /scratch/sfr/next/arch/arm/include/asm/memory.h:297:0: warning: "virt_to_pfn" redefined [enabled by default]
> /scratch/sfr/next/arch/arm/include/asm/memory.h:194:0: note: this is the location of the previous definition
> 
> Lots of these ...
> 
> Introduced by commit e2b5c192c4a6 ("ARM: 8011/1: ARM hibernation /
> suspend-to-disk").

Yes, it's a conflict between that patch and one I pushed during the
merge window.  I've asked the Sebastian to validate with his version of
virt_to_pfn() removed, and I'm waiting for the results of that...
That's partly happened, but I'm waiting for the final results.

-- 
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.

Re: linux-next: build warning after merge of the arm tree

[Sebastian Capella]

Hi Stephen, Russell,

Verified, thanks!  Please let me know if anything is needed from me for this.

Thanks!

Sebastian