diff options
| author |   Christophe Leroy <christophe.leroy@c-s.fr> | 2018-12-10 11:41:29 +0000 |
|---|---|---|
| committer |   Scott Wood <oss@buserror.net> | 2018-12-21 20:56:41 -0600 |
| commit | 0deae39cec6dab3a66794f3e9e83ca4dc30080f1 (patch) | |
| tree | 3368ae52860c4090f83eb991206ed4b4bc2098e7 /arch/powerpc/platforms/83xx | |
| parent | powerpc/fsl-rio: fix spelling mistake "reserverd" -> "reserved" (diff) | |
| download | linux-dev-0deae39cec6dab3a66794f3e9e83ca4dc30080f1.tar.xz linux-dev-0deae39cec6dab3a66794f3e9e83ca4dc30080f1.zip | |
powerpc/83xx: handle machine check caused by watchdog timer
When the watchdog timer is set in interrupt mode, it causes a
machine check when it times out. The purpose of this mode is to
ease debugging, not to crash the kernel and reboot the machine.
This patch implements a special handling for that, in order to not
crash the kernel if the watchdog times out while in interrupt or
within the idle task.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
[scottwood: added missing #include]
Signed-off-by: Scott Wood <oss@buserror.net>
Diffstat (limited to 'arch/powerpc/platforms/83xx')
| -rw-r--r-- | arch/powerpc/platforms/83xx/misc.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index d75c9816a5c9..2b6589fe812d 100644 --- a/arch/powerpc/platforms/83xx/misc.c +++ b/arch/powerpc/platforms/83xx/misc.c @@ -14,6 +14,7 @@ #include <linux/of_platform.h> #include <linux/pci.h> +#include <asm/debug.h> #include <asm/io.h> #include <asm/hw_irq.h> #include <asm/ipic.h> @@ -150,3 +151,19 @@ void __init mpc83xx_setup_arch(void) mpc83xx_setup_pci(); } + +int machine_check_83xx(struct pt_regs *regs) +{ + u32 mask = 1 << (31 - IPIC_MCP_WDT); + + if (!(regs->msr & SRR1_MCE_MCP) || !(ipic_get_mcp_status() & mask)) + return machine_check_generic(regs); + ipic_clear_mcp_status(mask); + + if (debugger_fault_handler(regs)) + return 1; + + die("Watchdog NMI Reset", regs, 0); + + return 1; +} |