Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

CRIS v32: Update traps.c

Browse Source 
- Remove raw_prink hack, use oops_in_progress instead.
- When ETRAX_WATCHDOG_NICE_DOGGY is set, loop in trap after oops dump
  instead of rebooting.
- Break long lines to less than 80 chars.
- Fix whitespace errors.
- Remove unnecessary comments.
This commit is contained in:
Jesper Nilsson 2007-11-30 16:22:50 +01:00
parent 32872b203b
commit 1e4cc2c8c7
1 changed files with 94 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
arch/cris/arch-v10/kernel/traps.c
View File

@ -1,10 +1,7 @@
/* $Id: traps.c,v 1.4 2005/04/24 18:47:55 starvik Exp $ /*
* Helper functions for trap handlers
* *
* linux/arch/cris/arch-v10/traps.c * Copyright (C) 2000-2007, Axis Communications AB.
*
* Heler functions for trap handlers
*
* Copyright (C) 2000-2002 Axis Communications AB
* *
* Authors: Bjorn Wesen * Authors: Bjorn Wesen
* Hans-Peter Nilsson * Hans-Peter Nilsson
@ -15,124 +12,119 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/arch/sv_addr_ag.h> #include <asm/arch/sv_addr_ag.h>
extern int raw_printk(const char *fmt, ...);
void void
show_registers(struct pt_regs * regs) show_registers(struct pt_regs *regs)
{ {
/* We either use rdusp() - the USP register, which might not /*
correspond to the current process for all cases we're called, * It's possible to use either the USP register or current->thread.usp.
or we use the current->thread.usp, which is not up to date for * USP might not correspond to the current process for all cases this
the current process. Experience shows we want the USP * function is called, and current->thread.usp isn't up to date for the
register. */ * current process. Experience shows that using USP is the way to go.
*/
unsigned long usp = rdusp(); unsigned long usp = rdusp();
raw_printk("IRP: %08lx SRP: %08lx DCCR: %08lx USP: %08lx MOF: %08lx\n", printk("IRP: %08lx SRP: %08lx DCCR: %08lx USP: %08lx MOF: %08lx\n",
regs->irp, regs->srp, regs->dccr, usp, regs->mof ); regs->irp, regs->srp, regs->dccr, usp, regs->mof);
raw_printk(" r0: %08lx r1: %08lx r2: %08lx r3: %08lx\n",
printk(" r0: %08lx r1: %08lx r2: %08lx r3: %08lx\n",
regs->r0, regs->r1, regs->r2, regs->r3); regs->r0, regs->r1, regs->r2, regs->r3);
raw_printk(" r4: %08lx r5: %08lx r6: %08lx r7: %08lx\n",
printk(" r4: %08lx r5: %08lx r6: %08lx r7: %08lx\n",
regs->r4, regs->r5, regs->r6, regs->r7); regs->r4, regs->r5, regs->r6, regs->r7);
raw_printk(" r8: %08lx r9: %08lx r10: %08lx r11: %08lx\n",
printk(" r8: %08lx r9: %08lx r10: %08lx r11: %08lx\n",
regs->r8, regs->r9, regs->r10, regs->r11); regs->r8, regs->r9, regs->r10, regs->r11);
raw_printk("r12: %08lx r13: %08lx oR10: %08lx sp: %08lx\n",
regs->r12, regs->r13, regs->orig_r10, regs); printk("r12: %08lx r13: %08lx oR10: %08lx sp: %08lx\n",
raw_printk("R_MMU_CAUSE: %08lx\n", (unsigned long)*R_MMU_CAUSE); regs->r12, regs->r13, regs->orig_r10, (long unsigned)regs);
raw_printk("Process %s (pid: %d, stackpage=%08lx)\n",
printk("R_MMU_CAUSE: %08lx\n", (unsigned long)*R_MMU_CAUSE);
printk("Process %s (pid: %d, stackpage=%08lx)\n",
current->comm, current->pid, (unsigned long)current); current->comm, current->pid, (unsigned long)current);
/* /*
* When in-kernel, we also print out the stack and code at the * When in-kernel, we also print out the stack and code at the
* time of the fault.. * time of the fault..
*/ */
if (! user_mode(regs)) { if (!user_mode(regs)) {
int i; int i;
show_stack(NULL, (unsigned long*)usp); show_stack(NULL, (unsigned long *)usp);
/* Dump kernel stack if the previous dump wasn't one. */ /*
* If the previous stack-dump wasn't a kernel one, dump the
* kernel stack now.
*/
if (usp != 0) if (usp != 0)
show_stack (NULL, NULL); show_stack(NULL, NULL);
raw_printk("\nCode: "); printk("\nCode: ");
if(regs->irp < PAGE_OFFSET)
goto bad;
/* Often enough the value at regs->irp does not point to if (regs->irp < PAGE_OFFSET)
the interesting instruction, which is most often the goto bad_value;
_previous_ instruction. So we dump at an offset large
enough that instruction decoding should be in sync at /*
the interesting point, but small enough to fit on a row * Quite often the value at regs->irp doesn't point to the
(sort of). We point out the regs->irp location in a * interesting instruction, which often is the previous
ksymoops-friendly way by wrapping the byte for that * instruction. So dump at an offset large enough that the
address in parentheses. */ * instruction decoding should be in sync at the interesting
for(i = -12; i < 12; i++) * point, but small enough to fit on a row. The regs->irp
{ * location is pointed out in a ksymoops-friendly way by
* wrapping the byte for that address in parenthesises.
*/
for (i = -12; i < 12; i++) {
unsigned char c; unsigned char c;
if(__get_user(c, &((unsigned char*)regs->irp)[i])) {
bad: if (__get_user(c, &((unsigned char *)regs->irp)[i])) {
raw_printk(" Bad IP value."); bad_value:
printk(" Bad IP value.");
break; break;
} }
if (i == 0) if (i == 0)
raw_printk("(%02x) ", c); printk("(%02x) ", c);
else else
raw_printk("%02x ", c); printk("%02x ", c);
} }
raw_printk("\n"); printk("\n");
} }
} }
/* Called from entry.S when the watchdog has bitten
* We print out something resembling an oops dump, and if
* we have the nice doggy development flag set, we halt here
* instead of rebooting.
*/
extern void reset_watchdog(void);
extern void stop_watchdog(void);
void void
watchdog_bite_hook(struct pt_regs *regs) arch_enable_nmi(void)
{ {
#ifdef CONFIG_ETRAX_WATCHDOG_NICE_DOGGY asm volatile ("setf m");
local_irq_disable();
stop_watchdog();
show_registers(regs);
while(1) /* nothing */;
#else
show_registers(regs);
#endif
} }
/* This is normally the 'Oops' routine */ extern void (*nmi_handler)(struct pt_regs *);
void void handle_nmi(struct pt_regs *regs)
die_if_kernel(const char * str, struct pt_regs * regs, long err)
{ {
if(user_mode(regs)) if (nmi_handler)
nmi_handler(regs);
/* Wait until nmi is no longer active. (We enable NMI immediately after
returning from this function, and we don't want it happening while
exiting from the NMI interrupt handler.) */
while (*R_IRQ_MASK0_RD & IO_STATE(R_IRQ_MASK0_RD, nmi_pin, active))
;
}
#ifdef CONFIG_DEBUG_BUGVERBOSE
void
handle_BUG(struct pt_regs *regs)
{
struct bug_frame f;
unsigned char c;
unsigned long irp = regs->irp;
if (__copy_from_user(&f, (const void __user *)(irp - 8), sizeof f))
return; return;
if (f.prefix != BUG_PREFIX || f.magic != BUG_MAGIC)
return;
if (__get_user(c, f.filename))
f.filename = "<bad filename>";
#ifdef CONFIG_ETRAX_WATCHDOG_NICE_DOGGY printk("kernel BUG at %s:%d!\n", f.filename, f.line);
/* This printout might take too long and trigger the
* watchdog normally. If we're in the nice doggy
* development mode, stop the watchdog during printout.
*/
stop_watchdog();
#endif
raw_printk("%s: %04lx\n", str, err & 0xffff);
show_registers(regs);
#ifdef CONFIG_ETRAX_WATCHDOG_NICE_DOGGY
reset_watchdog();
#endif
do_exit(SIGSEGV);
}
void arch_enable_nmi(void)
{
asm volatile("setf m");
} }
#endif