diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2006-04-04 13:43:01 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-22 18:44:25 +1000 |
| commit | d6c1a9081080c6c4658acf2a06d851feb2855933 (patch) | |
| tree | eaf1095adbe057846485de066561327066ab9bb1 /arch/powerpc/kernel/crash.c | |
| parent | 4d6c58899c1cdac018f92cfa0383bb835a0c80ef (diff) | |
| download | linux-stable-d6c1a9081080c6c4658acf2a06d851feb2855933.tar.gz linux-stable-d6c1a9081080c6c4658acf2a06d851feb2855933.tar.bz2 linux-stable-d6c1a9081080c6c4658acf2a06d851feb2855933.zip | |
[PATCH] powerpc: Disable and EOI interrupts in machine_crash_shutdown()
We've seen several bugs caused by interrupt weirdness in the kdump kernel.
Panicking from an interrupt handler means we fail to EOI the interrupt, and
so the second kernel never gets that interrupt ever again. We also see hangs
on JS20 where we take interrupts in the second kernel early during boot.
This patch fixes both those problems, and although it adds more code to the
crash path I think it is the best solution.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/crash.c')
| -rw-r--r-- | arch/powerpc/kernel/crash.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 778f22fd85d2..dbcb85994f46 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -22,6 +22,7 @@ #include <linux/elf.h> #include <linux/elfcore.h> #include <linux/init.h> +#include <linux/irq.h> #include <linux/types.h> #include <asm/processor.h> @@ -174,6 +175,8 @@ static void crash_kexec_prepare_cpus(void) void default_machine_crash_shutdown(struct pt_regs *regs) { + unsigned int irq; + /* * This function is only called after the system * has paniced or is otherwise in a critical state. @@ -186,6 +189,16 @@ void default_machine_crash_shutdown(struct pt_regs *regs) */ local_irq_disable(); + for_each_irq(irq) { + struct irq_desc *desc = irq_descp(irq); + + if (desc->status & IRQ_INPROGRESS) + desc->handler->end(irq); + + if (!(desc->status & IRQ_DISABLED)) + desc->handler->disable(irq); + } + if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down(1, 0); |