ptrace: unify FDPIC implementations
[safe/jmp/linux-2.6] / arch / blackfin / kernel / traps.c
index 9efac0f..59c1df7 100644 (file)
@@ -1,48 +1,22 @@
 /*
- * File:         arch/blackfin/kernel/traps.c
- * Based on:
- * Author:       Hamish Macdonald
+ * Main exception handling logic.
  *
- * Created:
- * Description:  uses S/W interrupt 15 for the system calls
+ * Copyright 2004-2010 Analog Devices Inc.
  *
- * Modified:
- *               Copyright 2004-2006 Analog Devices Inc.
- *
- * Bugs:         Enter bugs at http://blackfin.uclinux.org/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see the file COPYING, or write
- * to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Licensed under the GPL-2 or later
  */
 
 #include <linux/bug.h>
 #include <linux/uaccess.h>
-#include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/kallsyms.h>
-#include <linux/fs.h>
-#include <linux/rbtree.h>
 #include <asm/traps.h>
-#include <asm/cacheflush.h>
 #include <asm/cplb.h>
-#include <asm/dma.h>
 #include <asm/blackfin.h>
 #include <asm/irq_handler.h>
 #include <linux/irq.h>
 #include <asm/trace.h>
 #include <asm/fixed_code.h>
+#include <asm/pseudo_instructions.h>
 
 #ifdef CONFIG_KGDB
 # include <linux/kgdb.h>
@@ -85,174 +59,20 @@ void __init trap_init(void)
        CSYNC();
 }
 
-static void decode_address(char *buf, unsigned long address)
-{
-#ifdef CONFIG_DEBUG_VERBOSE
-       struct task_struct *p;
-       struct mm_struct *mm;
-       unsigned long flags, offset;
-       unsigned char in_atomic = (bfin_read_IPEND() & 0x10) || in_atomic();
-       struct rb_node *n;
-
-#ifdef CONFIG_KALLSYMS
-       unsigned long symsize;
-       const char *symname;
-       char *modname;
-       char *delim = ":";
-       char namebuf[128];
-
-       /* look up the address and see if we are in kernel space */
-       symname = kallsyms_lookup(address, &symsize, &offset, &modname, namebuf);
-
-       if (symname) {
-               /* yeah! kernel space! */
-               if (!modname)
-                       modname = delim = "";
-               sprintf(buf, "<0x%p> { %s%s%s%s + 0x%lx }",
-                             (void *)address, delim, modname, delim, symname,
-                             (unsigned long)offset);
-               return;
-
-       }
-#endif
-
-       /* Problem in fixed code section? */
-       if (address >= FIXED_CODE_START && address < FIXED_CODE_END) {
-               sprintf(buf, "<0x%p> /* Maybe fixed code section */", (void *)address);
-               return;
-       }
-
-       /* Problem somewhere before the kernel start address */
-       if (address < CONFIG_BOOT_LOAD) {
-               sprintf(buf, "<0x%p> /* Maybe null pointer? */", (void *)address);
-               return;
-       }
-
-       /* looks like we're off in user-land, so let's walk all the
-        * mappings of all our processes and see if we can't be a whee
-        * bit more specific
-        */
-       write_lock_irqsave(&tasklist_lock, flags);
-       for_each_process(p) {
-               mm = (in_atomic ? p->mm : get_task_mm(p));
-               if (!mm)
-                       continue;
-
-               for (n = rb_first(&mm->mm_rb); n; n = rb_next(n)) {
-                       struct vm_area_struct *vma;
-
-                       vma = rb_entry(n, struct vm_area_struct, vm_rb);
-
-                       if (address >= vma->vm_start && address < vma->vm_end) {
-                               char _tmpbuf[256];
-                               char *name = p->comm;
-                               struct file *file = vma->vm_file;
-
-                               if (file) {
-                                       char *d_name = d_path(&file->f_path, _tmpbuf,
-                                                     sizeof(_tmpbuf));
-                                       if (!IS_ERR(d_name))
-                                               name = d_name;
-                               }
-
-                               /* FLAT does not have its text aligned to the start of
-                                * the map while FDPIC ELF does ...
-                                */
-
-                               /* before we can check flat/fdpic, we need to
-                                * make sure current is valid
-                                */
-                               if ((unsigned long)current >= FIXED_CODE_START &&
-                                   !((unsigned long)current & 0x3)) {
-                                       if (current->mm &&
-                                           (address > current->mm->start_code) &&
-                                           (address < current->mm->end_code))
-                                               offset = address - current->mm->start_code;
-                                       else
-                                               offset = (address - vma->vm_start) +
-                                                        (vma->vm_pgoff << PAGE_SHIFT);
-
-                                       sprintf(buf, "<0x%p> [ %s + 0x%lx ]",
-                                               (void *)address, name, offset);
-                               } else
-                                       sprintf(buf, "<0x%p> [ %s vma:0x%lx-0x%lx]",
-                                               (void *)address, name,
-                                               vma->vm_start, vma->vm_end);
-
-                               if (!in_atomic)
-                                       mmput(mm);
-
-                               if (!strlen(buf))
-                                       sprintf(buf, "<0x%p> [ %s ] dynamic memory", (void *)address, name);
-
-                               goto done;
-                       }
-               }
-               if (!in_atomic)
-                       mmput(mm);
-       }
-
-       /* we were unable to find this address anywhere */
-       sprintf(buf, "<0x%p> /* kernel dynamic memory */", (void *)address);
-
-done:
-       write_unlock_irqrestore(&tasklist_lock, flags);
-#else
-       sprintf(buf, " ");
-#endif
-}
-
-asmlinkage void double_fault_c(struct pt_regs *fp)
-{
-#ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
-       int j;
-       trace_buffer_save(j);
-#endif
-
-       console_verbose();
-       oops_in_progress = 1;
-#ifdef CONFIG_DEBUG_VERBOSE
-       printk(KERN_EMERG "Double Fault\n");
-#ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT
-       if (((long)fp->seqstat &  SEQSTAT_EXCAUSE) == VEC_UNCOV) {
-               unsigned int cpu = smp_processor_id();
-               char buf[150];
-               decode_address(buf, cpu_pda[cpu].retx);
-               printk(KERN_EMERG "While handling exception (EXCAUSE = 0x%x) at %s:\n",
-                       (unsigned int)cpu_pda[cpu].seqstat & SEQSTAT_EXCAUSE, buf);
-               decode_address(buf, cpu_pda[cpu].dcplb_fault_addr);
-               printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %s\n", buf);
-               decode_address(buf, cpu_pda[cpu].icplb_fault_addr);
-               printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %s\n", buf);
-
-               decode_address(buf, fp->retx);
-               printk(KERN_NOTICE "The instruction at %s caused a double exception\n", buf);
-       } else
-#endif
-       {
-               dump_bfin_process(fp);
-               dump_bfin_mem(fp);
-               show_regs(fp);
-               dump_bfin_trace_buffer();
-       }
-#endif
-       panic("Double Fault - unrecoverable event");
-
-}
-
 static int kernel_mode_regs(struct pt_regs *regs)
 {
        return regs->ipend & 0xffc0;
 }
 
-asmlinkage void trap_c(struct pt_regs *fp)
+asmlinkage notrace void trap_c(struct pt_regs *fp)
 {
 #ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
        int j;
 #endif
-#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
-       unsigned int cpu = smp_processor_id();
+#ifdef CONFIG_BFIN_PSEUDODBG_INSNS
+       int opcode;
 #endif
+       unsigned int cpu = raw_smp_processor_id();
        const char *strerror = NULL;
        int sig = 0;
        siginfo_t info;
@@ -267,11 +87,6 @@ asmlinkage void trap_c(struct pt_regs *fp)
         * double faults if the stack has become corrupt
         */
 
-#ifndef CONFIG_KGDB
-       /* IPEND is skipped if KGDB isn't enabled (see entry code) */
-       fp->ipend = bfin_read_IPEND();
-#endif
-
        /* trap_c() will be called for exceptions. During exceptions
         * processing, the pc value should be set with retx value.
         * With this change we can cleanup some code in signal.c- TODO
@@ -389,6 +204,19 @@ asmlinkage void trap_c(struct pt_regs *fp)
                        }
                }
 #endif
+#ifdef CONFIG_BFIN_PSEUDODBG_INSNS
+               /*
+                * Support for the fake instructions, if the instruction fails,
+                * then just execute a illegal opcode failure (like normal).
+                * Don't support these instructions inside the kernel
+                */
+               if (!kernel_mode_regs(fp) && get_instruction(&opcode, (unsigned short *)fp->pc)) {
+                       if (execute_pseudodbg_assert(fp, opcode))
+                               goto traps_done;
+                       if (execute_pseudodbg(fp, opcode))
+                               goto traps_done;
+               }
+#endif
                info.si_code = ILL_ILLOPC;
                sig = SIGILL;
                strerror = KERN_NOTICE EXC_0x21(KERN_NOTICE);
@@ -404,7 +232,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
        /* 0x23 - Data CPLB protection violation, handled here */
        case VEC_CPLB_VL:
                info.si_code = ILL_CPLB_VI;
-               sig = SIGBUS;
+               sig = SIGSEGV;
                strerror = KERN_NOTICE EXC_0x23(KERN_NOTICE);
                CHK_DEBUGGER_TRAP_MAYBE();
                break;
@@ -531,6 +359,36 @@ asmlinkage void trap_c(struct pt_regs *fp)
                        break;
                /* External Memory Addressing Error */
                case (SEQSTAT_HWERRCAUSE_EXTERN_ADDR):
+                       if (ANOMALY_05000310) {
+                               static unsigned long anomaly_rets;
+
+                               if ((fp->pc >= (L1_CODE_START + L1_CODE_LENGTH - 512)) &&
+                                   (fp->pc < (L1_CODE_START + L1_CODE_LENGTH))) {
+                                       /*
+                                        * A false hardware error will happen while fetching at
+                                        * the L1 instruction SRAM boundary.  Ignore it.
+                                        */
+                                       anomaly_rets = fp->rets;
+                                       goto traps_done;
+                               } else if (fp->rets == anomaly_rets) {
+                                       /*
+                                        * While boundary code returns to a function, at the ret
+                                        * point, a new false hardware error might occur too based
+                                        * on tests.  Ignore it too.
+                                        */
+                                       goto traps_done;
+                               } else if ((fp->rets >= (L1_CODE_START + L1_CODE_LENGTH - 512)) &&
+                                          (fp->rets < (L1_CODE_START + L1_CODE_LENGTH))) {
+                                       /*
+                                        * If boundary code calls a function, at the entry point,
+                                        * a new false hardware error maybe happen based on tests.
+                                        * Ignore it too.
+                                        */
+                                       goto traps_done;
+                               } else
+                                       anomaly_rets = 0;
+                       }
+
                        info.si_code = BUS_ADRERR;
                        sig = SIGBUS;
                        strerror = KERN_NOTICE HWC_x3(KERN_NOTICE);
@@ -616,664 +474,67 @@ asmlinkage void trap_c(struct pt_regs *fp)
        {
                info.si_signo = sig;
                info.si_errno = 0;
-               info.si_addr = (void __user *)fp->pc;
+               switch (trapnr) {
+               case VEC_CPLB_VL:
+               case VEC_MISALI_D:
+               case VEC_CPLB_M:
+               case VEC_CPLB_MHIT:
+                       info.si_addr = (void __user *)cpu_pda[cpu].dcplb_fault_addr;
+                       break;
+               default:
+                       info.si_addr = (void __user *)fp->pc;
+                       break;
+               }
                force_sig_info(sig, &info, current);
        }
 
        if ((ANOMALY_05000461 && trapnr == VEC_HWERR && !access_ok(VERIFY_READ, fp->pc, 8)) ||
-               (ANOMALY_05000281 && trapnr == VEC_HWERR))
+           (ANOMALY_05000281 && trapnr == VEC_HWERR) ||
+           (ANOMALY_05000189 && (trapnr == VEC_CPLB_I_VL || trapnr == VEC_CPLB_VL)))
                fp->pc = SAFE_USER_INSTRUCTION;
 
  traps_done:
        trace_buffer_restore(j);
 }
 
-/* Typical exception handling routines */
-
-#define EXPAND_LEN ((1 << CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN) * 256 - 1)
-
-/*
- * Similar to get_user, do some address checking, then dereference
- * Return true on sucess, false on bad address
- */
-static bool get_instruction(unsigned short *val, unsigned short *address)
-{
-       unsigned long addr = (unsigned long)address;
-
-       /* Check for odd addresses */
-       if (addr & 0x1)
-               return false;
-
-       /* MMR region will never have instructions */
-       if (addr >= SYSMMR_BASE)
-               return false;
-
-       switch (bfin_mem_access_type(addr, 2)) {
-               case BFIN_MEM_ACCESS_CORE:
-               case BFIN_MEM_ACCESS_CORE_ONLY:
-                       *val = *address;
-                       return true;
-               case BFIN_MEM_ACCESS_DMA:
-                       dma_memcpy(val, address, 2);
-                       return true;
-               case BFIN_MEM_ACCESS_ITEST:
-                       isram_memcpy(val, address, 2);
-                       return true;
-               default: /* invalid access */
-                       return false;
-       }
-}
-
-/*
- * decode the instruction if we are printing out the trace, as it
- * makes things easier to follow, without running it through objdump
- * These are the normal instructions which cause change of flow, which
- * would be at the source of the trace buffer
- */
-#if defined(CONFIG_DEBUG_VERBOSE) && defined(CONFIG_DEBUG_BFIN_HWTRACE_ON)
-static void decode_instruction(unsigned short *address)
-{
-       unsigned short opcode;
-
-       if (get_instruction(&opcode, address)) {
-               if (opcode == 0x0010)
-                       verbose_printk("RTS");
-               else if (opcode == 0x0011)
-                       verbose_printk("RTI");
-               else if (opcode == 0x0012)
-                       verbose_printk("RTX");
-               else if (opcode == 0x0013)
-                       verbose_printk("RTN");
-               else if (opcode == 0x0014)
-                       verbose_printk("RTE");
-               else if (opcode == 0x0025)
-                       verbose_printk("EMUEXCPT");
-               else if (opcode == 0x0040 && opcode <= 0x0047)
-                       verbose_printk("STI R%i", opcode & 7);
-               else if (opcode >= 0x0050 && opcode <= 0x0057)
-                       verbose_printk("JUMP (P%i)", opcode & 7);
-               else if (opcode >= 0x0060 && opcode <= 0x0067)
-                       verbose_printk("CALL (P%i)", opcode & 7);
-               else if (opcode >= 0x0070 && opcode <= 0x0077)
-                       verbose_printk("CALL (PC+P%i)", opcode & 7);
-               else if (opcode >= 0x0080 && opcode <= 0x0087)
-                       verbose_printk("JUMP (PC+P%i)", opcode & 7);
-               else if (opcode >= 0x0090 && opcode <= 0x009F)
-                       verbose_printk("RAISE 0x%x", opcode & 0xF);
-               else if (opcode >= 0x00A0 && opcode <= 0x00AF)
-                       verbose_printk("EXCPT 0x%x", opcode & 0xF);
-               else if ((opcode >= 0x1000 && opcode <= 0x13FF) || (opcode >= 0x1800 && opcode <= 0x1BFF))
-                       verbose_printk("IF !CC JUMP");
-               else if ((opcode >= 0x1400 && opcode <= 0x17ff) || (opcode >= 0x1c00 && opcode <= 0x1fff))
-                       verbose_printk("IF CC JUMP");
-               else if (opcode >= 0x2000 && opcode <= 0x2fff)
-                       verbose_printk("JUMP.S");
-               else if (opcode >= 0xe080 && opcode <= 0xe0ff)
-                       verbose_printk("LSETUP");
-               else if (opcode >= 0xe200 && opcode <= 0xe2ff)
-                       verbose_printk("JUMP.L");
-               else if (opcode >= 0xe300 && opcode <= 0xe3ff)
-                       verbose_printk("CALL pcrel");
-               else
-                       verbose_printk("0x%04x", opcode);
-       }
-
-}
-#endif
-
-void dump_bfin_trace_buffer(void)
-{
-#ifdef CONFIG_DEBUG_VERBOSE
-#ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
-       int tflags, i = 0;
-       char buf[150];
-       unsigned short *addr;
-#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
-       int j, index;
-#endif
-
-       trace_buffer_save(tflags);
-
-       printk(KERN_NOTICE "Hardware Trace:\n");
-
-#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
-       printk(KERN_NOTICE "WARNING: Expanded trace turned on - can not trace exceptions\n");
-#endif
-
-       if (likely(bfin_read_TBUFSTAT() & TBUFCNT)) {
-               for (; bfin_read_TBUFSTAT() & TBUFCNT; i++) {
-                       decode_address(buf, (unsigned long)bfin_read_TBUF());
-                       printk(KERN_NOTICE "%4i Target : %s\n", i, buf);
-                       addr = (unsigned short *)bfin_read_TBUF();
-                       decode_address(buf, (unsigned long)addr);
-                       printk(KERN_NOTICE "     Source : %s ", buf);
-                       decode_instruction(addr);
-                       printk("\n");
-               }
-       }
-
-#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
-       if (trace_buff_offset)
-               index = trace_buff_offset / 4;
-       else
-               index = EXPAND_LEN;
-
-       j = (1 << CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN) * 128;
-       while (j) {
-               decode_address(buf, software_trace_buff[index]);
-               printk(KERN_NOTICE "%4i Target : %s\n", i, buf);
-               index -= 1;
-               if (index < 0 )
-                       index = EXPAND_LEN;
-               decode_address(buf, software_trace_buff[index]);
-               printk(KERN_NOTICE "     Source : %s ", buf);
-               decode_instruction((unsigned short *)software_trace_buff[index]);
-               printk("\n");
-               index -= 1;
-               if (index < 0)
-                       index = EXPAND_LEN;
-               j--;
-               i++;
-       }
-#endif
-
-       trace_buffer_restore(tflags);
-#endif
-#endif
-}
-EXPORT_SYMBOL(dump_bfin_trace_buffer);
-
-#ifdef CONFIG_BUG
-int is_valid_bugaddr(unsigned long addr)
-{
-       unsigned short opcode;
-
-       if (!get_instruction(&opcode, (unsigned short *)addr))
-               return 0;
-
-       return opcode == BFIN_BUG_OPCODE;
-}
-#endif
-
-/*
- * Checks to see if the address pointed to is either a
- * 16-bit CALL instruction, or a 32-bit CALL instruction
- */
-static bool is_bfin_call(unsigned short *addr)
-{
-       unsigned short opcode = 0, *ins_addr;
-       ins_addr = (unsigned short *)addr;
-
-       if (!get_instruction(&opcode, ins_addr))
-               return false;
-
-       if ((opcode >= 0x0060 && opcode <= 0x0067) ||
-           (opcode >= 0x0070 && opcode <= 0x0077))
-               return true;
-
-       ins_addr--;
-       if (!get_instruction(&opcode, ins_addr))
-               return false;
-
-       if (opcode >= 0xE300 && opcode <= 0xE3FF)
-               return true;
-
-       return false;
-
-}
-
-void show_stack(struct task_struct *task, unsigned long *stack)
-{
-#ifdef CONFIG_PRINTK
-       unsigned int *addr, *endstack, *fp = 0, *frame;
-       unsigned short *ins_addr;
-       char buf[150];
-       unsigned int i, j, ret_addr, frame_no = 0;
-
-       /*
-        * If we have been passed a specific stack, use that one otherwise
-        *    if we have been passed a task structure, use that, otherwise
-        *    use the stack of where the variable "stack" exists
-        */
-
-       if (stack == NULL) {
-               if (task) {
-                       /* We know this is a kernel stack, so this is the start/end */
-                       stack = (unsigned long *)task->thread.ksp;
-                       endstack = (unsigned int *)(((unsigned int)(stack) & ~(THREAD_SIZE - 1)) + THREAD_SIZE);
-               } else {
-                       /* print out the existing stack info */
-                       stack = (unsigned long *)&stack;
-                       endstack = (unsigned int *)PAGE_ALIGN((unsigned int)stack);
-               }
-       } else
-               endstack = (unsigned int *)PAGE_ALIGN((unsigned int)stack);
-
-       printk(KERN_NOTICE "Stack info:\n");
-       decode_address(buf, (unsigned int)stack);
-       printk(KERN_NOTICE " SP: [0x%p] %s\n", stack, buf);
-
-       if (!access_ok(VERIFY_READ, stack, (unsigned int)endstack - (unsigned int)stack)) {
-               printk(KERN_NOTICE "Invalid stack pointer\n");
-               return;
-       }
-
-       /* First thing is to look for a frame pointer */
-       for (addr = (unsigned int *)((unsigned int)stack & ~0xF); addr < endstack; addr++) {
-               if (*addr & 0x1)
-                       continue;
-               ins_addr = (unsigned short *)*addr;
-               ins_addr--;
-               if (is_bfin_call(ins_addr))
-                       fp = addr - 1;
-
-               if (fp) {
-                       /* Let's check to see if it is a frame pointer */
-                       while (fp >= (addr - 1) && fp < endstack
-                              && fp && ((unsigned int) fp & 0x3) == 0)
-                               fp = (unsigned int *)*fp;
-                       if (fp == 0 || fp == endstack) {
-                               fp = addr - 1;
-                               break;
-                       }
-                       fp = 0;
-               }
-       }
-       if (fp) {
-               frame = fp;
-               printk(KERN_NOTICE " FP: (0x%p)\n", fp);
-       } else
-               frame = 0;
-
-       /*
-        * Now that we think we know where things are, we
-        * walk the stack again, this time printing things out
-        * incase there is no frame pointer, we still look for
-        * valid return addresses
-        */
-
-       /* First time print out data, next time, print out symbols */
-       for (j = 0; j <= 1; j++) {
-               if (j)
-                       printk(KERN_NOTICE "Return addresses in stack:\n");
-               else
-                       printk(KERN_NOTICE " Memory from 0x%08lx to %p", ((long unsigned int)stack & ~0xF), endstack);
-
-               fp = frame;
-               frame_no = 0;
-
-               for (addr = (unsigned int *)((unsigned int)stack & ~0xF), i = 0;
-                    addr <= endstack; addr++, i++) {
-
-                       ret_addr = 0;
-                       if (!j && i % 8 == 0)
-                               printk(KERN_NOTICE "%p:",addr);
-
-                       /* if it is an odd address, or zero, just skip it */
-                       if (*addr & 0x1 || !*addr)
-                               goto print;
-
-                       ins_addr = (unsigned short *)*addr;
-
-                       /* Go back one instruction, and see if it is a CALL */
-                       ins_addr--;
-                       ret_addr = is_bfin_call(ins_addr);
- print:
-                       if (!j && stack == (unsigned long *)addr)
-                               printk("[%08x]", *addr);
-                       else if (ret_addr)
-                               if (j) {
-                                       decode_address(buf, (unsigned int)*addr);
-                                       if (frame == addr) {
-                                               printk(KERN_NOTICE "   frame %2i : %s\n", frame_no, buf);
-                                               continue;
-                                       }
-                                       printk(KERN_NOTICE "    address : %s\n", buf);
-                               } else
-                                       printk("<%08x>", *addr);
-                       else if (fp == addr) {
-                               if (j)
-                                       frame = addr+1;
-                               else
-                                       printk("(%08x)", *addr);
-
-                               fp = (unsigned int *)*addr;
-                               frame_no++;
-
-                       } else if (!j)
-                               printk(" %08x ", *addr);
-               }
-               if (!j)
-                       printk("\n");
-       }
-#endif
-}
-
-void dump_stack(void)
+asmlinkage void double_fault_c(struct pt_regs *fp)
 {
-       unsigned long stack;
 #ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
-       int tflags;
+       int j;
+       trace_buffer_save(j);
 #endif
-       trace_buffer_save(tflags);
-       dump_bfin_trace_buffer();
-       show_stack(current, &stack);
-       trace_buffer_restore(tflags);
-}
-EXPORT_SYMBOL(dump_stack);
 
-void dump_bfin_process(struct pt_regs *fp)
-{
+       console_verbose();
+       oops_in_progress = 1;
 #ifdef CONFIG_DEBUG_VERBOSE
-       /* We should be able to look at fp->ipend, but we don't push it on the
-        * stack all the time, so do this until we fix that */
-       unsigned int context = bfin_read_IPEND();
-
-       if (oops_in_progress)
-               verbose_printk(KERN_EMERG "Kernel OOPS in progress\n");
-
-       if (context & 0x0020 && (fp->seqstat & SEQSTAT_EXCAUSE) == VEC_HWERR)
-               verbose_printk(KERN_NOTICE "HW Error context\n");
-       else if (context & 0x0020)
-               verbose_printk(KERN_NOTICE "Deferred Exception context\n");
-       else if (context & 0x3FC0)
-               verbose_printk(KERN_NOTICE "Interrupt context\n");
-       else if (context & 0x4000)
-               verbose_printk(KERN_NOTICE "Deferred Interrupt context\n");
-       else if (context & 0x8000)
-               verbose_printk(KERN_NOTICE "Kernel process context\n");
-
-       /* Because we are crashing, and pointers could be bad, we check things
-        * pretty closely before we use them
-        */
-       if ((unsigned long)current >= FIXED_CODE_START &&
-           !((unsigned long)current & 0x3) && current->pid) {
-               verbose_printk(KERN_NOTICE "CURRENT PROCESS:\n");
-               if (current->comm >= (char *)FIXED_CODE_START)
-                       verbose_printk(KERN_NOTICE "COMM=%s PID=%d\n",
-                               current->comm, current->pid);
-               else
-                       verbose_printk(KERN_NOTICE "COMM= invalid\n");
+       printk(KERN_EMERG "Double Fault\n");
+#ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT
+       if (((long)fp->seqstat &  SEQSTAT_EXCAUSE) == VEC_UNCOV) {
+               unsigned int cpu = raw_smp_processor_id();
+               char buf[150];
+               decode_address(buf, cpu_pda[cpu].retx_doublefault);
+               printk(KERN_EMERG "While handling exception (EXCAUSE = 0x%x) at %s:\n",
+                       (unsigned int)cpu_pda[cpu].seqstat_doublefault & SEQSTAT_EXCAUSE, buf);
+               decode_address(buf, cpu_pda[cpu].dcplb_doublefault_addr);
+               printk(KERN_NOTICE "   DCPLB_FAULT_ADDR: %s\n", buf);
+               decode_address(buf, cpu_pda[cpu].icplb_doublefault_addr);
+               printk(KERN_NOTICE "   ICPLB_FAULT_ADDR: %s\n", buf);
 
-               printk(KERN_NOTICE "CPU = %d\n", current_thread_info()->cpu);
-               if (!((unsigned long)current->mm & 0x3) && (unsigned long)current->mm >= FIXED_CODE_START)
-                       verbose_printk(KERN_NOTICE
-                               "TEXT = 0x%p-0x%p        DATA = 0x%p-0x%p\n"
-                               " BSS = 0x%p-0x%p  USER-STACK = 0x%p\n\n",
-                               (void *)current->mm->start_code,
-                               (void *)current->mm->end_code,
-                               (void *)current->mm->start_data,
-                               (void *)current->mm->end_data,
-                               (void *)current->mm->end_data,
-                               (void *)current->mm->brk,
-                               (void *)current->mm->start_stack);
-               else
-                       verbose_printk(KERN_NOTICE "invalid mm\n");
+               decode_address(buf, fp->retx);
+               printk(KERN_NOTICE "The instruction at %s caused a double exception\n", buf);
        } else
-               verbose_printk(KERN_NOTICE
-                              "No Valid process in current context\n");
-#endif
-}
-
-void dump_bfin_mem(struct pt_regs *fp)
-{
-#ifdef CONFIG_DEBUG_VERBOSE
-       unsigned short *addr, *erraddr, val = 0, err = 0;
-       char sti = 0, buf[6];
-
-       erraddr = (void *)fp->pc;
-
-       verbose_printk(KERN_NOTICE "return address: [0x%p]; contents of:", erraddr);
-
-       for (addr = (unsigned short *)((unsigned long)erraddr & ~0xF) - 0x10;
-            addr < (unsigned short *)((unsigned long)erraddr & ~0xF) + 0x10;
-            addr++) {
-               if (!((unsigned long)addr & 0xF))
-                       verbose_printk(KERN_NOTICE "0x%p: ", addr);
-
-               if (!get_instruction(&val, addr)) {
-                               val = 0;
-                               sprintf(buf, "????");
-               } else
-                       sprintf(buf, "%04x", val);
-
-               if (addr == erraddr) {
-                       verbose_printk("[%s]", buf);
-                       err = val;
-               } else
-                       verbose_printk(" %s ", buf);
-
-               /* Do any previous instructions turn on interrupts? */
-               if (addr <= erraddr &&                          /* in the past */
-                   ((val >= 0x0040 && val <= 0x0047) ||        /* STI instruction */
-                     val == 0x017b))                           /* [SP++] = RETI */
-                       sti = 1;
-       }
-
-       verbose_printk("\n");
-
-       /* Hardware error interrupts can be deferred */
-       if (unlikely(sti && (fp->seqstat & SEQSTAT_EXCAUSE) == VEC_HWERR &&
-           oops_in_progress)){
-               verbose_printk(KERN_NOTICE "Looks like this was a deferred error - sorry\n");
-#ifndef CONFIG_DEBUG_HWERR
-               verbose_printk(KERN_NOTICE
-"The remaining message may be meaningless\n"
-"You should enable CONFIG_DEBUG_HWERR to get a better idea where it came from\n");
-#else
-               /* If we are handling only one peripheral interrupt
-                * and current mm and pid are valid, and the last error
-                * was in that user space process's text area
-                * print it out - because that is where the problem exists
-                */
-               if ((!(((fp)->ipend & ~0x30) & (((fp)->ipend & ~0x30) - 1))) &&
-                    (current->pid && current->mm)) {
-                       /* And the last RETI points to the current userspace context */
-                       if ((fp + 1)->pc >= current->mm->start_code &&
-                           (fp + 1)->pc <= current->mm->end_code) {
-                               verbose_printk(KERN_NOTICE "It might be better to look around here : \n");
-                               verbose_printk(KERN_NOTICE "-------------------------------------------\n");
-                               show_regs(fp + 1);
-                               verbose_printk(KERN_NOTICE "-------------------------------------------\n");
-                       }
-               }
 #endif
+       {
+               dump_bfin_process(fp);
+               dump_bfin_mem(fp);
+               show_regs(fp);
+               dump_bfin_trace_buffer();
        }
 #endif
-}
-
-void show_regs(struct pt_regs *fp)
-{
-#ifdef CONFIG_DEBUG_VERBOSE
-       char buf [150];
-       struct irqaction *action;
-       unsigned int i;
-       unsigned long flags = 0;
-       unsigned int cpu = smp_processor_id();
-       unsigned char in_atomic = (bfin_read_IPEND() & 0x10) || in_atomic();
-
-       verbose_printk(KERN_NOTICE "\n");
-       if (CPUID != bfin_cpuid())
-               verbose_printk(KERN_NOTICE "Compiled for cpu family 0x%04x (Rev %d), "
-                       "but running on:0x%04x (Rev %d)\n",
-                       CPUID, bfin_compiled_revid(), bfin_cpuid(), bfin_revid());
-
-       verbose_printk(KERN_NOTICE "ADSP-%s-0.%d",
-               CPU, bfin_compiled_revid());
-
-       if (bfin_compiled_revid() !=  bfin_revid())
-               verbose_printk("(Detected 0.%d)", bfin_revid());
-
-       verbose_printk(" %lu(MHz CCLK) %lu(MHz SCLK) (%s)\n",
-               get_cclk()/1000000, get_sclk()/1000000,
-#ifdef CONFIG_MPU
-               "mpu on"
-#else
-               "mpu off"
-#endif
-               );
-
-       verbose_printk(KERN_NOTICE "%s", linux_banner);
-
-       verbose_printk(KERN_NOTICE "\nSEQUENCER STATUS:\t\t%s\n",
-                      print_tainted());
-       verbose_printk(KERN_NOTICE " SEQSTAT: %08lx  IPEND: %04lx  SYSCFG: %04lx\n",
-                      (long)fp->seqstat, fp->ipend, fp->syscfg);
-       if ((fp->seqstat & SEQSTAT_EXCAUSE) == VEC_HWERR) {
-               verbose_printk(KERN_NOTICE "  HWERRCAUSE: 0x%lx\n",
-                       (fp->seqstat & SEQSTAT_HWERRCAUSE) >> 14);
-#ifdef EBIU_ERRMST
-               /* If the error was from the EBIU, print it out */
-               if (bfin_read_EBIU_ERRMST() & CORE_ERROR) {
-                       verbose_printk(KERN_NOTICE "  EBIU Error Reason  : 0x%04x\n",
-                               bfin_read_EBIU_ERRMST());
-                       verbose_printk(KERN_NOTICE "  EBIU Error Address : 0x%08x\n",
-                               bfin_read_EBIU_ERRADD());
-               }
-#endif
-       }
-       verbose_printk(KERN_NOTICE "  EXCAUSE   : 0x%lx\n",
-               fp->seqstat & SEQSTAT_EXCAUSE);
-       for (i = 2; i <= 15 ; i++) {
-               if (fp->ipend & (1 << i)) {
-                       if (i != 4) {
-                               decode_address(buf, bfin_read32(EVT0 + 4*i));
-                               verbose_printk(KERN_NOTICE "  physical IVG%i asserted : %s\n", i, buf);
-                       } else
-                               verbose_printk(KERN_NOTICE "  interrupts disabled\n");
-               }
-       }
-
-       /* if no interrupts are going off, don't print this out */
-       if (fp->ipend & ~0x3F) {
-               for (i = 0; i < (NR_IRQS - 1); i++) {
-                       if (!in_atomic)
-                               spin_lock_irqsave(&irq_desc[i].lock, flags);
-
-                       action = irq_desc[i].action;
-                       if (!action)
-                               goto unlock;
-
-                       decode_address(buf, (unsigned int)action->handler);
-                       verbose_printk(KERN_NOTICE "  logical irq %3d mapped  : %s", i, buf);
-                       for (action = action->next; action; action = action->next) {
-                               decode_address(buf, (unsigned int)action->handler);
-                               verbose_printk(", %s", buf);
-                       }
-                       verbose_printk("\n");
-unlock:
-                       if (!in_atomic)
-                               spin_unlock_irqrestore(&irq_desc[i].lock, flags);
-               }
-       }
-
-       decode_address(buf, fp->rete);
-       verbose_printk(KERN_NOTICE " RETE: %s\n", buf);
-       decode_address(buf, fp->retn);
-       verbose_printk(KERN_NOTICE " RETN: %s\n", buf);
-       decode_address(buf, fp->retx);
-       verbose_printk(KERN_NOTICE " RETX: %s\n", buf);
-       decode_address(buf, fp->rets);
-       verbose_printk(KERN_NOTICE " RETS: %s\n", buf);
-       decode_address(buf, fp->pc);
-       verbose_printk(KERN_NOTICE " PC  : %s\n", buf);
-
-       if (((long)fp->seqstat &  SEQSTAT_EXCAUSE) &&
-           (((long)fp->seqstat & SEQSTAT_EXCAUSE) != VEC_HWERR)) {
-               decode_address(buf, cpu_pda[cpu].dcplb_fault_addr);
-               verbose_printk(KERN_NOTICE "DCPLB_FAULT_ADDR: %s\n", buf);
-               decode_address(buf, cpu_pda[cpu].icplb_fault_addr);
-               verbose_printk(KERN_NOTICE "ICPLB_FAULT_ADDR: %s\n", buf);
-       }
-
-       verbose_printk(KERN_NOTICE "PROCESSOR STATE:\n");
-       verbose_printk(KERN_NOTICE " R0 : %08lx    R1 : %08lx    R2 : %08lx    R3 : %08lx\n",
-               fp->r0, fp->r1, fp->r2, fp->r3);
-       verbose_printk(KERN_NOTICE " R4 : %08lx    R5 : %08lx    R6 : %08lx    R7 : %08lx\n",
-               fp->r4, fp->r5, fp->r6, fp->r7);
-       verbose_printk(KERN_NOTICE " P0 : %08lx    P1 : %08lx    P2 : %08lx    P3 : %08lx\n",
-               fp->p0, fp->p1, fp->p2, fp->p3);
-       verbose_printk(KERN_NOTICE " P4 : %08lx    P5 : %08lx    FP : %08lx    SP : %08lx\n",
-               fp->p4, fp->p5, fp->fp, (long)fp);
-       verbose_printk(KERN_NOTICE " LB0: %08lx    LT0: %08lx    LC0: %08lx\n",
-               fp->lb0, fp->lt0, fp->lc0);
-       verbose_printk(KERN_NOTICE " LB1: %08lx    LT1: %08lx    LC1: %08lx\n",
-               fp->lb1, fp->lt1, fp->lc1);
-       verbose_printk(KERN_NOTICE " B0 : %08lx    L0 : %08lx    M0 : %08lx    I0 : %08lx\n",
-               fp->b0, fp->l0, fp->m0, fp->i0);
-       verbose_printk(KERN_NOTICE " B1 : %08lx    L1 : %08lx    M1 : %08lx    I1 : %08lx\n",
-               fp->b1, fp->l1, fp->m1, fp->i1);
-       verbose_printk(KERN_NOTICE " B2 : %08lx    L2 : %08lx    M2 : %08lx    I2 : %08lx\n",
-               fp->b2, fp->l2, fp->m2, fp->i2);
-       verbose_printk(KERN_NOTICE " B3 : %08lx    L3 : %08lx    M3 : %08lx    I3 : %08lx\n",
-               fp->b3, fp->l3, fp->m3, fp->i3);
-       verbose_printk(KERN_NOTICE "A0.w: %08lx   A0.x: %08lx   A1.w: %08lx   A1.x: %08lx\n",
-               fp->a0w, fp->a0x, fp->a1w, fp->a1x);
-
-       verbose_printk(KERN_NOTICE "USP : %08lx  ASTAT: %08lx\n",
-               rdusp(), fp->astat);
-
-       verbose_printk(KERN_NOTICE "\n");
-#endif
-}
-
-#ifdef CONFIG_SYS_BFIN_SPINLOCK_L1
-asmlinkage int sys_bfin_spinlock(int *spinlock)__attribute__((l1_text));
-#endif
-
-static DEFINE_SPINLOCK(bfin_spinlock_lock);
-
-asmlinkage int sys_bfin_spinlock(int *p)
-{
-       int ret, tmp = 0;
-
-       spin_lock(&bfin_spinlock_lock); /* This would also hold kernel preemption. */
-       ret = get_user(tmp, p);
-       if (likely(ret == 0)) {
-               if (unlikely(tmp))
-                       ret = 1;
-               else
-                       put_user(1, p);
-       }
-       spin_unlock(&bfin_spinlock_lock);
-       return ret;
-}
-
-int bfin_request_exception(unsigned int exception, void (*handler)(void))
-{
-       void (*curr_handler)(void);
-
-       if (exception > 0x3F)
-               return -EINVAL;
-
-       curr_handler = ex_table[exception];
-
-       if (curr_handler != ex_replaceable)
-               return -EBUSY;
-
-       ex_table[exception] = handler;
+       panic("Double Fault - unrecoverable event");
 
-       return 0;
 }
-EXPORT_SYMBOL(bfin_request_exception);
-
-int bfin_free_exception(unsigned int exception, void (*handler)(void))
-{
-       void (*curr_handler)(void);
-
-       if (exception > 0x3F)
-               return -EINVAL;
-
-       curr_handler = ex_table[exception];
-
-       if (curr_handler != handler)
-               return -EBUSY;
 
-       ex_table[exception] = ex_replaceable;
-
-       return 0;
-}
-EXPORT_SYMBOL(bfin_free_exception);
 
 void panic_cplb_error(int cplb_panic, struct pt_regs *fp)
 {
@@ -1298,3 +559,23 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp)
        dump_stack();
        panic("Unrecoverable event");
 }
+
+#ifdef CONFIG_BUG
+int is_valid_bugaddr(unsigned long addr)
+{
+       unsigned int opcode;
+
+       if (!get_instruction(&opcode, (unsigned short *)addr))
+               return 0;
+
+       return opcode == BFIN_BUG_OPCODE;
+}
+#endif
+
+/* stub this out */
+#ifndef CONFIG_DEBUG_VERBOSE
+void show_regs(struct pt_regs *fp)
+{
+
+}
+#endif