1 files changed, 66 insertions, 66 deletions

diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index bde6dc4e2614..fae774651374 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/linkage.h>
 #include <linux/unistd.h>
+#include <linux/threads.h>
 #include <asm/blackfin.h>
 #include <asm/errno.h>
 #include <asm/fixed_code.h>
@@ -75,11 +76,11 @@ ENTRY(_ex_workaround_261)
          * handle it.
          */
         P4 = R7;        /* Store EXCAUSE */
-        p5.l = _last_cplb_fault_retx;
-        p5.h = _last_cplb_fault_retx;
-        r7 = [p5];
+
+        GET_PDA(p5, r7);
+        r7 = [p5 + PDA_LFRETX];
         r6 = retx;
-        [p5] = r6;
+        [p5 + PDA_LFRETX] = r6;
         cc = r6 == r7;
         if !cc jump _bfin_return_from_exception;
         /* fall through */
@@ -111,24 +112,21 @@ ENTRY(_ex_dcplb_viol)
 ENTRY(_ex_dcplb_miss)
 ENTRY(_ex_icplb_miss)
         (R7:6,P5:4) = [sp++];
-        ASTAT = [sp++];
-        SAVE_ALL_SYS
-#ifdef CONFIG_MPU
+        /* We leave the previously pushed ASTAT on the stack.  */
+        SAVE_CONTEXT_CPLB
+
         /* We must load R1 here, _before_ DEBUG_HWTRACE_SAVE, since that
          * will change the stack pointer.  */
         R0 = SEQSTAT;
         R1 = SP;
-#endif
+
         DEBUG_HWTRACE_SAVE(p5, r7)
-#ifdef CONFIG_MPU
+
         sp += -12;
         call _cplb_hdr;
         sp += 12;
         CC = R0 == 0;
         IF !CC JUMP _handle_bad_cplb;
-#else
-        call __cplb_hdr;
-#endif
 
 #ifdef CONFIG_DEBUG_DOUBLEFAULT
         /* While we were processing this, did we double fault? */
@@ -142,7 +140,8 @@ ENTRY(_ex_icplb_miss)
 #endif
 
         DEBUG_HWTRACE_RESTORE(p5, r7)
-        RESTORE_ALL_SYS
+        RESTORE_CONTEXT_CPLB
+        ASTAT = [SP++];
         SP = EX_SCRATCH_REG;
         rtx;
 ENDPROC(_ex_icplb_miss)
@@ -297,9 +296,8 @@ ENTRY(_handle_bad_cplb)
          * the stack to get ready so, we can fall through - we
          * need to make a CPLB exception look like a normal exception
          */
-
-        RESTORE_ALL_SYS
-        [--sp] = ASTAT;
+        RESTORE_CONTEXT_CPLB
+        /* ASTAT is still on the stack, where it is needed.  */
         [--sp] = (R7:6,P5:4);
 
 ENTRY(_ex_replaceable)
@@ -324,7 +322,9 @@ ENTRY(_ex_trap_c)
         [p4] = p5;
         csync;
 
+        GET_PDA(p5, r6);
 #ifndef CONFIG_DEBUG_DOUBLEFAULT
+
         /*
          * Save these registers, as they are only valid in exception context
          *  (where we are now - as soon as we defer to IRQ5, they can change)
@@ -335,29 +335,25 @@ ENTRY(_ex_trap_c)
         p4.l = lo(DCPLB_FAULT_ADDR);
         p4.h = hi(DCPLB_FAULT_ADDR);
         r7 = [p4];
-        p5.h = _saved_dcplb_fault_addr;
-        p5.l = _saved_dcplb_fault_addr;
-        [p5] = r7;
+        [p5 + PDA_DCPLB] = r7;
 
-        r7 = [p4 + (ICPLB_FAULT_ADDR - DCPLB_FAULT_ADDR)];
-        p5.h = _saved_icplb_fault_addr;
-        p5.l = _saved_icplb_fault_addr;
-        [p5] = r7;
+        p4.l = lo(ICPLB_FAULT_ADDR);
+        p4.h = hi(ICPLB_FAULT_ADDR);
+        r6 = [p4];
+        [p5 + PDA_ICPLB] = r6;
 
         r6 = retx;
-        p4.l = _saved_retx;
-        p4.h = _saved_retx;
-        [p4] = r6;
+        [p5 + PDA_RETX] = r6;
 #endif
         r6 = SYSCFG;
-        [p4 + 4] = r6;
+        [p5 + PDA_SYSCFG] = r6;
         BITCLR(r6, 0);
         SYSCFG = r6;
 
         /* Disable all interrupts, but make sure level 5 is enabled so
          * we can switch to that level.  Save the old mask.  */
         cli r6;
-        [p4 + 8] = r6;
+        [p5 + PDA_EXIMASK] = r6;
 
         p4.l = lo(SAFE_USER_INSTRUCTION);
         p4.h = hi(SAFE_USER_INSTRUCTION);
@@ -371,9 +367,10 @@ ENTRY(_ex_trap_c)
 ENDPROC(_ex_trap_c)
 
 /* We just realized we got an exception, while we were processing a different
- * exception. This is a unrecoverable event, so crash
+ * exception. This is a unrecoverable event, so crash.
+ * Note: this cannot be ENTRY() as we jump here with "if cc jump" ...
  */
-ENTRY(_double_fault)
+_double_fault:
         /* Turn caches & protection off, to ensure we don't get any more
          * double exceptions
          */
@@ -424,17 +421,16 @@ ENDPROC(_double_fault)
 ENTRY(_exception_to_level5)
         SAVE_ALL_SYS
 
-        p4.l = _saved_retx;
-        p4.h = _saved_retx;
-        r6 = [p4];
+        GET_PDA(p4, r7);        /* Fetch current PDA */
+        r6 = [p4 + PDA_RETX];
         [sp + PT_PC] = r6;
 
-        r6 = [p4 + 4];
+        r6 = [p4 + PDA_SYSCFG];
         [sp + PT_SYSCFG] = r6;
 
         /* Restore interrupt mask.  We haven't pushed RETI, so this
          * doesn't enable interrupts until we return from this handler.  */
-        r6 = [p4 + 8];
+        r6 = [p4 + PDA_EXIMASK];
         sti r6;
 
         /* Restore the hardware error vector.  */
@@ -478,8 +474,8 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
          * scratch register (for want of a better option).
          */
         EX_SCRATCH_REG = sp;
-        sp.l = _exception_stack_top;
-        sp.h = _exception_stack_top;
+        GET_PDA_SAFE(sp);
+        sp = [sp + PDA_EXSTACK]
         /* Try to deal with syscalls quickly.  */
         [--sp] = ASTAT;
         [--sp] = (R7:6,P5:4);
@@ -501,27 +497,22 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
          * but they are not very interesting, so don't save them
          */
 
+        GET_PDA(p5, r7);
         p4.l = lo(DCPLB_FAULT_ADDR);
         p4.h = hi(DCPLB_FAULT_ADDR);
         r7 = [p4];
-        p5.h = _saved_dcplb_fault_addr;
-        p5.l = _saved_dcplb_fault_addr;
-        [p5] = r7;
+        [p5 + PDA_DCPLB] = r7;
 
-        r7 = [p4 + (ICPLB_FAULT_ADDR - DCPLB_FAULT_ADDR)];
-        p5.h = _saved_icplb_fault_addr;
-        p5.l = _saved_icplb_fault_addr;
-        [p5] = r7;
+        p4.l = lo(ICPLB_FAULT_ADDR);
+        p4.h = hi(ICPLB_FAULT_ADDR);
+        r7 = [p4];
+        [p5 + PDA_ICPLB] = r7;
 
-        p4.l = _saved_retx;
-        p4.h = _saved_retx;
         r6 = retx;
-        [p4] = r6;
+        [p5 + PDA_RETX] = r6;
 
         r7 = SEQSTAT;           /* reason code is in bit 5:0 */
-        p4.l = _saved_seqstat;
-        p4.h = _saved_seqstat;
-        [p4] = r7;
+        [p5 + PDA_SEQSTAT] = r7;
 #else
         r7 = SEQSTAT;           /* reason code is in bit 5:0 */
 #endif
@@ -546,11 +537,11 @@ ENTRY(_kernel_execve)
         p0 = sp;
         r3 = SIZEOF_PTREGS / 4;
         r4 = 0(x);
-0:
+.Lclear_regs:
         [p0++] = r4;
         r3 += -1;
         cc = r3 == 0;
-        if !cc jump 0b (bp);
+        if !cc jump .Lclear_regs (bp);
 
         p0 = sp;
         sp += -16;
@@ -558,7 +549,7 @@ ENTRY(_kernel_execve)
         call _do_execve;
         SP += 16;
         cc = r0 == 0;
-        if ! cc jump 1f;
+        if ! cc jump .Lexecve_failed;
         /* Success.  Copy our temporary pt_regs to the top of the kernel
          * stack and do a normal exception return.
          */
@@ -574,12 +565,12 @@ ENTRY(_kernel_execve)
         p0 = fp;
         r4 = [p0--];
         r3 = SIZEOF_PTREGS / 4;
-0:
+.Lcopy_regs:
         r4 = [p0--];
         [p1--] = r4;
         r3 += -1;
         cc = r3 == 0;
-        if ! cc jump 0b (bp);
+        if ! cc jump .Lcopy_regs (bp);
 
         r0 = (KERNEL_STACK_SIZE - SIZEOF_PTREGS) (z);
         p1 = r0;
@@ -591,7 +582,7 @@ ENTRY(_kernel_execve)
 
         RESTORE_CONTEXT;
         rti;
-1:
+.Lexecve_failed:
         unlink;
         rts;
 ENDPROC(_kernel_execve)
@@ -925,9 +916,14 @@ _schedule_and_signal_from_int:
         p1 = rets;
         [sp + PT_RESERVED] = p1;
 
-        p0.l = _irq_flags;
-        p0.h = _irq_flags;
+#ifdef CONFIG_SMP
+        GET_PDA(p0, r0);        /* Fetch current PDA (can't migrate to other CPU here) */
+        r0 = [p0 + PDA_IRQFLAGS];
+#else
+        p0.l = _bfin_irq_flags;
+        p0.h = _bfin_irq_flags;
         r0 = [p0];
+#endif
         sti r0;
 
         r0 = sp;
@@ -1539,14 +1535,18 @@ ENTRY(_sys_call_table)
         .endr
 END(_sys_call_table)
 
-_exception_stack:
-        .rept 1024
-        .long 0;
+#ifdef CONFIG_EXCEPTION_L1_SCRATCH
+/* .section .l1.bss.scratch */
+.set _exception_stack_top, L1_SCRATCH_START + L1_SCRATCH_LENGTH
+#else
+#ifdef CONFIG_SYSCALL_TAB_L1
+.section .l1.bss
+#else
+.bss
+#endif
+ENTRY(_exception_stack)
+        .rept 1024 * NR_CPUS
+        .long 0
         .endr
 _exception_stack_top:
-
-#if ANOMALY_05000261
-/* Used by the assembly entry point to work around an anomaly.  */
-_last_cplb_fault_retx:
-        .long 0;
 #endif