Merge branches 'fiq' (early part), 'fixes', 'l2c' (early part) and 'misc' into for...

[deliverable/linux.git] / arch / arm / kernel / entry-header.S

diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index 2fdf8679b46e19d1d9e9b0b9c3d196b7c0edbccb..4176df721bf09bace95bad96d1c194e5b6b7a038 100644 (file)
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -37,11 +37,19 @@
 #endif
        .endm
 
-       .macro  alignment_trap, rtemp, label
 #ifdef CONFIG_ALIGNMENT_TRAP
-       ldr     \rtemp, \label
-       ldr     \rtemp, [\rtemp]
-       mcr     p15, 0, \rtemp, c1, c0
+#define ATRAP(x...) x
+#else
+#define ATRAP(x...)
+#endif
+
+       .macro  alignment_trap, rtmp1, rtmp2, label
+#ifdef CONFIG_ALIGNMENT_TRAP
+       mrc     p15, 0, \rtmp2, c1, c0, 0
+       ldr     \rtmp1, \label
+       ldr     \rtmp1, [\rtmp1]
+       teq     \rtmp1, \rtmp2
+       mcrne   p15, 0, \rtmp1, c1, c0, 0
 #endif
        .endm
 
@@ -216,6 +224,34 @@
        ldmia   sp, {r0 - pc}^                  @ load r0 - pc, cpsr
        .endm
 
+       @
+       @ svc_exit_via_fiq - like svc_exit but switches to FIQ mode before exit
+       @
+       @ This macro acts in a similar manner to svc_exit but switches to FIQ
+       @ mode to restore the final part of the register state.
+       @
+       @ We cannot use the normal svc_exit procedure because that would
+       @ clobber spsr_svc (FIQ could be delivered during the first few
+       @ instructions of vector_swi meaning its contents have not been
+       @ saved anywhere).
+       @
+       @ Note that, unlike svc_exit, this macro also does not allow a caller
+       @ supplied rpsr. This is because the FIQ exceptions are not re-entrant
+       @ and the handlers cannot call into the scheduler (meaning the value
+       @ on the stack remains correct).
+       @
+       .macro  svc_exit_via_fiq
+       mov     r0, sp
+       ldmib   r0, {r1 - r14}  @ abort is deadly from here onward (it will
+                               @ clobber state restored below)
+       msr     cpsr_c, #FIQ_MODE | PSR_I_BIT | PSR_F_BIT
+       add     r8, r0, #S_PC
+       ldr     r9, [r0, #S_PSR]
+       msr     spsr_cxsf, r9
+       ldr     r0, [r0, #S_R0]
+       ldmia   r8, {pc}^
+       .endm
+
        .macro  restore_user_regs, fast = 0, offset = 0
        ldr     r1, [sp, #\offset + S_PSR]      @ get calling cpsr
        ldr     lr, [sp, #\offset + S_PC]!      @ get pc
@@ -267,6 +303,25 @@
        rfeia   sp!
        .endm
 
+       @
+       @ svc_exit_via_fiq - like svc_exit but switches to FIQ mode before exit
+       @
+       @ For full details see non-Thumb implementation above.
+       @
+       .macro  svc_exit_via_fiq
+       add     r0, sp, #S_R2
+       ldr     lr, [sp, #S_LR]
+       ldr     sp, [sp, #S_SP] @ abort is deadly from here onward (it will
+                               @ clobber state restored below)
+       ldmia   r0, {r2 - r12}
+       mov     r1, #FIQ_MODE | PSR_I_BIT | PSR_F_BIT
+       msr     cpsr_c, r1
+       sub     r0, #S_R2
+       add     r8, r0, #S_PC
+       ldmia   r0, {r0 - r1}
+       rfeia   r8
+       .endm
+
 #ifdef CONFIG_CPU_V7M
        /*
         * Note we don't need to do clrex here as clearing the local monitor is