lkml.org 
[lkml]   [2016]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 128/305] MIPS: fix read_msa_* & write_msa_* functions on non-MSA toolchains
    3.16.37-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Paul Burton <paul.burton@imgtec.com>

    commit 70dff4d90aab40326d1d06a331e2b07eae99d067 upstream.

    Commit d96cc3d1ec5d "MIPS: Add microMIPS MSA support." attempted to use
    the value of a macro within an inline asm statement but instead emitted
    a comment leading to the cfcmsa & ctcmsa instructions being omitted. Fix
    that by passing CFC_MSA_INSN & CTC_MSA_INSN as arguments to the asm
    statements.

    Signed-off-by: Paul Burton <paul.burton@imgtec.com>
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/7305/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/mips/include/asm/msa.h | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/arch/mips/include/asm/msa.h
    +++ b/arch/mips/include/asm/msa.h
    @@ -112,10 +112,10 @@ static inline unsigned int read_msa_##na
    " .set push\n" \
    " .set noat\n" \
    " .insn\n" \
    - " .word #CFC_MSA_INSN | (" #cs " << 11)\n" \
    + " .word %1 | (" #cs " << 11)\n" \
    " move %0, $1\n" \
    " .set pop\n" \
    - : "=r"(reg)); \
    + : "=r"(reg) : "i"(CFC_MSA_INSN)); \
    return reg; \
    } \
    \
    @@ -126,9 +126,9 @@ static inline void write_msa_##name(unsi
    " .set noat\n" \
    " move $1, %0\n" \
    " .insn\n" \
    - " .word #CTC_MSA_INSN | (" #cs " << 6)\n" \
    + " .word %1 | (" #cs " << 6)\n" \
    " .set pop\n" \
    - : : "r"(val)); \
    + : : "r"(val), "i"(CTC_MSA_INSN)); \
    }

    #endif /* !TOOLCHAIN_SUPPORTS_MSA */
    \
     
     \ /
      Last update: 2016-09-17 09:56    [W:2.264 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site