| Message ID | 20190304220022.20682-1-tomli@tomli.me (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5f5f67da9781770df0403269bc57d7aae608fecd |
| Headers | show |
| Series | mips: loongson64: lemote-2f: Add IRQF_NO_SUSPEND to "cascade" irqaction. | expand |
Hello, Yifeng Li wrote: > Timekeeping IRQs from CS5536 MFGPT are routed to i8259, which then > triggers the "cascade" IRQ on MIPS CPU. Without IRQF_NO_SUSPEND in > cascade_irqaction, MFGPT interrupts will be masked in suspend mode, > and the machine would be unable to resume once suspended. > > Previously, MIPS IRQs were not disabled properly, so the original > code appeared to work. Commit a3e6c1eff5 (MIPS: IRQ: Fix disable_irq > on CPU IRQs) uncovers the bug. To fix it, add IRQF_NO_SUSPEND to > cascade_irqaction. > > This commit is functionally identical to 0add9c2f1cff ("MIPS: > Loongson-3: Add IRQF_NO_SUSPEND to Cascade irqaction"), but it forgot > to apply the same fix to Loongson2. > > Signed-off-by: Yifeng Li <tomli@tomli.me> Applied to mips-fixes. Thanks, Paul [ This message was auto-generated; if you believe anything is incorrect then please email paul.burton@mips.com to report it. ]
diff --git a/arch/mips/loongson64/lemote-2f/irq.c b/arch/mips/loongson64/lemote-2f/irq.c index 9e33e45aa17c..b213cecb8e3a 100644 --- a/arch/mips/loongson64/lemote-2f/irq.c +++ b/arch/mips/loongson64/lemote-2f/irq.c @@ -103,7 +103,7 @@ static struct irqaction ip6_irqaction = { static struct irqaction cascade_irqaction = { .handler = no_action, .name = "cascade", - .flags = IRQF_NO_THREAD, + .flags = IRQF_NO_THREAD | IRQF_NO_SUSPEND, }; void __init mach_init_irq(void)
Timekeeping IRQs from CS5536 MFGPT are routed to i8259, which then triggers the "cascade" IRQ on MIPS CPU. Without IRQF_NO_SUSPEND in cascade_irqaction, MFGPT interrupts will be masked in suspend mode, and the machine would be unable to resume once suspended. Previously, MIPS IRQs were not disabled properly, so the original code appeared to work. Commit a3e6c1eff5 (MIPS: IRQ: Fix disable_irq on CPU IRQs) uncovers the bug. To fix it, add IRQF_NO_SUSPEND to cascade_irqaction. This commit is functionally identical to 0add9c2f1cff ("MIPS: Loongson-3: Add IRQF_NO_SUSPEND to Cascade irqaction"), but it forgot to apply the same fix to Loongson2. Signed-off-by: Yifeng Li <tomli@tomli.me> --- arch/mips/loongson64/lemote-2f/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)