[PATCH 1/2] mips: .../swab.h: fix a compiling failure

[PATCH 1/2] mips: .../swab.h: fix a compiling failure

[chenj]

It was introduced in commit
"mips: use wsbh/dsbh/dshd on Loongson3A"
(http://patchwork.linux-mips.org/patch/7542/)

Signed-off-by: Jie Chen <chenj@lemote.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 arch/mips/include/uapi/asm/swab.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/uapi/asm/swab.h b/arch/mips/include/uapi/asm/swab.h
index 20b884a..8f2d184 100644
--- a/arch/mips/include/uapi/asm/swab.h
+++ b/arch/mips/include/uapi/asm/swab.h
@@ -55,8 +55,8 @@ static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
 	__asm__(
 	"	.set	push			\n"
 	"	.set	arch=mips64r2		\n"
-	"	dsbh	%0, %1\n"
-	"	dshd	%0, %0"
+	"	dsbh	%0, %1			\n"
+	"	dshd	%0, %0			\n"
 	"	.set	pop			\n"
 	: "=r" (x)
 	: "r" (x));
-- 
1.9.0

[PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[chenj]

commit "mips: use wsbh/dsbh/dshd on Loongson 3A"
(http://patchwork.linux-mips.org/patch/7542/) forgot to define this
switch, hence the optimized path in arch/mips/include/uapi/asm/swab.h
is not enabled on Loongson3.

Signed-off-by: Jie Chen <chenj@lemote.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 arch/mips/loongson/Platform | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/mips/loongson/Platform b/arch/mips/loongson/Platform
index 0ac20eb..5f527d1 100644
--- a/arch/mips/loongson/Platform
+++ b/arch/mips/loongson/Platform
@@ -22,6 +22,9 @@ ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS
   endif
 endif
 
+# Define _MIPS_ARCH_LOONGSON3A for Loongson3
+cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A
+
 #
 # Loongson Machines' Support
 #
-- 
1.9.0

Re: [PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[James Hogan]

Hi,

On 20/08/14 04:14, chenj wrote:
> diff --git a/arch/mips/loongson/Platform b/arch/mips/loongson/Platform
> index 0ac20eb..5f527d1 100644
> --- a/arch/mips/loongson/Platform
> +++ b/arch/mips/loongson/Platform
> @@ -22,6 +22,9 @@ ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS
>    endif
>  endif
>  
> +# Define _MIPS_ARCH_LOONGSON3A for Loongson3
> +cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A

Any reason not to just refer directly to CONFIG_CPU_LOONGSON3 from the
source rather than adding an intermediate definition?

Cheers
James

Re: [PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[James Hogan]

Hi,

On 20/08/14 04:14, chenj wrote:
> diff --git a/arch/mips/loongson/Platform b/arch/mips/loongson/Platform
> index 0ac20eb..5f527d1 100644
> --- a/arch/mips/loongson/Platform
> +++ b/arch/mips/loongson/Platform
> @@ -22,6 +22,9 @@ ifdef CONFIG_CPU_LOONGSON2F_WORKAROUNDS
>    endif
>  endif
>  
> +# Define _MIPS_ARCH_LOONGSON3A for Loongson3
> +cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A

Any reason not to just refer directly to CONFIG_CPU_LOONGSON3 from the
source rather than adding an intermediate definition?

Cheers
James

Re: [PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[Ralf Baechle]

On Wed, Aug 20, 2014 at 11:14:48AM +0800, chenj wrote:

> +cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A

The _MIPS_ARCH_* namespace belongs to GCC.  While it seems current GCC
does not define this symbol _MIPS_ARCH_LOONGSON3A runs into the danger
of causing a conflict when GCC eventually will define the symbol.

  Ralf

Re: [PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[Chen Jie]

2014-08-20 18:53 GMT+08:00 Ralf Baechle <ralf@linux-mips.org>:
> On Wed, Aug 20, 2014 at 11:14:48AM +0800, chenj wrote:
>
>> +cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A
>
> The _MIPS_ARCH_* namespace belongs to GCC.  While it seems current GCC
> does not define this symbol _MIPS_ARCH_LOONGSON3A runs into the danger
> of causing a conflict when GCC eventually will define the symbol.
When this symbol will be defined? With option '-march=loongson3a'?

Re: [PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[Ralf Baechle]

On Wed, Aug 20, 2014 at 07:59:41PM +0800, Chen Jie wrote:

> 2014-08-20 18:53 GMT+08:00 Ralf Baechle <ralf@linux-mips.org>:
> > On Wed, Aug 20, 2014 at 11:14:48AM +0800, chenj wrote:
> >
> >> +cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A
> >
> > The _MIPS_ARCH_* namespace belongs to GCC.  While it seems current GCC
> > does not define this symbol _MIPS_ARCH_LOONGSON3A runs into the danger
> > of causing a conflict when GCC eventually will define the symbol.
> When this symbol will be defined? With option '-march=loongson3a'?

Well, not currently (at least not in my gcc 4.9.0) - but it might.  In
fact, I'm wondering why it doesn't.  Maciej?

  Ralf

Re: [PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[Maciej W. Rozycki]

On Mon, 25 Aug 2014, Ralf Baechle wrote:

> > >> +cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A
> > >
> > > The _MIPS_ARCH_* namespace belongs to GCC.  While it seems current GCC
> > > does not define this symbol _MIPS_ARCH_LOONGSON3A runs into the danger
> > > of causing a conflict when GCC eventually will define the symbol.
> > When this symbol will be defined? With option '-march=loongson3a'?
> 
> Well, not currently (at least not in my gcc 4.9.0) - but it might.  In
> fact, I'm wondering why it doesn't.  Maciej?

 No idea, a _MIPS_ARCH_foo macro gets defined automagically by GCC 
whenever `-march=foo' is in effect (be it implicitly or with the use of a 
command-line option), so there should be one.

 Has support for "loongson3a" been present in 4.9.x (it is in trunk)?  If 
so, then what _MIPS_ARCH_* macro gets defined for `-march=loongson3a'?

  Maciej

Re: [PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[Ralf Baechle]

On Mon, Aug 25, 2014 at 08:35:17PM +0100, Maciej W. Rozycki wrote:

> On Mon, 25 Aug 2014, Ralf Baechle wrote:
> 
> > > >> +cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A
> > > >
> > > > The _MIPS_ARCH_* namespace belongs to GCC.  While it seems current GCC
> > > > does not define this symbol _MIPS_ARCH_LOONGSON3A runs into the danger
> > > > of causing a conflict when GCC eventually will define the symbol.
> > > When this symbol will be defined? With option '-march=loongson3a'?
> > 
> > Well, not currently (at least not in my gcc 4.9.0) - but it might.  In
> > fact, I'm wondering why it doesn't.  Maciej?
> 
>  No idea, a _MIPS_ARCH_foo macro gets defined automagically by GCC 
> whenever `-march=foo' is in effect (be it implicitly or with the use of a 
> command-line option), so there should be one.
> 
>  Has support for "loongson3a" been present in 4.9.x (it is in trunk)?  If 
> so, then what _MIPS_ARCH_* macro gets defined for `-march=loongson3a'?

Hmm - I must have fatfingered something.  Now I'm getting:

$ mips-linux-gcc < /dev/null -E -C -dM -march=loongson3a - | grep _MIPS_ARCH
#define _MIPS_ARCH_LOONGSON3A 1
#define _MIPS_ARCH "loongson3a"
$

So that would conflict with a manual definition, thus the patch would not
be acceptable as it because:

$ cat > c.c << EOF
foo(){}
EOF
$ mips-linux-gcc -D_MIPS_ARCH_LOONGSON3A -march=loongson3a -Wall -c c.c 
c.c:1:1: warning: return type defaults to ‘int’ [-Wreturn-type]
 foo(){}
 ^
c.c: In function ‘foo’:
c.c:1:1: warning: control reaches end of non-void function [-Wreturn-type]
 foo(){}
 ^
$

  Ralf

Re: [PATCH] mips: define _MIPS_ARCH_LOONGSON3A for Loongson3

[Chen Jie]

Hi Ralf,

2014-08-26 3:41 GMT+08:00 Ralf Baechle <ralf@linux-mips.org>:
> On Mon, Aug 25, 2014 at 08:35:17PM +0100, Maciej W. Rozycki wrote:
>
>> On Mon, 25 Aug 2014, Ralf Baechle wrote:
>>
>> > > >> +cflags-$(CONFIG_CPU_LOONGSON3)  += -D_MIPS_ARCH_LOONGSON3A
>> > > >
>> > > > The _MIPS_ARCH_* namespace belongs to GCC.  While it seems current GCC
>> > > > does not define this symbol _MIPS_ARCH_LOONGSON3A runs into the danger
>> > > > of causing a conflict when GCC eventually will define the symbol.
>> > > When this symbol will be defined? With option '-march=loongson3a'?
>> >
>> > Well, not currently (at least not in my gcc 4.9.0) - but it might.  In
>> > fact, I'm wondering why it doesn't.  Maciej?
>>
>>  No idea, a _MIPS_ARCH_foo macro gets defined automagically by GCC
>> whenever `-march=foo' is in effect (be it implicitly or with the use of a
>> command-line option), so there should be one.
>>
>>  Has support for "loongson3a" been present in 4.9.x (it is in trunk)?  If
>> so, then what _MIPS_ARCH_* macro gets defined for `-march=loongson3a'?
>
> Hmm - I must have fatfingered something.  Now I'm getting:
>
> $ mips-linux-gcc < /dev/null -E -C -dM -march=loongson3a - | grep _MIPS_ARCH
> #define _MIPS_ARCH_LOONGSON3A 1
> #define _MIPS_ARCH "loongson3a"
> $
>
> So that would conflict with a manual definition, thus the patch would not
> be acceptable as it because:
>
> $ cat > c.c << EOF
> foo(){}
> EOF
> $ mips-linux-gcc -D_MIPS_ARCH_LOONGSON3A -march=loongson3a -Wall -c c.c
> c.c:1:1: warning: return type defaults to ‘int’ [-Wreturn-type]
>  foo(){}
>  ^
> c.c: In function ‘foo’:
> c.c:1:1: warning: control reaches end of non-void function [-Wreturn-type]
>  foo(){}
>  ^
> $
Thanks for the explanation. We will enable "-march=loongson3a" and do
some test internally to make sure doing so wouldn't cause any
problems.

To James:
> Any reason not to just refer directly to CONFIG_CPU_LOONGSON3 from the
> source rather than adding an intermediate definition?
>
> Cheers
> James

I guess it's because "arch/mips/include/uapi/asm/swab.h" is in "uapi/"
directory(http://lwn.net/Articles/507794/), that means it contains
"user-space API-related definitions", hence using CONFIG_CPU_LOONGSON3
is not suitable there.

Re: [PATCH 1/2] mips: .../swab.h: fix a compiling failure

[Ralf Baechle]

On Wed, Aug 20, 2014 at 11:14:47AM +0800, chenj wrote:

> It was introduced in commit
> "mips: use wsbh/dsbh/dshd on Loongson3A"
> (http://patchwork.linux-mips.org/patch/7542/)

Thanks, folded into the original patch.

  Ralf