Blackfin: only handle CPLB protection violations when MPU is enabled

We don't need to handle CPLB protection violations unless we are running
with the MPU on.  Fix the entry code to call common trap_c, and remove the
code which is never run.  This allows the traps test suite to run on older
boards with the MPU disabled.

URL: http://blackfin.uclinux.org/gf/tracker/5129
Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

1 files changed, 7 insertions, 4 deletions

diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index da0558ad1b1..25c6aa42d45 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -42,6 +42,7 @@
 #include <asm/thread_info.h>  /* TIF_NEED_RESCHED */
 #include <asm/asm-offsets.h>
 #include <asm/trace.h>
+#include <asm/traps.h>
 
 #include <asm/context.S>
 
@@ -84,13 +85,15 @@ ENTRY(_ex_workaround_261)
         if !cc jump _bfin_return_from_exception;
         /* fall through */
         R7 = P4;
-        R6 = 0x26;      /* Data CPLB Miss */
+        R6 = VEC_CPLB_M;        /* Data CPLB Miss */
         cc = R6 == R7;
         if cc jump _ex_dcplb_miss (BP);
-        R6 = 0x23;      /* Data CPLB Miss */
+#ifdef CONFIG_MPU
+        R6 = VEC_CPLB_VL;       /* Data CPLB Violation */
         cc = R6 == R7;
         if cc jump _ex_dcplb_viol (BP);
-        /* Handle 0x23 Data CPLB Protection Violation
+#endif
+        /* Handle Data CPLB Protection Violation
          * and Data CPLB Multiple Hits - Linux Trap Zero
          */
         jump _ex_trap_c;
@@ -270,7 +273,7 @@ ENTRY(_bfin_return_from_exception)
         r6.l = lo(SEQSTAT_EXCAUSE);
         r6.h = hi(SEQSTAT_EXCAUSE);
         r7 = r7 & r6;
-        r6 = 0x25;
+        r6 = VEC_UNCOV;
         CC = R7 == R6;
         if CC JUMP _double_fault;
 #endif