|
@@ -638,3 +638,192 @@ thumb2arm(u16 tinstr)
|
|
*/
|
|
*/
|
|
return 0xe59f0000 |
|
|
return 0xe59f0000 |
|
|
((tinstr & (7<<8)) << (12-8)) | /* Rd */
|
|
((tinstr & (7<<8)) << (12-8)) | /* Rd */
|
|
|
|
+ ((tinstr & 255) << (2-0)); /* immed_8 */
|
|
|
|
+
|
|
|
|
+ /* 6.5.1 Format 4: */
|
|
|
|
+ case 0x9000 >> 11: /* 7.1.54 STR(3) */
|
|
|
|
+ case 0x9800 >> 11: /* 7.1.29 LDR(4) */
|
|
|
|
+ return 0xe58d0000 |
|
|
|
|
+ (L<<20) | /* L==1? */
|
|
|
|
+ ((tinstr & (7<<8)) << (12-8)) | /* Rd */
|
|
|
|
+ ((tinstr & 255) << 2); /* immed_8 */
|
|
|
|
+
|
|
|
|
+ /* 6.6.1 Format 1: */
|
|
|
|
+ case 0xc000 >> 11: /* 7.1.51 STMIA */
|
|
|
|
+ case 0xc800 >> 11: /* 7.1.25 LDMIA */
|
|
|
|
+ {
|
|
|
|
+ u32 Rn = (tinstr & (7<<8)) >> 8;
|
|
|
|
+ u32 W = ((L<<Rn) & (tinstr&255)) ? 0 : 1<<21;
|
|
|
|
+
|
|
|
|
+ return 0xe8800000 | W | (L<<20) | (Rn<<16) |
|
|
|
|
+ (tinstr&255);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /* 6.6.1 Format 2: */
|
|
|
|
+ case 0xb000 >> 11: /* 7.1.48 PUSH */
|
|
|
|
+ case 0xb800 >> 11: /* 7.1.47 POP */
|
|
|
|
+ if ((tinstr & (3 << 9)) == 0x0400) {
|
|
|
|
+ static const u32 subset[4] = {
|
|
|
|
+ 0xe92d0000, /* STMDB sp!,{registers} */
|
|
|
|
+ 0xe92d4000, /* STMDB sp!,{registers,lr} */
|
|
|
|
+ 0xe8bd0000, /* LDMIA sp!,{registers} */
|
|
|
|
+ 0xe8bd8000 /* LDMIA sp!,{registers,pc} */
|
|
|
|
+ };
|
|
|
|
+ return subset[(L<<1) | ((tinstr & (1<<8)) >> 8)] |
|
|
|
|
+ (tinstr & 255); /* register_list */
|
|
|
|
+ }
|
|
|
|
+ /* Else fall through for illegal instruction case */
|
|
|
|
+
|
|
|
|
+ default:
|
|
|
|
+ return BAD_INSTR;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+/*
|
|
|
|
+ * Convert Thumb-2 32 bit LDM, STM, LDRD, STRD to equivalent instruction
|
|
|
|
+ * handlable by ARM alignment handler, also find the corresponding handler,
|
|
|
|
+ * so that we can reuse ARM userland alignment fault fixups for Thumb.
|
|
|
|
+ *
|
|
|
|
+ * @pinstr: original Thumb-2 instruction; returns new handlable instruction
|
|
|
|
+ * @regs: register context.
|
|
|
|
+ * @poffset: return offset from faulted addr for later writeback
|
|
|
|
+ *
|
|
|
|
+ * NOTES:
|
|
|
|
+ * 1. Comments below refer to ARMv7 DDI0406A Thumb Instruction sections.
|
|
|
|
+ * 2. Register name Rt from ARMv7 is same as Rd from ARMv6 (Rd is Rt)
|
|
|
|
+ */
|
|
|
|
+static void *
|
|
|
|
+do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs,
|
|
|
|
+ union offset_union *poffset)
|
|
|
|
+{
|
|
|
|
+ unsigned long instr = *pinstr;
|
|
|
|
+ u16 tinst1 = (instr >> 16) & 0xffff;
|
|
|
|
+ u16 tinst2 = instr & 0xffff;
|
|
|
|
+
|
|
|
|
+ switch (tinst1 & 0xffe0) {
|
|
|
|
+ /* A6.3.5 Load/Store multiple */
|
|
|
|
+ case 0xe880: /* STM/STMIA/STMEA,LDM/LDMIA, PUSH/POP T2 */
|
|
|
|
+ case 0xe8a0: /* ...above writeback version */
|
|
|
|
+ case 0xe900: /* STMDB/STMFD, LDMDB/LDMEA */
|
|
|
|
+ case 0xe920: /* ...above writeback version */
|
|
|
|
+ /* no need offset decision since handler calculates it */
|
|
|
|
+ return do_alignment_ldmstm;
|
|
|
|
+
|
|
|
|
+ case 0xf840: /* POP/PUSH T3 (single register) */
|
|
|
|
+ if (RN_BITS(instr) == 13 && (tinst2 & 0x09ff) == 0x0904) {
|
|
|
|
+ u32 L = !!(LDST_L_BIT(instr));
|
|
|
|
+ const u32 subset[2] = {
|
|
|
|
+ 0xe92d0000, /* STMDB sp!,{registers} */
|
|
|
|
+ 0xe8bd0000, /* LDMIA sp!,{registers} */
|
|
|
|
+ };
|
|
|
|
+ *pinstr = subset[L] | (1<<RD_BITS(instr));
|
|
|
|
+ return do_alignment_ldmstm;
|
|
|
|
+ }
|
|
|
|
+ /* Else fall through for illegal instruction case */
|
|
|
|
+ break;
|
|
|
|
+
|
|
|
|
+ /* A6.3.6 Load/store double, STRD/LDRD(immed, lit, reg) */
|
|
|
|
+ case 0xe860:
|
|
|
|
+ case 0xe960:
|
|
|
|
+ case 0xe8e0:
|
|
|
|
+ case 0xe9e0:
|
|
|
|
+ poffset->un = (tinst2 & 0xff) << 2;
|
|
|
|
+ case 0xe940:
|
|
|
|
+ case 0xe9c0:
|
|
|
|
+ return do_alignment_ldrdstrd;
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * No need to handle load/store instructions up to word size
|
|
|
|
+ * since ARMv6 and later CPUs can perform unaligned accesses.
|
|
|
|
+ */
|
|
|
|
+ default:
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+ return NULL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static int
|
|
|
|
+do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
|
|
|
|
+{
|
|
|
|
+ union offset_union uninitialized_var(offset);
|
|
|
|
+ unsigned long instr = 0, instrptr;
|
|
|
|
+ int (*handler)(unsigned long addr, unsigned long instr, struct pt_regs *regs);
|
|
|
|
+ unsigned int type;
|
|
|
|
+ unsigned int fault;
|
|
|
|
+ u16 tinstr = 0;
|
|
|
|
+ int isize = 4;
|
|
|
|
+ int thumb2_32b = 0;
|
|
|
|
+
|
|
|
|
+ if (interrupts_enabled(regs))
|
|
|
|
+ local_irq_enable();
|
|
|
|
+
|
|
|
|
+ instrptr = instruction_pointer(regs);
|
|
|
|
+
|
|
|
|
+ if (thumb_mode(regs)) {
|
|
|
|
+ u16 *ptr = (u16 *)(instrptr & ~1);
|
|
|
|
+ fault = probe_kernel_address(ptr, tinstr);
|
|
|
|
+ if (!fault) {
|
|
|
|
+ if (cpu_architecture() >= CPU_ARCH_ARMv7 &&
|
|
|
|
+ IS_T32(tinstr)) {
|
|
|
|
+ /* Thumb-2 32-bit */
|
|
|
|
+ u16 tinst2 = 0;
|
|
|
|
+ fault = probe_kernel_address(ptr + 1, tinst2);
|
|
|
|
+ instr = (tinstr << 16) | tinst2;
|
|
|
|
+ thumb2_32b = 1;
|
|
|
|
+ } else {
|
|
|
|
+ isize = 2;
|
|
|
|
+ instr = thumb2arm(tinstr);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ } else
|
|
|
|
+ fault = probe_kernel_address(instrptr, instr);
|
|
|
|
+
|
|
|
|
+ if (fault) {
|
|
|
|
+ type = TYPE_FAULT;
|
|
|
|
+ goto bad_or_fault;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (user_mode(regs))
|
|
|
|
+ goto user;
|
|
|
|
+
|
|
|
|
+ ai_sys += 1;
|
|
|
|
+
|
|
|
|
+ fixup:
|
|
|
|
+
|
|
|
|
+ regs->ARM_pc += isize;
|
|
|
|
+
|
|
|
|
+ switch (CODING_BITS(instr)) {
|
|
|
|
+ case 0x00000000: /* 3.13.4 load/store instruction extensions */
|
|
|
|
+ if (LDSTHD_I_BIT(instr))
|
|
|
|
+ offset.un = (instr & 0xf00) >> 4 | (instr & 15);
|
|
|
|
+ else
|
|
|
|
+ offset.un = regs->uregs[RM_BITS(instr)];
|
|
|
|
+
|
|
|
|
+ if ((instr & 0x000000f0) == 0x000000b0 || /* LDRH, STRH */
|
|
|
|
+ (instr & 0x001000f0) == 0x001000f0) /* LDRSH */
|
|
|
|
+ handler = do_alignment_ldrhstrh;
|
|
|
|
+ else if ((instr & 0x001000f0) == 0x000000d0 || /* LDRD */
|
|
|
|
+ (instr & 0x001000f0) == 0x000000f0) /* STRD */
|
|
|
|
+ handler = do_alignment_ldrdstrd;
|
|
|
|
+ else if ((instr & 0x01f00ff0) == 0x01000090) /* SWP */
|
|
|
|
+ goto swp;
|
|
|
|
+ else
|
|
|
|
+ goto bad;
|
|
|
|
+ break;
|
|
|
|
+
|
|
|
|
+ case 0x04000000: /* ldr or str immediate */
|
|
|
|
+ offset.un = OFFSET_BITS(instr);
|
|
|
|
+ handler = do_alignment_ldrstr;
|
|
|
|
+ break;
|
|
|
|
+
|
|
|
|
+ case 0x06000000: /* ldr or str register */
|
|
|
|
+ offset.un = regs->uregs[RM_BITS(instr)];
|
|
|
|
+
|
|
|
|
+ if (IS_SHIFT(instr)) {
|
|
|
|
+ unsigned int shiftval = SHIFT_BITS(instr);
|
|
|
|
+
|
|
|
|
+ switch(SHIFT_TYPE(instr)) {
|
|
|
|
+ case SHIFT_LSL:
|
|
|
|
+ offset.un <<= shiftval;
|
|
|
|
+ break;
|
|
|
|
+
|