Re: [PATCH] MIPS: fix local_t operation on MIPS64

Huang Pei
2021-09-06T14:03:33Z

On Mon, Sep 06, 2021 at 01:08:02PM +0200, Maciej W. Rozycki wrote:
> On Sun, 5 Sep 2021, 黄沛 wrote:
>
> > You mean including  asm/asm.h?
> >
> > or redefine LONG_ADDU as ** "addu " ** in asm/llsc.h?
>
> Use the existing macros, they're there for this purpose and widely used
> throughout the port already.
>
> Maciej

diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
index 3c6db82ee0a6..551d8ba09cd7 100644
--- a/arch/mips/include/asm/local.h
+++ b/arch/mips/include/asm/local.h
@@ -9,6 +9,7 @@
#include <asm/cmpxchg.h>
#include <asm/compiler.h>
#include <asm/war.h>
+#include <asm/asm.h>

typedef struct
{
@@ -40,10 +41,10 @@ static __inline__ long local_add_return(long i, local_t * l)
" .set arch=r4000 \n"
__SYNC(full, loongson3_war) " \n"
"1:" __LL "%1, %2 # local_add_return \n"
- __ADDU "%0, %1, %3 \n"
+ " LONG_ADDU %0, %1, %3 \n"
__SC "%0, %2 \n"
" beqzl %0, 1b \n"
- __ADDU "%0, %1, %3 \n"
+ " LONG_ADDU %0, %1, %3 \n"
" .set pop \n"
: "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
: "Ir" (i), "m" (l->a.counter)
@@ -56,10 +57,10 @@ static __inline__ long local_add_return(long i, local_t * l)
" .set "MIPS_ISA_ARCH_LEVEL" \n"
__SYNC(full, loongson3_war) " \n"
"1:" __LL "%1, %2 # local_add_return \n"
- __ADDU "%0, %1, %3 \n"
+ " LONG_ADDU %0, %1, %3 \n"
__SC "%0, %2 \n"
" beqz %0, 1b \n"
- __ADDU "%0, %1, %3 \n"
+ " LONG_ADDU %0, %1, %3 \n"
" .set pop \n"
: "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
: "Ir" (i), "m" (l->a.counter)
@@ -89,10 +90,10 @@ static __inline__ long local_sub_return(long i, local_t * l)
" .set arch=r4000 \n"
__SYNC(full, loongson3_war) " \n"
"1:" __LL "%1, %2 # local_sub_return \n"
- __SUBU "%0, %1, %3 \n"
+ " LONG_SUBU %0, %1, %3 \n"
__SC "%0, %2 \n"
" beqzl %0, 1b \n"
- __SUBU "%0, %1, %3 \n"
+ " LONG_SUBU %0, %1, %3 \n"
" .set pop \n"
: "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
: "Ir" (i), "m" (l->a.counter)
@@ -105,10 +106,10 @@ static __inline__ long local_sub_return(long i, local_t * l)
" .set "MIPS_ISA_ARCH_LEVEL" \n"
__SYNC(full, loongson3_war) " \n"
"1:" __LL "%1, %2 # local_sub_return \n"
- __SUBU "%0, %1, %3 \n"
+ " LONG_SUBU %0, %1, %3 \n"
__SC "%0, %2 \n"
" beqz %0, 1b \n"
- __SUBU "%0, %1, %3 \n"
+ " LONG_SUBU %0, %1, %3 \n"
" .set pop \n"
: "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
: "Ir" (i), "m" (l->a.counter)

|| make[1]: Entering directory '/home/hp/projects/Linux/temp/out_stable_loongson'
|| GEN Makefile
|| Checking missing-syscalls for N32
|| CALL /home/hp/projects/Linux/temp/linux-stable/scripts/checksyscalls.sh
|| Checking missing-syscalls for O32
|| CALL /home/hp/projects/Linux/temp/linux-stable/scripts/checksyscalls.sh
|| CALL /home/hp/projects/Linux/temp/linux-stable/scripts/checksyscalls.sh
|| CALL /home/hp/projects/Linux/temp/linux-stable/scripts/atomic/check-atomics.sh
|| CC kernel/trace/ring_buffer.o
|| {standard input}: Assembler messages:
{standard input}|11389| Error: unrecognized opcode `long_addu $6,$3,$2'
{standard input}|11392| Error: unrecognized opcode `long_addu $6,$3,$2'
{standard input}|11404| Error: unrecognized opcode `long_addu $5,$7,$2'
{standard input}|11407| Error: unrecognized opcode `long_addu $5,$7,$2'
{standard input}|12354| Error: unrecognized opcode `long_addu $20,$3,$2'
{standard input}|12357| Error: unrecognized opcode `long_addu $20,$3,$2'
/home/hp/projects/Linux/temp/linux-stable/scripts/Makefile.build|279| recipe for target 'kernel/trace/ring_buffer.o' failed
|| make[3]: *** [kernel/trace/ring_buffer.o] Error 1
/home/hp/projects/Linux/temp/linux-stable/scripts/Makefile.build|496| recipe for target 'kernel/trace' failed
|| make[2]: *** [kernel/trace] Error 2
/home/hp/projects/Linux/temp/linux-stable/Makefile|1805| recipe for target 'kernel' failed
|| make[1]: *** [kernel] Error 2
|| make[1]: Leaving directory '/home/hp/projects/Linux/temp/out_stable_loongson'
/home/hp/projects/Linux/temp/linux-stable/Makefile|185| recipe for target '__sub-make' failed
|| make: *** [__sub-make] Error 2

Any better idea?