]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
MIPS: Loongson-3: Add IRQF_NO_SUSPEND to Cascade irqaction
authorHuacai Chen <chenhc@lemote.com>
Thu, 12 Mar 2015 03:51:06 +0000 (11:51 +0800)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 17 May 2015 23:11:51 +0000 (19:11 -0400)
[ Upstream commit 0add9c2f1cff9f3f1f2eb7e9babefa872a9d14b9 ]

HPET irq is routed to i8259 and then to MIPS CPU irq (cascade). After
commit a3e6c1eff5 (MIPS: IRQ: Fix disable_irq on CPU IRQs), if without
IRQF_NO_SUSPEND in cascade_irqaction, HPET interrupts will lost during
suspend. The result is machine cannot be waken up.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Cc: <stable@vger.kernel.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/9528/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
arch/mips/loongson/loongson-3/irq.c

index ca1c62af51885bd309e6eaed1ea37c18fa9747cd..8f5209aff01e765b472373c0db51502bf15a1aad 100644 (file)
@@ -44,6 +44,7 @@ void mach_irq_dispatch(unsigned int pending)
 
 static struct irqaction cascade_irqaction = {
        .handler = no_action,
+       .flags = IRQF_NO_SUSPEND,
        .name = "cascade",
 };