lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc/4xx: Fix erroneous xmon warning on PowerPC 4xx

Browse Source 
The xmon code relies on MSR_RI being non-zero to indicate that an exception
is recoverable.  If it is not, it prints a warning message.  However, the
PowerPC 4xx cores do not have an MSR_RI bit and this warning is produced for
every xmon event.

This introduces an unrecoverable_excp function to determine if an exception
is recoverable or not.  This gets rid of the erroneous warnings on 4xx.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Josh Boyer
2009-09-23 03:51:04 +00:00
committed by Benjamin Herrenschmidt
parent f32af63ed1
commit daf8f40391
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/powerpc/xmon/xmon.c
View File

@@ -335,6 +335,16 @@ int cpus_are_in_xmon(void)
} }
#endif #endif
static inline int unrecoverable_excp(struct pt_regs *regs)
{
#ifdef CONFIG_4xx
/* We have no MSR_RI bit on 4xx, so we simply return false */
return 0;
#else
return ((regs->msr & MSR_RI) == 0);
#endif
}
static int xmon_core(struct pt_regs *regs, int fromipi) static int xmon_core(struct pt_regs *regs, int fromipi)
{ {
int cmd = 0; int cmd = 0;
@@ -388,7 +398,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
bp = NULL; bp = NULL;
if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) == (MSR_IR|MSR_SF)) if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) == (MSR_IR|MSR_SF))
bp = at_breakpoint(regs->nip); bp = at_breakpoint(regs->nip);
if (bp || (regs->msr & MSR_RI) == 0) if (bp || unrecoverable_excp(regs))
fromipi = 0; fromipi = 0;
if (!fromipi) { if (!fromipi) {
@@ -399,7 +409,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
cpu, BP_NUM(bp)); cpu, BP_NUM(bp));
xmon_print_symbol(regs->nip, " ", ")\n"); xmon_print_symbol(regs->nip, " ", ")\n");
} }
if ((regs->msr & MSR_RI) == 0) if (unrecoverable_excp(regs))
printf("WARNING: exception is not recoverable, " printf("WARNING: exception is not recoverable, "
"can't continue\n"); "can't continue\n");
release_output_lock(); release_output_lock();
@@ -490,7 +500,7 @@ static int xmon_core(struct pt_regs *regs, int fromipi)
printf("Stopped at breakpoint %x (", BP_NUM(bp)); printf("Stopped at breakpoint %x (", BP_NUM(bp));
xmon_print_symbol(regs->nip, " ", ")\n"); xmon_print_symbol(regs->nip, " ", ")\n");
} }
if ((regs->msr & MSR_RI) == 0) if (unrecoverable_excp(regs))
printf("WARNING: exception is not recoverable, " printf("WARNING: exception is not recoverable, "
"can't continue\n"); "can't continue\n");
remove_bpts(); remove_bpts();