SAMSUNG: serial: modify name from s5pc1xx to s5p

[karo-tx-uboot.git] / cpu / blackfin / traps.c

diff --git a/cpu/blackfin/traps.c b/cpu/blackfin/traps.c
index a2c6f1eceba894ceadf218ef299ae76440a0a282..caaea94106a556d2095a85847967743a3eabfd19 100644 (file)
--- a/cpu/blackfin/traps.c
+++ b/cpu/blackfin/traps.c
@@ -18,6 +18,7 @@
  */
 
 #include <common.h>
+#include <kgdb.h>
 #include <linux/types.h>
 #include <asm/traps.h>
 #include <asm/cplb.h>
@@ -25,6 +26,7 @@
 #include <asm/mach-common/bits/core.h>
 #include <asm/mach-common/bits/mpu.h>
 #include <asm/mach-common/bits/trace.h>
+#include <asm/deferred.h>
 #include "cpu.h"
 
 #define trace_buffer_save(x) \
@@ -69,8 +71,16 @@ const struct memory_map const bfin_memory_map[] = {
        }
 };
 
-void trap_c(struct pt_regs *regs)
+#ifdef CONFIG_EXCEPTION_DEFER
+unsigned int deferred_regs[deferred_regs_last];
+#endif
+
+/*
+ * Handle all exceptions while running in EVT3 or EVT5
+ */
+int trap_c(struct pt_regs *regs, uint32_t level)
 {
+       uint32_t ret = 0;
        uint32_t trapnr = (regs->seqstat & EXCAUSE);
        bool data = false;
 
@@ -87,7 +97,7 @@ void trap_c(struct pt_regs *regs)
                         */
                        if (last_cplb_fault_retx != regs->retx) {
                                last_cplb_fault_retx = regs->retx;
-                               return;
+                               return ret;
                        }
                }
 
@@ -100,6 +110,20 @@ void trap_c(struct pt_regs *regs)
                uint32_t new_cplb_addr = 0, new_cplb_data = 0;
                static size_t last_evicted;
                size_t i;
+               unsigned long tflags;
+
+#ifdef CONFIG_EXCEPTION_DEFER
+               /* This should never happen */
+               if (level == 5)
+                       bfin_panic(regs);
+#endif
+
+               /*
+                * Keep the trace buffer so that a miss here points people
+                * to the right place (their code).  Crashes here rarely
+                * happen.  If they do, only the Blackfin maintainer cares.
+                */
+               trace_buffer_save(tflags);
 
                new_cplb_addr = (data ? bfin_read_DCPLB_FAULT_ADDR() : bfin_read_ICPLB_FAULT_ADDR()) & ~(4 * 1024 * 1024 - 1);
 
@@ -156,13 +180,43 @@ void trap_c(struct pt_regs *regs)
                for (i = 0; i < 16; ++i)
                        debug("%2i 0x%p 0x%08X\n", i, *CPLB_ADDR++, *CPLB_DATA++);
 
+               trace_buffer_restore(tflags);
                break;
        }
-
+#ifdef CONFIG_CMD_KGDB
+       /* Single step
+        * if we are in IRQ5, just ignore, otherwise defer, and handle it in kgdb
+        */
+       case VEC_STEP:
+               if (level == 3) {
+                       /* If we just returned from an interrupt, the single step
+                        * event is for the RTI instruction.
+                        */
+                       if (regs->retx == regs->pc)
+                               break;
+                       /* we just return if we are single stepping through IRQ5 */
+                       if (regs->ipend & 0x20)
+                               break;
+                       /* Otherwise, turn single stepping off & fall through,
+                        * which defers to IRQ5
+                        */
+                       regs->syscfg &= ~1;
+               }
+               /* fall through */
+#endif
        default:
-               /* All traps come here */
+#ifdef CONFIG_CMD_KGDB
+               if (level == 3) {
+                       /* We need to handle this at EVT5, so try again */
+                       ret = 1;
+                       break;
+               }
+               if (debugger_exception_handler && (*debugger_exception_handler)(regs))
+                       return 0;
+#endif
                bfin_panic(regs);
        }
+       return ret;
 }
 
 #ifdef CONFIG_DEBUG_DUMP
@@ -171,38 +225,13 @@ void trap_c(struct pt_regs *regs)
 # define ENABLE_DUMP 0
 #endif
 
-#ifdef CONFIG_DEBUG_DUMP_SYMS
-# define ENABLE_DUMP_SYMS 1
-#else
-# define ENABLE_DUMP_SYMS 0
-#endif
-
-static const char *symbol_lookup(unsigned long addr, unsigned long *caddr)
+#ifndef CONFIG_KALLSYMS
+const char *symbol_lookup(unsigned long addr, unsigned long *caddr)
 {
-       if (!ENABLE_DUMP_SYMS)
-               return NULL;
-
-       extern const char system_map[] __attribute__((__weak__));
-       const char *sym, *csym;
-       char *esym;
-       unsigned long sym_addr;
-
-       sym = system_map;
-       csym = NULL;
-       *caddr = 0;
-
-       while (*sym) {
-               sym_addr = simple_strtoul(sym, &esym, 16);
-               sym = esym + 1;
-               if (sym_addr > addr)
-                       break;
-               *caddr = sym_addr;
-               csym = sym;
-               sym += strlen(sym) + 1;
-       }
-
-       return csym;
+       *caddr = addr;
+       return "N/A";
 }
+#endif
 
 static void decode_address(char *buf, unsigned long address)
 {
@@ -267,8 +296,10 @@ void dump(struct pt_regs *fp)
        if (!ENABLE_DUMP)
                return;
 
-       /* fp->ipend is garbage, so load it ourself */
+#ifndef CONFIG_CMD_KGDB
+       /* fp->ipend is normally garbage, so load it ourself */
        fp->ipend = bfin_read_IPEND();
+#endif
 
        hwerrcause = (fp->seqstat & HWERRCAUSE) >> HWERRCAUSE_P;
        excause = (fp->seqstat & EXCAUSE) >> EXCAUSE_P;