MIPS: uaccess: emulate Ingenic LXW/LXH/LXHU uaccess

The LXW, LXH, LXHU opcodes are part of the MXU ASE found in Ingenic
XBurst based SoCs.

While technically part of the MXU ASE, they do not touch any of the SIMD
registers, and can be used even when the MXU ASE is disabled.

This patch makes it possible to emulate unaligned access for those
instructions.

Signed-off-by: Siarhei Volkau <lis8215@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/include/uapi/asm/inst.h b/arch/mips/include/uapi/asm/inst.h
index 43d1faa02933c8428eb9f2c48c6cb62d28ffeb68..c29dbc8c1d491e96b7a95525bf50b8df1b03712a 100644 (file)
--- a/arch/mips/include/uapi/asm/inst.h
+++ b/arch/mips/include/uapi/asm/inst.h
@@ -272,6 +272,27 @@ enum lx_func {
        lbx_op  = 0x16,
 };
 
+/*
+ * func field for special2 MXU opcodes (Ingenic XBurst MXU).
+ */
+enum mxu_func {
+       /* TODO, other MXU funcs */
+       mxu_lx_op = 0x28,
+};
+
+/*
+ * op field for special2 MXU LX opcodes (Ingenic XBurst MXU).
+ */
+enum lx_ingenic_func {
+       mxu_lxb_op,
+       mxu_lxh_op,
+       /* reserved */
+       mxu_lxw_op = 3,
+       mxu_lxbu_op,
+       mxu_lxhu_op,
+       /* more reserved */
+};
+
 /*
  * BSHFL opcodes
  */
@@ -774,6 +795,17 @@ struct dsp_format {                /* SPEC3 DSP format instructions */
        ;))))))
 };
 
+struct mxu_lx_format {         /* SPEC2 MXU LX format instructions */
+       __BITFIELD_FIELD(unsigned int opcode : 6,
+       __BITFIELD_FIELD(unsigned int rs : 5,
+       __BITFIELD_FIELD(unsigned int rt : 5,
+       __BITFIELD_FIELD(unsigned int rd : 5,
+       __BITFIELD_FIELD(unsigned int strd : 2,
+       __BITFIELD_FIELD(unsigned int op : 3,
+       __BITFIELD_FIELD(unsigned int func : 6,
+       ;)))))))
+};
+
 struct spec3_format {   /* SPEC3 */
        __BITFIELD_FIELD(unsigned int opcode:6,
        __BITFIELD_FIELD(unsigned int rs:5,
@@ -1125,6 +1157,7 @@ union mips_instruction {
        struct loongson3_lswc2_format loongson3_lswc2_format;
        struct loongson3_lsdc2_format loongson3_lsdc2_format;
        struct loongson3_lscsr_format loongson3_lscsr_format;
+       struct mxu_lx_format mxu_lx_format;
 };
 
 union mips16e_instruction {

diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 7b5aba5df02ebdbe3e946dc7cfbacd3a0478f96f..f4cf94e92ec3ab64d2fd6af48cefddec7547d5d3 100644 (file)
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -160,6 +160,47 @@ static void emulate_load_store_insn(struct pt_regs *regs,
                 * The remaining opcodes are the ones that are really of
                 * interest.
                 */
+#ifdef CONFIG_MACH_INGENIC
+       case spec2_op:
+               if (insn.mxu_lx_format.func != mxu_lx_op)
+                       goto sigbus; /* other MXU instructions we don't care */
+
+               switch (insn.mxu_lx_format.op) {
+               case mxu_lxw_op:
+                       if (user && !access_ok(addr, 4))
+                               goto sigbus;
+                       LoadW(addr, value, res);
+                       if (res)
+                               goto fault;
+                       compute_return_epc(regs);
+                       regs->regs[insn.mxu_lx_format.rd] = value;
+                       break;
+               case mxu_lxh_op:
+                       if (user && !access_ok(addr, 2))
+                               goto sigbus;
+                       LoadHW(addr, value, res);
+                       if (res)
+                               goto fault;
+                       compute_return_epc(regs);
+                       regs->regs[insn.dsp_format.rd] = value;
+                       break;
+               case mxu_lxhu_op:
+                       if (user && !access_ok(addr, 2))
+                               goto sigbus;
+                       LoadHWU(addr, value, res);
+                       if (res)
+                               goto fault;
+                       compute_return_epc(regs);
+                       regs->regs[insn.dsp_format.rd] = value;
+                       break;
+               case mxu_lxb_op:
+               case mxu_lxbu_op:
+                       goto sigbus;
+               default:
+                       goto sigill;
+               }
+               break;
+#endif
        case spec3_op:
                if (insn.dsp_format.func == lx_op) {
                        switch (insn.dsp_format.op) {