linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

arch/powerpc/lib/board.c, *traps.c: sparse fixes

Browse Source 
traps.c:*:1: warning: symbol 'print_backtrace' was not declared. Should it be static?
traps.c:93:1: warning: symbol '_exception' was not declared. Should it be static?
board.c:166:6: warning: symbol '__board_add_ram_info' was not declared. Should it be static?
board.c:174:5: warning: symbol '__board_flash_wp_on' was not declared. Should it be static?
board.c:187:6: warning: symbol '__cpu_secondary_init_r' was not declared. Should it be static?
board.c:265:12: warning: symbol 'init_sequence' was not declared. Should it be static?
board.c:348:5: warning: symbol '__fixup_cpu' was not declared. Should it be static?
board.c:405:53: warning: Using plain integer as NULL pointer

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
This commit is contained in:
Kim Phillips
2012-10-29 13:34:29 +00:00
committed by Tom Rini
parent fe44f452db
commit 20051f2ab2
13 changed files with 206 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
arch/powerpc/cpu/74xx_7xx/traps.c
View File

@ -48,8 +48,7 @@ extern unsigned long search_exception_table(unsigned long);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -69,8 +68,7 @@ print_backtrace(unsigned long *sp)
printf("\n"); printf("\n");
} }
void void show_regs(struct pt_regs *regs)
show_regs(struct pt_regs * regs)
{ {
int i; int i;
@ -100,16 +98,14 @@ show_regs(struct pt_regs * regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Exception in kernel pc %lx signal %d",regs->nip,signr); panic("Exception in kernel pc %lx signal %d",regs->nip,signr);
} }
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup;
@ -152,8 +148,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -164,8 +159,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
unsigned char *p = regs ? (unsigned char *)(regs->nip) : NULL; unsigned char *p = regs ? (unsigned char *)(regs->nip) : NULL;
int i, j; int i, j;
@ -190,8 +184,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void SoftEmuException(struct pt_regs *regs)
SoftEmuException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -202,9 +195,7 @@ SoftEmuException(struct pt_regs *regs)
panic("Software Emulation Exception"); panic("Software Emulation Exception");
} }
void UnknownException(struct pt_regs *regs)
void
UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -218,8 +209,7 @@ UnknownException(struct pt_regs *regs)
/* Probe an address by reading. If not present, return -1, otherwise /* Probe an address by reading. If not present, return -1, otherwise
* return 0. * return 0.
*/ */
int int addr_probe(uint *addr)
addr_probe(uint *addr)
{ {
#if 0 #if 0
int retval; int retval;

110
arch/powerpc/cpu/mpc512x/traps.c
View File

@ -47,68 +47,65 @@ extern ulong get_effective_memsize(void);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace (unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
puts ("Call backtrace: "); puts("Call backtrace: ");
while (sp) { while (sp) {
if ((uint)sp > END_OF_MEM) if ((uint)sp > END_OF_MEM)
break; break;
i = sp[1]; i = sp[1];
if (cnt++ % 7 == 0) if (cnt++ % 7 == 0)
putc ('\n'); putc('\n');
printf ("%08lX ", i); printf("%08lX ", i);
if (cnt > 32) break; if (cnt > 32) break;
sp = (unsigned long *) *sp; sp = (unsigned long *) *sp;
} }
putc ('\n'); putc('\n');
} }
void show_regs (struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
printf ("NIP: %08lX XER: %08lX LR: %08lX REGS: %p TRAP: %04lx DAR: %08lX\n", printf("NIP: %08lX XER: %08lX LR: %08lX REGS: %p TRAP: %04lx DAR: %08lX\n",
regs->nip, regs->xer, regs->link, regs, regs->trap, regs->dar); regs->nip, regs->xer, regs->link, regs, regs->trap, regs->dar);
printf ("MSR: %08lx EE: %01x PR: %01x FP: %01x ME: %01x IR/DR: %01x%01x\n", printf("MSR: %08lx EE: %01x PR: %01x FP: %01x ME: %01x IR/DR: %01x%01x\n",
regs->msr, regs->msr & MSR_EE ? 1 : 0, regs->msr & MSR_PR ? 1 : 0, regs->msr, regs->msr & MSR_EE ? 1 : 0, regs->msr & MSR_PR ? 1 : 0,
regs->msr & MSR_FP ? 1 : 0,regs->msr & MSR_ME ? 1 : 0, regs->msr & MSR_FP ? 1 : 0,regs->msr & MSR_ME ? 1 : 0,
regs->msr & MSR_IR ? 1 : 0, regs->msr & MSR_IR ? 1 : 0,
regs->msr & MSR_DR ? 1 : 0); regs->msr & MSR_DR ? 1 : 0);
putc ('\n'); putc('\n');
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if ((i % 8) == 0) { if ((i % 8) == 0) {
printf ("GPR%02d: ", i); printf("GPR%02d: ", i);
} }
printf ("%08lX ", regs->gpr[i]); printf("%08lX ", regs->gpr[i]);
if ((i % 8) == 7) { if ((i % 8) == 7) {
putc ('\n'); putc('\n');
} }
} }
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception (int signr, struct pt_regs *regs)
{ {
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic ("Exception at pc %lx signal %d", regs->nip,signr); panic("Exception at pc %lx signal %d", regs->nip, signr);
} }
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException (struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup = search_exception_table(regs->nip);
if ((fixup = search_exception_table (regs->nip)) != 0) { if (fixup) {
regs->nip = fixup; regs->nip = fixup;
return; return;
} }
@ -118,95 +115,90 @@ MachineCheckException (struct pt_regs *regs)
return; return;
#endif #endif
puts ("Machine check.\nCaused by (from msr): "); puts("Machine check.\nCaused by (from msr): ");
printf ("regs %p ",regs); printf("regs %p ", regs);
switch (regs->msr & 0x00FF0000) { switch (regs->msr & 0x00FF0000) {
case (0x80000000 >> 10): case (0x80000000 >> 10):
puts ("Instruction cache parity signal\n"); puts("Instruction cache parity signal\n");
break; break;
case (0x80000000 >> 11): case (0x80000000 >> 11):
puts ("Data cache parity signal\n"); puts("Data cache parity signal\n");
break; break;
case (0x80000000 >> 12): case (0x80000000 >> 12):
puts ("Machine check signal\n"); puts("Machine check signal\n");
break; break;
case (0x80000000 >> 13): case (0x80000000 >> 13):
puts ("Transfer error ack signal\n"); puts("Transfer error ack signal\n");
break; break;
case (0x80000000 >> 14): case (0x80000000 >> 14):
puts ("Data parity signal\n"); puts("Data parity signal\n");
break; break;
case (0x80000000 >> 15): case (0x80000000 >> 15):
puts ("Address parity signal\n"); puts("Address parity signal\n");
break; break;
default: default:
puts ("Unknown values in msr\n"); puts("Unknown values in msr\n");
} }
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic ("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException (struct pt_regs *regs)
{ {
#ifdef CONFIG_CMD_KGDB #ifdef CONFIG_CMD_KGDB
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic ("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException (struct pt_regs *regs)
{ {
#ifdef CONFIG_CMD_KGDB #ifdef CONFIG_CMD_KGDB
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic ("Program Check Exception"); panic("Program Check Exception");
} }
void void SoftEmuException(struct pt_regs *regs)
SoftEmuException (struct pt_regs *regs)
{ {
#ifdef CONFIG_CMD_KGDB #ifdef CONFIG_CMD_KGDB
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic ("Software Emulation Exception"); panic("Software Emulation Exception");
} }
void void UnknownException(struct pt_regs *regs)
UnknownException (struct pt_regs *regs)
{ {
#ifdef CONFIG_CMD_KGDB #ifdef CONFIG_CMD_KGDB
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return; return;
#endif #endif
printf ("Bad trap at PC: %lx, SR: %lx, vector=%lx\n", printf("Bad trap at PC: %lx, SR: %lx, vector=%lx\n",
regs->nip, regs->msr, regs->trap); regs->nip, regs->msr, regs->trap);
_exception (0, regs); _exception(0, regs);
} }
#ifdef CONFIG_CMD_BEDBUG #ifdef CONFIG_CMD_BEDBUG
extern void do_bedbug_breakpoint (struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
void void DebugException(struct pt_regs *regs)
DebugException (struct pt_regs *regs)
{ {
printf ("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip);
show_regs (regs); show_regs(regs);
#ifdef CONFIG_CMD_BEDBUG #ifdef CONFIG_CMD_BEDBUG
do_bedbug_breakpoint (regs); do_bedbug_breakpoint(regs);
#endif #endif
} }

6
arch/powerpc/cpu/mpc5xx/traps.c
View File

@ -52,7 +52,7 @@ extern unsigned long search_exception_table(unsigned long);
/* /*
* Print stack backtrace * Print stack backtrace
*/ */
void print_backtrace(unsigned long *sp) static void print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -75,7 +75,7 @@ void print_backtrace(unsigned long *sp)
/* /*
* Print current registers * Print current registers
*/ */
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
printf("NIP: %08lX XER: %08lX LR: %08lX REGS: %p TRAP: %04lx DAR: %08lX\n", printf("NIP: %08lX XER: %08lX LR: %08lX REGS: %p TRAP: %04lx DAR: %08lX\n",
@ -105,7 +105,7 @@ void show_regs(struct pt_regs * regs)
/* /*
* General exception handler routine * General exception handler routine
*/ */
void _exception(int signr, struct pt_regs *regs) static void _exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);

29
arch/powerpc/cpu/mpc5xxx/traps.c
View File

@ -49,8 +49,7 @@ extern unsigned long search_exception_table(unsigned long);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -70,7 +69,7 @@ print_backtrace(unsigned long *sp)
printf("\n"); printf("\n");
} }
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
@ -98,16 +97,14 @@ void show_regs(struct pt_regs * regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Exception in kernel pc %lx signal %d",regs->nip,signr); panic("Exception in kernel pc %lx signal %d",regs->nip,signr);
} }
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup;
@ -152,8 +149,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -164,8 +160,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -176,8 +171,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void SoftEmuException(struct pt_regs *regs)
SoftEmuException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -189,8 +183,7 @@ SoftEmuException(struct pt_regs *regs)
} }
void void UnknownException(struct pt_regs *regs)
UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -205,8 +198,7 @@ UnknownException(struct pt_regs *regs)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
void void DebugException(struct pt_regs *regs)
DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
@ -219,8 +211,7 @@ DebugException(struct pt_regs *regs)
/* Probe an address by reading. If not present, return -1, otherwise /* Probe an address by reading. If not present, return -1, otherwise
* return 0. * return 0.
*/ */
int int addr_probe(uint *addr)
addr_probe(uint *addr)
{ {
#if 0 #if 0
int retval; int retval;

119
arch/powerpc/cpu/mpc8220/traps.c
View File

@ -39,7 +39,7 @@
#include <asm/processor.h> #include <asm/processor.h>
/* Returns 0 if exception not found and fixup otherwise. */ /* Returns 0 if exception not found and fixup otherwise. */
extern unsigned long search_exception_table (unsigned long); extern unsigned long search_exception_table(unsigned long);
/* THIS NEEDS CHANGING to use the board info structure. /* THIS NEEDS CHANGING to use the board info structure.
*/ */
@ -49,171 +49,166 @@ extern unsigned long search_exception_table (unsigned long);
* Trap & Exception support * Trap & Exception support
*/ */
void print_backtrace (unsigned long *sp) static void print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
printf ("Call backtrace: "); printf("Call backtrace: ");
while (sp) { while (sp) {
if ((uint) sp > END_OF_MEM) if ((uint) sp > END_OF_MEM)
break; break;
i = sp[1]; i = sp[1];
if (cnt++ % 7 == 0) if (cnt++ % 7 == 0)
printf ("\n"); printf("\n");
printf ("%08lX ", i); printf("%08lX ", i);
if (cnt > 32) if (cnt > 32)
break; break;
sp = (unsigned long *) *sp; sp = (unsigned long *) *sp;
} }
printf ("\n"); printf("\n");
} }
void show_regs (struct pt_regs *regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
printf ("NIP: %08lX XER: %08lX LR: %08lX REGS: %p TRAP: %04lx DAR: %08lX\n", printf("NIP: %08lX XER: %08lX LR: %08lX REGS: %p TRAP: %04lx DAR: %08lX\n",
regs->nip, regs->xer, regs->link, regs, regs->trap, regs->dar); regs->nip, regs->xer, regs->link, regs, regs->trap, regs->dar);
printf ("MSR: %08lx EE: %01x PR: %01x FP: %01x ME: %01x IR/DR: %01x%01x\n", printf("MSR: %08lx EE: %01x PR: %01x FP: %01x ME: %01x IR/DR: %01x%01x\n",
regs->msr, regs->msr,
regs->msr & MSR_EE ? 1 : 0, regs->msr & MSR_PR ? 1 : 0, regs->msr & MSR_EE ? 1 : 0, regs->msr & MSR_PR ? 1 : 0,
regs->msr & MSR_FP ? 1 : 0, regs->msr & MSR_ME ? 1 : 0, regs->msr & MSR_FP ? 1 : 0, regs->msr & MSR_ME ? 1 : 0,
regs->msr & MSR_IR ? 1 : 0, regs->msr & MSR_DR ? 1 : 0); regs->msr & MSR_IR ? 1 : 0, regs->msr & MSR_DR ? 1 : 0);
printf ("\n"); printf("\n");
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if ((i % 8) == 0) { if ((i % 8) == 0) {
printf ("GPR%02d: ", i); printf("GPR%02d: ", i);
} }
printf ("%08lX ", regs->gpr[i]); printf("%08lX ", regs->gpr[i]);
if ((i % 8) == 7) { if ((i % 8) == 7) {
printf ("\n"); printf("\n");
} }
} }
} }
void _exception (int signr, struct pt_regs *regs) static void _exception(int signr, struct pt_regs *regs)
{ {
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *) regs->gpr[1]); print_backtrace((unsigned long *) regs->gpr[1]);
panic ("Exception in kernel pc %lx signal %d", regs->nip, signr); panic("Exception in kernel pc %lx signal %d", regs->nip, signr);
} }
void MachineCheckException (struct pt_regs *regs) void MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup = search_exception_table(regs->nip);
/* Probing PCI using config cycles cause this exception /* Probing PCI using config cycles cause this exception
* when a device is not present. Catch it and return to * when a device is not present. Catch it and return to
* the PCI exception handler. * the PCI exception handler.
*/ */
if ((fixup = search_exception_table (regs->nip)) != 0) { if (fixup) {
regs->nip = fixup; regs->nip = fixup;
return; return;
} }
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler && (*debugger_exception_handler)(regs))
&& (*debugger_exception_handler) (regs))
return; return;
#endif #endif
printf ("Machine check in kernel mode.\n"); printf("Machine check in kernel mode.\n");
printf ("Caused by (from msr): "); printf("Caused by (from msr): ");
printf ("regs %p ", regs); printf("regs %p ", regs);
/* refer to 603e Manual (MPC603EUM/AD), chapter 4.5.2.1 */ /* refer to 603e Manual (MPC603EUM/AD), chapter 4.5.2.1 */
switch (regs->msr & 0x000F0000) { switch (regs->msr & 0x000F0000) {
case (0x80000000 >> 12): case (0x80000000 >> 12):
printf ("Machine check signal - probably due to mm fault\n" printf("Machine check signal - probably due to mm fault\n"
"with mmu off\n"); "with mmu off\n");
break; break;
case (0x80000000 >> 13): case (0x80000000 >> 13):
printf ("Transfer error ack signal\n"); printf("Transfer error ack signal\n");
break; break;
case (0x80000000 >> 14): case (0x80000000 >> 14):
printf ("Data parity signal\n"); printf("Data parity signal\n");
break; break;
case (0x80000000 >> 15): case (0x80000000 >> 15):
printf ("Address parity signal\n"); printf("Address parity signal\n");
break; break;
default: default:
printf ("Unknown values in msr\n"); printf("Unknown values in msr\n");
} }
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *) regs->gpr[1]); print_backtrace((unsigned long *) regs->gpr[1]);
panic ("machine check"); panic("machine check");
} }
void AlignmentException (struct pt_regs *regs) void AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler && (*debugger_exception_handler)(regs))
&& (*debugger_exception_handler) (regs))
return; return;
#endif #endif
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *) regs->gpr[1]); print_backtrace((unsigned long *) regs->gpr[1]);
panic ("Alignment Exception"); panic("Alignment Exception");
} }
void ProgramCheckException (struct pt_regs *regs) void ProgramCheckException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler && (*debugger_exception_handler)(regs))
&& (*debugger_exception_handler) (regs))
return; return;
#endif #endif
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *) regs->gpr[1]); print_backtrace((unsigned long *) regs->gpr[1]);
panic ("Program Check Exception"); panic("Program Check Exception");
} }
void SoftEmuException (struct pt_regs *regs) void SoftEmuException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler && (*debugger_exception_handler)(regs))
&& (*debugger_exception_handler) (regs))
return; return;
#endif #endif
show_regs (regs); show_regs(regs);
print_backtrace ((unsigned long *) regs->gpr[1]); print_backtrace((unsigned long *) regs->gpr[1]);
panic ("Software Emulation Exception"); panic("Software Emulation Exception");
} }
void UnknownException (struct pt_regs *regs) void UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler if (debugger_exception_handler && (*debugger_exception_handler)(regs))
&& (*debugger_exception_handler) (regs))
return; return;
#endif #endif
printf ("Bad trap at PC: %lx, SR: %lx, vector=%lx\n", printf("Bad trap at PC: %lx, SR: %lx, vector=%lx\n",
regs->nip, regs->msr, regs->trap); regs->nip, regs->msr, regs->trap);
_exception (0, regs); _exception(0, regs);
} }
#if defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
extern void do_bedbug_breakpoint (struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
void DebugException (struct pt_regs *regs) void DebugException(struct pt_regs *regs)
{ {
printf ("Debugger trap at @ %lx\n", regs->nip); printf("Debugger trap at @ %lx\n", regs->nip);
show_regs (regs); show_regs(regs);
#if defined(CONFIG_CMD_BEDBUG) #if defined(CONFIG_CMD_BEDBUG)
do_bedbug_breakpoint (regs); do_bedbug_breakpoint(regs);
#endif #endif
} }
/* Probe an address by reading. If not present, return -1, otherwise /* Probe an address by reading. If not present, return -1, otherwise
* return 0. * return 0.
*/ */
int addr_probe (uint * addr) int addr_probe(uint *addr)
{ {
#if 0 #if 0
int retval; int retval;

29
arch/powerpc/cpu/mpc824x/traps.c
View File

@ -46,8 +46,7 @@ extern unsigned long search_exception_table(unsigned long);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -67,7 +66,7 @@ print_backtrace(unsigned long *sp)
printf("\n"); printf("\n");
} }
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
@ -95,16 +94,14 @@ void show_regs(struct pt_regs * regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Exception in kernel pc %lx signal %d",regs->nip,signr); panic("Exception in kernel pc %lx signal %d",regs->nip,signr);
} }
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup;
@ -142,24 +139,21 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void SoftEmuException(struct pt_regs *regs)
SoftEmuException(struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
@ -167,8 +161,7 @@ SoftEmuException(struct pt_regs *regs)
} }
void void UnknownException(struct pt_regs *regs)
UnknownException(struct pt_regs *regs)
{ {
printf("Bad trap at PC: %lx, SR: %lx, vector=%lx\n", printf("Bad trap at PC: %lx, SR: %lx, vector=%lx\n",
regs->nip, regs->msr, regs->trap); regs->nip, regs->msr, regs->trap);
@ -179,8 +172,7 @@ UnknownException(struct pt_regs *regs)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
void void DebugException(struct pt_regs *regs)
DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
@ -193,8 +185,7 @@ DebugException(struct pt_regs *regs)
/* Probe an address by reading. If not present, return -1, otherwise /* Probe an address by reading. If not present, return -1, otherwise
* return 0. * return 0.
*/ */
int int addr_probe(uint *addr)
addr_probe(uint *addr)
{ {
#if 0 #if 0
int retval; int retval;

29
arch/powerpc/cpu/mpc8260/traps.c
View File

@ -49,8 +49,7 @@ extern unsigned long search_exception_table(unsigned long);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -70,7 +69,7 @@ print_backtrace(unsigned long *sp)
putc ('\n'); putc ('\n');
} }
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
@ -96,8 +95,7 @@ void show_regs(struct pt_regs * regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
@ -122,8 +120,7 @@ void dump_pci (void)
} }
#endif #endif
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup;
@ -180,8 +177,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -192,8 +188,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -204,8 +199,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void SoftEmuException(struct pt_regs *regs)
SoftEmuException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -217,8 +211,7 @@ SoftEmuException(struct pt_regs *regs)
} }
void void UnknownException(struct pt_regs *regs)
UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -233,8 +226,7 @@ UnknownException(struct pt_regs *regs)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
void void DebugException(struct pt_regs *regs)
DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
@ -247,8 +239,7 @@ DebugException(struct pt_regs *regs)
/* Probe an address by reading. If not present, return -1, otherwise /* Probe an address by reading. If not present, return -1, otherwise
* return 0. * return 0.
*/ */
int int addr_probe(uint *addr)
addr_probe(uint *addr)
{ {
#if 0 #if 0
int retval; int retval;

29
arch/powerpc/cpu/mpc83xx/traps.c
View File

@ -42,8 +42,7 @@ extern unsigned long search_exception_table(unsigned long);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -63,7 +62,7 @@ print_backtrace(unsigned long *sp)
putc ('\n'); putc ('\n');
} }
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
@ -89,8 +88,7 @@ void show_regs(struct pt_regs * regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
@ -114,8 +112,7 @@ void dump_pci (void)
} }
#endif #endif
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup;
@ -174,8 +171,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -186,8 +182,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -198,8 +193,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void SoftEmuException(struct pt_regs *regs)
SoftEmuException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -211,8 +205,7 @@ SoftEmuException(struct pt_regs *regs)
} }
void void UnknownException(struct pt_regs *regs)
UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -227,8 +220,7 @@ UnknownException(struct pt_regs *regs)
extern void do_bedbug_breakpoint(struct pt_regs *); extern void do_bedbug_breakpoint(struct pt_regs *);
#endif #endif
void void DebugException(struct pt_regs *regs)
DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
@ -240,8 +232,7 @@ DebugException(struct pt_regs *regs)
/* Probe an address by reading. If not present, return -1, otherwise /* Probe an address by reading. If not present, return -1, otherwise
* return 0. * return 0.
*/ */
int int addr_probe(uint *addr)
addr_probe(uint *addr)
{ {
#if 0 #if 0
int retval; int retval;

36
arch/powerpc/cpu/mpc85xx/traps.c
View File

@ -82,8 +82,7 @@ extern void do_bedbug_breakpoint(struct pt_regs *);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -103,7 +102,7 @@ print_backtrace(unsigned long *sp)
printf("\n"); printf("\n");
} }
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
@ -131,24 +130,21 @@ void show_regs(struct pt_regs * regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Exception in kernel pc %lx signal %d",regs->nip,signr); panic("Exception in kernel pc %lx signal %d",regs->nip,signr);
} }
void void CritcalInputException(struct pt_regs *regs)
CritcalInputException(struct pt_regs *regs)
{ {
panic("Critical Input Exception"); panic("Critical Input Exception");
} }
int machinecheck_count = 0; int machinecheck_count = 0;
int machinecheck_error = 0; int machinecheck_error = 0;
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup;
unsigned int mcsr, mcsrr0, mcsrr1, mcar; unsigned int mcsr, mcsrr0, mcsrr1, mcar;
@ -220,8 +216,7 @@ MachineCheckException(struct pt_regs *regs)
} }
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -233,8 +228,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
long esr_val; long esr_val;
@ -257,8 +251,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void PITException(struct pt_regs *regs)
PITException(struct pt_regs *regs)
{ {
/* /*
* Reset PIT interrupt * Reset PIT interrupt
@ -271,9 +264,7 @@ PITException(struct pt_regs *regs)
timer_interrupt(NULL); timer_interrupt(NULL);
} }
void UnknownException(struct pt_regs *regs)
void
UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -285,8 +276,7 @@ UnknownException(struct pt_regs *regs)
_exception(0, regs); _exception(0, regs);
} }
void void ExtIntException(struct pt_regs *regs)
ExtIntException(struct pt_regs *regs)
{ {
volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC8xxx_PIC_ADDR); volatile ccsr_pic_t *pic = (void *)(CONFIG_SYS_MPC8xxx_PIC_ADDR);
@ -305,8 +295,7 @@ ExtIntException(struct pt_regs *regs)
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
} }
void void DebugException(struct pt_regs *regs)
DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
@ -318,8 +307,7 @@ DebugException(struct pt_regs *regs)
/* Probe an address by reading. If not present, return -1, otherwise /* Probe an address by reading. If not present, return -1, otherwise
* return 0. * return 0.
*/ */
int int addr_probe(uint *addr)
addr_probe(uint *addr)
{ {
return 0; return 0;
} }

27
arch/powerpc/cpu/mpc86xx/traps.c
View File

@ -52,8 +52,7 @@ extern ulong get_effective_memsize(void);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -74,8 +73,7 @@ print_backtrace(unsigned long *sp)
printf("\n"); printf("\n");
} }
void void show_regs(struct pt_regs *regs)
show_regs(struct pt_regs *regs)
{ {
int i; int i;
@ -103,16 +101,14 @@ show_regs(struct pt_regs *regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Exception in kernel pc %lx signal %d", regs->nip, signr); panic("Exception in kernel pc %lx signal %d", regs->nip, signr);
} }
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup;
@ -158,8 +154,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler) (regs)) if (debugger_exception_handler && (*debugger_exception_handler) (regs))
@ -170,8 +165,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
unsigned char *p = regs ? (unsigned char *)(regs->nip) : NULL; unsigned char *p = regs ? (unsigned char *)(regs->nip) : NULL;
int i, j; int i, j;
@ -196,8 +190,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void SoftEmuException(struct pt_regs *regs)
SoftEmuException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler) (regs)) if (debugger_exception_handler && (*debugger_exception_handler) (regs))
@ -208,8 +201,7 @@ SoftEmuException(struct pt_regs *regs)
panic("Software Emulation Exception"); panic("Software Emulation Exception");
} }
void void UnknownException(struct pt_regs *regs)
UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler) (regs)) if (debugger_exception_handler && (*debugger_exception_handler) (regs))
@ -226,8 +218,7 @@ UnknownException(struct pt_regs *regs)
* If not present, return -1, * If not present, return -1,
* otherwise return 0. * otherwise return 0.
*/ */
int int addr_probe(uint *addr)
addr_probe(uint *addr)
{ {
return 0; return 0;
} }

29
arch/powerpc/cpu/mpc8xx/traps.c
View File

@ -52,8 +52,7 @@ extern unsigned long search_exception_table(unsigned long);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -73,7 +72,7 @@ print_backtrace(unsigned long *sp)
printf("\n"); printf("\n");
} }
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
@ -101,16 +100,14 @@ void show_regs(struct pt_regs * regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Exception in kernel pc %lx signal %d",regs->nip,signr); panic("Exception in kernel pc %lx signal %d",regs->nip,signr);
} }
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup; unsigned long fixup;
@ -153,8 +150,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -165,8 +161,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -177,8 +172,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void SoftEmuException(struct pt_regs *regs)
SoftEmuException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -190,8 +184,7 @@ SoftEmuException(struct pt_regs *regs)
} }
void void UnknownException(struct pt_regs *regs)
UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -202,8 +195,7 @@ UnknownException(struct pt_regs *regs)
_exception(0, regs); _exception(0, regs);
} }
void void DebugException(struct pt_regs *regs)
DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);
@ -215,8 +207,7 @@ DebugException(struct pt_regs *regs)
/* Probe an address by reading. If not present, return -1, otherwise /* Probe an address by reading. If not present, return -1, otherwise
* return 0. * return 0.
*/ */
int int addr_probe(uint *addr)
addr_probe(uint *addr)
{ {
#if 0 #if 0
int retval; int retval;

26
arch/powerpc/cpu/ppc4xx/traps.c
View File

@ -74,8 +74,7 @@ extern void do_bedbug_breakpoint(struct pt_regs *);
* Trap & Exception support * Trap & Exception support
*/ */
void static void print_backtrace(unsigned long *sp)
print_backtrace(unsigned long *sp)
{ {
int cnt = 0; int cnt = 0;
unsigned long i; unsigned long i;
@ -95,7 +94,7 @@ print_backtrace(unsigned long *sp)
printf("\n"); printf("\n");
} }
void show_regs(struct pt_regs * regs) void show_regs(struct pt_regs *regs)
{ {
int i; int i;
@ -121,16 +120,14 @@ void show_regs(struct pt_regs * regs)
} }
void static void _exception(int signr, struct pt_regs *regs)
_exception(int signr, struct pt_regs *regs)
{ {
show_regs(regs); show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]); print_backtrace((unsigned long *)regs->gpr[1]);
panic("Exception"); panic("Exception");
} }
void void MachineCheckException(struct pt_regs *regs)
MachineCheckException(struct pt_regs *regs)
{ {
unsigned long fixup, val; unsigned long fixup, val;
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
@ -312,8 +309,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check"); panic("machine check");
} }
void void AlignmentException(struct pt_regs *regs)
AlignmentException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -325,8 +321,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception"); panic("Alignment Exception");
} }
void void ProgramCheckException(struct pt_regs *regs)
ProgramCheckException(struct pt_regs *regs)
{ {
long esr_val; long esr_val;
@ -349,8 +344,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception"); panic("Program Check Exception");
} }
void void DecrementerPITException(struct pt_regs *regs)
DecrementerPITException(struct pt_regs *regs)
{ {
/* /*
* Reset PIT interrupt * Reset PIT interrupt
@ -364,8 +358,7 @@ DecrementerPITException(struct pt_regs *regs)
} }
void void UnknownException(struct pt_regs *regs)
UnknownException(struct pt_regs *regs)
{ {
#if defined(CONFIG_CMD_KGDB) #if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs)) if (debugger_exception_handler && (*debugger_exception_handler)(regs))
@ -377,8 +370,7 @@ UnknownException(struct pt_regs *regs)
_exception(0, regs); _exception(0, regs);
} }
void void DebugException(struct pt_regs *regs)
DebugException(struct pt_regs *regs)
{ {
printf("Debugger trap at @ %lx\n", regs->nip ); printf("Debugger trap at @ %lx\n", regs->nip );
show_regs(regs); show_regs(regs);

12
arch/powerpc/lib/board.c
View File

@ -163,7 +163,7 @@ static int init_baudrate(void)
/***********************************************************************/ /***********************************************************************/
void __board_add_ram_info(int use_default) static void __board_add_ram_info(int use_default)
{ {
/* please define platform specific board_add_ram_info() */ /* please define platform specific board_add_ram_info() */
} }
@ -171,7 +171,7 @@ void __board_add_ram_info(int use_default)
void board_add_ram_info(int) void board_add_ram_info(int)
__attribute__ ((weak, alias("__board_add_ram_info"))); __attribute__ ((weak, alias("__board_add_ram_info")));
int __board_flash_wp_on(void) static int __board_flash_wp_on(void)
{ {
/* /*
* Most flashes can't be detected when write protection is enabled, * Most flashes can't be detected when write protection is enabled,
@ -184,7 +184,7 @@ int __board_flash_wp_on(void)
int board_flash_wp_on(void) int board_flash_wp_on(void)
__attribute__ ((weak, alias("__board_flash_wp_on"))); __attribute__ ((weak, alias("__board_flash_wp_on")));
void __cpu_secondary_init_r(void) static void __cpu_secondary_init_r(void)
{ {
} }
@ -262,7 +262,7 @@ static int init_func_watchdog_reset(void)
* Initialization sequence * Initialization sequence
*/ */
init_fnc_t *init_sequence[] = { static init_fnc_t *init_sequence[] = {
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
probecpu, probecpu,
#endif #endif
@ -345,7 +345,7 @@ ulong get_effective_memsize(void)
#endif #endif
} }
int __fixup_cpu(void) static int __fixup_cpu(void)
{ {
return 0; return 0;
} }
@ -402,7 +402,7 @@ void board_init_f(ulong bootflag)
#ifdef CONFIG_POST #ifdef CONFIG_POST
post_bootmode_init(); post_bootmode_init();
post_run(NULL, POST_ROM | post_bootmode_get(0)); post_run(NULL, POST_ROM | post_bootmode_get(NULL));
#endif #endif
WATCHDOG_RESET(); WATCHDOG_RESET();