lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16 193/357] MIPS: Fix MFC1 & MFHC1 emulation for 64-bit MIPS systems
    Date
    3.16-stable review patch.  If anyone has any objections, please let me know.

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

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

    commit c8c0da6bdf0f0d6f59fc23aab6ee373a131df82d upstream.

    Commit bbd426f542cb "MIPS: Simplify FP context access" modified the
    SIFROMREG & SIFROMHREG macros such that they return unsigned rather
    than signed 32b integers. I had believed that to be fine, but
    inadvertently missed the MFC1 & MFHC1 cases which write to a struct
    pt_regs regs element. On MIPS32 this is fine, but on 64 bit those
    saved regs' fields are 64 bit wide. Using unsigned values caused the
    32 bit value from the FP register to be zero rather than sign extended
    as the architecture specifies, causing incorrect emulation of the
    MFC1 & MFHc1 instructions. Fix by reintroducing the casts to signed
    integers, and therefore the sign extension.

    Signed-off-by: Paul Burton <paul.burton@imgtec.com>
    Cc: linux-mips@linux-mips.org
    Patchwork: https://patchwork.linux-mips.org/patch/7848/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/math-emu/cp1emu.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/arch/mips/math-emu/cp1emu.c
    +++ b/arch/mips/math-emu/cp1emu.c
    @@ -650,9 +650,9 @@ static inline int cop1_64bit(struct pt_r
    #define SIFROMREG(si, x) \
    do { \
    if (cop1_64bit(xcp)) \
    - (si) = get_fpr32(&ctx->fpr[x], 0); \
    + (si) = (int)get_fpr32(&ctx->fpr[x], 0); \
    else \
    - (si) = get_fpr32(&ctx->fpr[(x) & ~1], (x) & 1); \
    + (si) = (int)get_fpr32(&ctx->fpr[(x) & ~1], (x) & 1); \
    } while (0)

    #define SITOREG(si, x) \
    @@ -667,7 +667,7 @@ do { \
    } \
    } while (0)

    -#define SIFROMHREG(si, x) ((si) = get_fpr32(&ctx->fpr[x], 1))
    +#define SIFROMHREG(si, x) ((si) = (int)get_fpr32(&ctx->fpr[x], 1))

    #define SITOHREG(si, x) \
    do { \



    \
     
     \ /
      Last update: 2014-10-04 03:01    [W:4.191 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site