Commit 20051f2a authored by Kim Phillips's avatar Kim Phillips Committed by Tom Rini
Browse files

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



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: default avatarKim Phillips <kim.phillips@freescale.com>
parent fe44f452
......@@ -48,8 +48,7 @@ extern unsigned long search_exception_table(unsigned long);
* Trap & Exception support
*/
void
print_backtrace(unsigned long *sp)
static void print_backtrace(unsigned long *sp)
{
int cnt = 0;
unsigned long i;
......@@ -69,8 +68,7 @@ print_backtrace(unsigned long *sp)
printf("\n");
}
void
show_regs(struct pt_regs * regs)
void show_regs(struct pt_regs *regs)
{
int i;
......@@ -100,16 +98,14 @@ show_regs(struct pt_regs * regs)
}
void
_exception(int signr, struct pt_regs *regs)
static void _exception(int signr, struct pt_regs *regs)
{
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
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;
......@@ -152,8 +148,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check");
}
void
AlignmentException(struct pt_regs *regs)
void AlignmentException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
......@@ -164,8 +159,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception");
}
void
ProgramCheckException(struct pt_regs *regs)
void ProgramCheckException(struct pt_regs *regs)
{
unsigned char *p = regs ? (unsigned char *)(regs->nip) : NULL;
int i, j;
......@@ -190,8 +184,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception");
}
void
SoftEmuException(struct pt_regs *regs)
void SoftEmuException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
......@@ -202,9 +195,7 @@ SoftEmuException(struct pt_regs *regs)
panic("Software Emulation Exception");
}
void
UnknownException(struct pt_regs *regs)
void UnknownException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
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
* return 0.
*/
int
addr_probe(uint *addr)
int addr_probe(uint *addr)
{
#if 0
int retval;
......
......@@ -47,68 +47,65 @@ extern ulong get_effective_memsize(void);
* Trap & Exception support
*/
void
print_backtrace (unsigned long *sp)
static void print_backtrace(unsigned long *sp)
{
int cnt = 0;
unsigned long i;
puts ("Call backtrace: ");
puts("Call backtrace: ");
while (sp) {
if ((uint)sp > END_OF_MEM)
break;
i = sp[1];
if (cnt++ % 7 == 0)
putc ('\n');
printf ("%08lX ", i);
putc('\n');
printf("%08lX ", i);
if (cnt > 32) break;
sp = (unsigned long *) *sp;
}
putc ('\n');
putc('\n');
}
void show_regs (struct pt_regs * regs)
void show_regs(struct pt_regs *regs)
{
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);
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 & MSR_FP ? 1 : 0,regs->msr & MSR_ME ? 1 : 0,
regs->msr & MSR_IR ? 1 : 0,
regs->msr & MSR_DR ? 1 : 0);
putc ('\n');
putc('\n');
for (i = 0; i < 32; i++) {
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) {
putc ('\n');
putc('\n');
}
}
}
void
_exception (int signr, struct pt_regs *regs)
static void _exception(int signr, struct pt_regs *regs)
{
show_regs (regs);
print_backtrace ((unsigned long *)regs->gpr[1]);
panic ("Exception at pc %lx signal %d", regs->nip,signr);
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
panic("Exception at 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);
if ((fixup = search_exception_table (regs->nip)) != 0) {
if (fixup) {
regs->nip = fixup;
return;
}
......@@ -118,95 +115,90 @@ MachineCheckException (struct pt_regs *regs)
return;
#endif
puts ("Machine check.\nCaused by (from msr): ");
printf ("regs %p ",regs);
puts("Machine check.\nCaused by (from msr): ");
printf("regs %p ", regs);
switch (regs->msr & 0x00FF0000) {
case (0x80000000 >> 10):
puts ("Instruction cache parity signal\n");
puts("Instruction cache parity signal\n");
break;
case (0x80000000 >> 11):
puts ("Data cache parity signal\n");
puts("Data cache parity signal\n");
break;
case (0x80000000 >> 12):
puts ("Machine check signal\n");
puts("Machine check signal\n");
break;
case (0x80000000 >> 13):
puts ("Transfer error ack signal\n");
puts("Transfer error ack signal\n");
break;
case (0x80000000 >> 14):
puts ("Data parity signal\n");
puts("Data parity signal\n");
break;
case (0x80000000 >> 15):
puts ("Address parity signal\n");
puts("Address parity signal\n");
break;
default:
puts ("Unknown values in msr\n");
puts("Unknown values in msr\n");
}
show_regs (regs);
print_backtrace ((unsigned long *)regs->gpr[1]);
show_regs(regs);
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)
{
#ifdef CONFIG_CMD_KGDB
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
show_regs (regs);
print_backtrace ((unsigned long *)regs->gpr[1]);
panic ("Alignment Exception");
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
panic("Alignment Exception");
}
void
ProgramCheckException (struct pt_regs *regs)
void ProgramCheckException(struct pt_regs *regs)
{
#ifdef CONFIG_CMD_KGDB
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
show_regs (regs);
print_backtrace ((unsigned long *)regs->gpr[1]);
panic ("Program Check Exception");
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
panic("Program Check Exception");
}
void
SoftEmuException (struct pt_regs *regs)
void SoftEmuException(struct pt_regs *regs)
{
#ifdef CONFIG_CMD_KGDB
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
show_regs (regs);
print_backtrace ((unsigned long *)regs->gpr[1]);
panic ("Software Emulation Exception");
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
panic("Software Emulation Exception");
}
void
UnknownException (struct pt_regs *regs)
void UnknownException(struct pt_regs *regs)
{
#ifdef CONFIG_CMD_KGDB
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#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);
_exception (0, regs);
_exception(0, regs);
}
#ifdef CONFIG_CMD_BEDBUG
extern void do_bedbug_breakpoint (struct pt_regs *);
extern void do_bedbug_breakpoint(struct pt_regs *);
#endif
void
DebugException (struct pt_regs *regs)
void DebugException(struct pt_regs *regs)
{
printf ("Debugger trap at @ %lx\n", regs->nip );
show_regs (regs);
printf("Debugger trap at @ %lx\n", regs->nip);
show_regs(regs);
#ifdef CONFIG_CMD_BEDBUG
do_bedbug_breakpoint (regs);
do_bedbug_breakpoint(regs);
#endif
}
......@@ -52,7 +52,7 @@ extern unsigned long search_exception_table(unsigned long);
/*
* Print stack backtrace
*/
void print_backtrace(unsigned long *sp)
static void print_backtrace(unsigned long *sp)
{
int cnt = 0;
unsigned long i;
......@@ -75,7 +75,7 @@ void print_backtrace(unsigned long *sp)
/*
* Print current registers
*/
void show_regs(struct pt_regs * regs)
void show_regs(struct pt_regs *regs)
{
int i;
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
*/
void _exception(int signr, struct pt_regs *regs)
static void _exception(int signr, struct pt_regs *regs)
{
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
......
......@@ -49,8 +49,7 @@ extern unsigned long search_exception_table(unsigned long);
* Trap & Exception support
*/
void
print_backtrace(unsigned long *sp)
static void print_backtrace(unsigned long *sp)
{
int cnt = 0;
unsigned long i;
......@@ -70,7 +69,7 @@ print_backtrace(unsigned long *sp)
printf("\n");
}
void show_regs(struct pt_regs * regs)
void show_regs(struct pt_regs *regs)
{
int i;
......@@ -98,16 +97,14 @@ void show_regs(struct pt_regs * regs)
}
void
_exception(int signr, struct pt_regs *regs)
static void _exception(int signr, struct pt_regs *regs)
{
show_regs(regs);
print_backtrace((unsigned long *)regs->gpr[1]);
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;
......@@ -152,8 +149,7 @@ MachineCheckException(struct pt_regs *regs)
panic("machine check");
}
void
AlignmentException(struct pt_regs *regs)
void AlignmentException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
......@@ -164,8 +160,7 @@ AlignmentException(struct pt_regs *regs)
panic("Alignment Exception");
}
void
ProgramCheckException(struct pt_regs *regs)
void ProgramCheckException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
......@@ -176,8 +171,7 @@ ProgramCheckException(struct pt_regs *regs)
panic("Program Check Exception");
}
void
SoftEmuException(struct pt_regs *regs)
void SoftEmuException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
......@@ -189,8 +183,7 @@ SoftEmuException(struct pt_regs *regs)
}
void
UnknownException(struct pt_regs *regs)
void UnknownException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
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 *);
#endif
void
DebugException(struct pt_regs *regs)
void DebugException(struct pt_regs *regs)
{
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
* return 0.
*/
int
addr_probe(uint *addr)
int addr_probe(uint *addr)
{
#if 0
int retval;
......
......@@ -39,7 +39,7 @@
#include <asm/processor.h>
/* 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.
*/
......@@ -49,171 +49,166 @@ extern unsigned long search_exception_table (unsigned long);
* Trap & Exception support
*/
void print_backtrace (unsigned long *sp)
static void print_backtrace(unsigned long *sp)
{
int cnt = 0;
unsigned long i;
printf ("Call backtrace: ");
printf("Call backtrace: ");
while (sp) {
if ((uint) sp > END_OF_MEM)
break;
i = sp[1];
if (cnt++ % 7 == 0)
printf ("\n");
printf ("%08lX ", i);
printf("\n");
printf("%08lX ", i);
if (cnt > 32)
break;
sp = (unsigned long *) *sp;
}
printf ("\n");
printf("\n");
}
void show_regs (struct pt_regs *regs)
void show_regs(struct pt_regs *regs)
{
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);
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 & MSR_FP ? 1 : 0, regs->msr & MSR_ME ? 1 : 0,
regs->msr & MSR_IR ? 1 : 0, regs->msr & MSR_DR ? 1 : 0);
printf ("\n");
printf("\n");
for (i = 0; i < 32; i++) {
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) {
printf ("\n");
printf("\n");
}
}
}
void _exception (int signr, struct pt_regs *regs)
static void _exception(int signr, struct pt_regs *regs)
{
show_regs (regs);
print_backtrace ((unsigned long *) regs->gpr[1]);
panic ("Exception in kernel pc %lx signal %d", regs->nip, signr);
show_regs(regs);
print_backtrace((unsigned long *) regs->gpr[1]);
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
* when a device is not present. Catch it and return to
* the PCI exception handler.
*/
if ((fixup = search_exception_table (regs->nip)) != 0) {
if (fixup) {
regs->nip = fixup;
return;
}
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler
&& (*debugger_exception_handler) (regs))
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
printf ("Machine check in kernel mode.\n");
printf ("Caused by (from msr): ");
printf ("regs %p ", regs);
printf("Machine check in kernel mode.\n");
printf("Caused by (from msr): ");
printf("regs %p ", regs);
/* refer to 603e Manual (MPC603EUM/AD), chapter 4.5.2.1 */
switch (regs->msr & 0x000F0000) {
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");
break;
case (0x80000000 >> 13):
printf ("Transfer error ack signal\n");
printf("Transfer error ack signal\n");
break;
case (0x80000000 >> 14):
printf ("Data parity signal\n");
printf("Data parity signal\n");
break;
case (0x80000000 >> 15):
printf ("Address parity signal\n");
printf("Address parity signal\n");
break;
default:
printf ("Unknown values in msr\n");
printf("Unknown values in msr\n");
}
show_regs (regs);
print_backtrace ((unsigned long *) regs->gpr[1]);
panic ("machine check");
show_regs(regs);
print_backtrace((unsigned long *) regs->gpr[1]);
panic("machine check");
}
void AlignmentException (struct pt_regs *regs)
void AlignmentException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler
&& (*debugger_exception_handler) (regs))
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
show_regs (regs);
print_backtrace ((unsigned long *) regs->gpr[1]);
panic ("Alignment Exception");
show_regs(regs);
print_backtrace((unsigned long *) regs->gpr[1]);
panic("Alignment Exception");
}
void ProgramCheckException (struct pt_regs *regs)
void ProgramCheckException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler
&& (*debugger_exception_handler) (regs))
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
show_regs (regs);
print_backtrace ((unsigned long *) regs->gpr[1]);
panic ("Program Check Exception");
show_regs(regs);
print_backtrace((unsigned long *) regs->gpr[1]);
panic("Program Check Exception");
}
void SoftEmuException (struct pt_regs *regs)
void SoftEmuException(struct pt_regs *regs)
{
#if defined(CONFIG_CMD_KGDB)
if (debugger_exception_handler
&& (*debugger_exception_handler) (regs))
if (debugger_exception_handler && (*debugger_exception_handler)(regs))
return;
#endif
show_regs (regs);
print_backtrace ((unsigned long *) regs->gpr[1]);
panic ("Software Emulation Exception");
show_regs(regs);
print_backtrace((unsigned long *) regs->gpr[1]);
panic("Software Emulation Exception");
}