lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0522/1039] MIPS: fix local_{add,sub}_return on MIPS64
    Date
    From: Huang Pei <huangpei@loongson.cn>

    [ Upstream commit 277c8cb3e8ac199f075bf9576ad286687ed17173 ]

    Use "daddu/dsubu" for long int on MIPS64 instead of "addu/subu"

    Fixes: 7232311ef14c ("local_t: mips extension")
    Signed-off-by: Huang Pei <huangpei@loongson.cn>
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/mips/include/asm/local.h | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
    index ecda7295ddcd1..3fa6340903882 100644
    --- a/arch/mips/include/asm/local.h
    +++ b/arch/mips/include/asm/local.h
    @@ -5,6 +5,7 @@
    #include <linux/percpu.h>
    #include <linux/bitops.h>
    #include <linux/atomic.h>
    +#include <asm/asm.h>
    #include <asm/cmpxchg.h>
    #include <asm/compiler.h>
    #include <asm/war.h>
    @@ -39,7 +40,7 @@ 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"
    + __stringify(LONG_ADDU) " %0, %1, %3 \n"
    __SC "%0, %2 \n"
    " beqzl %0, 1b \n"
    " addu %0, %1, %3 \n"
    @@ -55,7 +56,7 @@ 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"
    + __stringify(LONG_ADDU) " %0, %1, %3 \n"
    __SC "%0, %2 \n"
    " beqz %0, 1b \n"
    " addu %0, %1, %3 \n"
    @@ -88,7 +89,7 @@ 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"
    + __stringify(LONG_SUBU) " %0, %1, %3 \n"
    __SC "%0, %2 \n"
    " beqzl %0, 1b \n"
    " subu %0, %1, %3 \n"
    @@ -104,7 +105,7 @@ 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"
    + __stringify(LONG_SUBU) " %0, %1, %3 \n"
    __SC "%0, %2 \n"
    " beqz %0, 1b \n"
    " subu %0, %1, %3 \n"
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:10    [W:3.492 / U:0.768 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site