lkml.org 
[lkml]   [2021]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.13 188/189] MIPS: set mips32r5 for virt extensions
    Date
    From: Nick Desaulniers <ndesaulniers@google.com>

    [ Upstream commit c994a3ec7ecc8bd2a837b2061e8a76eb8efc082b ]

    Clang's integrated assembler only accepts these instructions when the
    cpu is set to mips32r5. With this change, we can assemble
    malta_defconfig with Clang via `make LLVM_IAS=1`.

    Link: https://github.com/ClangBuiltLinux/linux/issues/763
    Reported-by: Dmitry Golovin <dima@golovin.in>
    Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/mips/include/asm/mipsregs.h | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
    index 9c8099a6ffed..acdf8c69220b 100644
    --- a/arch/mips/include/asm/mipsregs.h
    +++ b/arch/mips/include/asm/mipsregs.h
    @@ -2077,7 +2077,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c)
    ({ int __res; \
    __asm__ __volatile__( \
    ".set\tpush\n\t" \
    - ".set\tmips32r2\n\t" \
    + ".set\tmips32r5\n\t" \
    _ASM_SET_VIRT \
    "mfgc0\t%0, " #source ", %1\n\t" \
    ".set\tpop" \
    @@ -2090,7 +2090,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c)
    ({ unsigned long long __res; \
    __asm__ __volatile__( \
    ".set\tpush\n\t" \
    - ".set\tmips64r2\n\t" \
    + ".set\tmips64r5\n\t" \
    _ASM_SET_VIRT \
    "dmfgc0\t%0, " #source ", %1\n\t" \
    ".set\tpop" \
    @@ -2103,7 +2103,7 @@ _ASM_MACRO_0(tlbginvf, _ASM_INSN_IF_MIPS(0x4200000c)
    do { \
    __asm__ __volatile__( \
    ".set\tpush\n\t" \
    - ".set\tmips32r2\n\t" \
    + ".set\tmips32r5\n\t" \
    _ASM_SET_VIRT \
    "mtgc0\t%z0, " #register ", %1\n\t" \
    ".set\tpop" \
    @@ -2115,7 +2115,7 @@ do { \
    do { \
    __asm__ __volatile__( \
    ".set\tpush\n\t" \
    - ".set\tmips64r2\n\t" \
    + ".set\tmips64r5\n\t" \
    _ASM_SET_VIRT \
    "dmtgc0\t%z0, " #register ", %1\n\t" \
    ".set\tpop" \
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-07-06 13:36    [W:4.022 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site