]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
powerpc/kdump: Use chip->shutdown to disable IRQs
authorAnton Blanchard <anton@samba.org>
Mon, 10 May 2010 16:27:38 +0000 (16:27 +0000)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Sun, 26 Jun 2011 16:46:57 +0000 (12:46 -0400)
commit 5d7a87217de48b234b3c8ff8a73059947d822e07 upstream.

I saw this in a kdump kernel:

IOMMU table initialized, virtual merging enabled
Interrupt 155954 (real) is invalid, disabling it.
Interrupt 155953 (real) is invalid, disabling it.

ie we took some spurious interrupts. default_machine_crash_shutdown tries
to disable all interrupt sources but uses chip->disable which maps to
the default action of:

static void default_disable(unsigned int irq)
{
}

If we use chip->shutdown, then we actually mask the IRQ:

static void default_shutdown(unsigned int irq)
{
        struct irq_desc *desc = irq_to_desc(irq);

        desc->chip->mask(irq);
        desc->status |= IRQ_MASKED;
}

Not sure why we don't implement a ->disable action for xics.c, or why
default_disable doesn't mask the interrupt.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
arch/powerpc/kernel/crash.c

index fbe3c1c93bd638e18f8f303a53211a2e017964f1..038437621de855b88856ce1b8f717df76b50dfc2 100644 (file)
@@ -381,7 +381,7 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
                        desc->chip->eoi(i);
 
                if (!(desc->status & IRQ_DISABLED))
-                       desc->chip->disable(i);
+                       desc->chip->shutdown(i);
        }
 
        /*