MIPS: BMIPS: Do not mask IPIs during suspend

Ryceancurry · amalon · commit 06a3f0c9f272 · 2018-03-05T23:35:04.000Z
Commit a3e6c1e ("MIPS: IRQ: Fix disable_irq on CPU IRQs") fixes an issue where disable_irq did not actually disable the irq. The bug caused our IPIs to not be disabled, which actually is the correct behavior. With the addition of commit a3e6c1e ("MIPS: IRQ: Fix disable_irq on CPU IRQs"), the IPIs were getting disabled going into suspend, thus schedule_ipi() was not being called. This caused deadlocks where schedulable task were not being scheduled and other cpus were waiting for them to do something. Add the IRQF_NO_SUSPEND flag so an irq_disable will not be called on the IPIs during suspend. Signed-off-by: Justin Chen <justinpopo6@gmail.com> Fixes: a3e6c1e ("MIPS: IRQ: Fix disabled_irq on CPU IRQs") Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/17385/ [jhogan@kernel.org: checkpatch: wrap long lines and fix commit refs] Signed-off-by: James Hogan <jhogan@kernel.org>
diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
@@ -168,11 +168,11 @@ static void bmips_prepare_cpus(unsigned int max_cpus)
 		return;
 	}
 
-	if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
-			"smp_ipi0", NULL))
+	if (request_irq(IPI0_IRQ, bmips_ipi_interrupt,
+			IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi0", NULL))
 		panic("Can't request IPI0 interrupt");
-	if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
-			"smp_ipi1", NULL))
+	if (request_irq(IPI1_IRQ, bmips_ipi_interrupt,
+			IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi1", NULL))
 		panic("Can't request IPI1 interrupt");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -168,11 +168,11 @@ static void bmips_prepare_cpus(unsigned int max_cpus)`
`168`	`168`	`return;`
`169`	`169`	`}`
`170`	`170`
`171`		`- if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,`
`172`		`- "smp_ipi0", NULL))`
	`171`	`+ if (request_irq(IPI0_IRQ, bmips_ipi_interrupt,`
	`172`	`+ IRQF_PERCPU \| IRQF_NO_SUSPEND, "smp_ipi0", NULL))`
`173`	`173`	`panic("Can't request IPI0 interrupt");`
`174`		`- if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,`
`175`		`- "smp_ipi1", NULL))`
	`174`	`+ if (request_irq(IPI1_IRQ, bmips_ipi_interrupt,`
	`175`	`+ IRQF_PERCPU \| IRQF_NO_SUSPEND, "smp_ipi1", NULL))`
`176`	`176`	`panic("Can't request IPI1 interrupt");`
`177`	`177`	`}`
`178`	`178`