genirq: Make legacy autoprobing work again

KAGA-KOKO · KAGA-KOKO · commit 1beaeacdc88b · 2018-02-01T11:09:40.000+01:00
Meelis reported the following warning on a quad P3 HP NetServer museum piece: WARNING: CPU: 3 PID: 258 at kernel/irq/chip.c:244 __irq_startup+0x80/0x100 EIP: __irq_startup+0x80/0x100 irq_startup+0x7e/0x170 probe_irq_on+0x128/0x2b0 parport_irq_probe.constprop.18+0x8d/0x1af [parport_pc] parport_pc_probe_port+0xf11/0x1260 [parport_pc] parport_pc_init+0x78a/0xf10 [parport_pc] parport_parse_param.constprop.16+0xf0/0xf0 [parport_pc] do_one_initcall+0x45/0x1e0 This is caused by the rewrite of the irq activation/startup sequence which missed to convert a callsite in the irq legacy auto probing code. To fix this irq_activate_and_startup() needs to gain a return value so the pending logic can work proper. Fixes: c942cee ("genirq: Separate activation and startup") Reported-by: Meelis Roos <mroos@linux.ee> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Meelis Roos <mroos@linux.ee> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/alpine.DEB.2.20.1801301935410.1797@nanos
diff --git a/kernel/irq/autoprobe.c b/kernel/irq/autoprobe.c
@@ -71,7 +71,7 @@ unsigned long probe_irq_on(void)
 		raw_spin_lock_irq(&desc->lock);
 		if (!desc->action && irq_settings_can_probe(desc)) {
 			desc->istate |= IRQS_AUTODETECT | IRQS_WAITING;
-			if (irq_startup(desc, IRQ_NORESEND, IRQ_START_FORCE))
+			if (irq_activate_and_startup(desc, IRQ_NORESEND))
 				desc->istate |= IRQS_PENDING;
 		}
 		raw_spin_unlock_irq(&desc->lock);
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
@@ -294,11 +294,11 @@ int irq_activate(struct irq_desc *desc)
 	return 0;
 }
 
-void irq_activate_and_startup(struct irq_desc *desc, bool resend)
+int irq_activate_and_startup(struct irq_desc *desc, bool resend)
 {
 	if (WARN_ON(irq_activate(desc)))
-		return;
-	irq_startup(desc, resend, IRQ_START_FORCE);
+		return 0;
+	return irq_startup(desc, resend, IRQ_START_FORCE);
 }
 
 static void __irq_disable(struct irq_desc *desc, bool mask);
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
@@ -76,7 +76,7 @@ extern void __enable_irq(struct irq_desc *desc);
 #define IRQ_START_COND	false
 
 extern int irq_activate(struct irq_desc *desc);
-extern void irq_activate_and_startup(struct irq_desc *desc, bool resend);
+extern int irq_activate_and_startup(struct irq_desc *desc, bool resend);
 extern int irq_startup(struct irq_desc *desc, bool resend, bool force);
 
 extern void irq_shutdown(struct irq_desc *desc);

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ unsigned long probe_irq_on(void)`
`71`	`71`	`raw_spin_lock_irq(&desc->lock);`
`72`	`72`	`if (!desc->action && irq_settings_can_probe(desc)) {`
`73`	`73`	`desc->istate \|= IRQS_AUTODETECT \| IRQS_WAITING;`
`74`		`- if (irq_startup(desc, IRQ_NORESEND, IRQ_START_FORCE))`
	`74`	`+ if (irq_activate_and_startup(desc, IRQ_NORESEND))`
`75`	`75`	`desc->istate \|= IRQS_PENDING;`
`76`	`76`	`}`
`77`	`77`	`raw_spin_unlock_irq(&desc->lock);`
Original file line number	Diff line number	Diff line change
`@@ -294,11 +294,11 @@ int irq_activate(struct irq_desc *desc)`
`294`	`294`	`return 0;`
`295`	`295`	`}`
`296`	`296`
`297`		`-void irq_activate_and_startup(struct irq_desc *desc, bool resend)`
	`297`	`+int irq_activate_and_startup(struct irq_desc *desc, bool resend)`
`298`	`298`	`{`
`299`	`299`	`if (WARN_ON(irq_activate(desc)))`
`300`		`- return;`
`301`		`- irq_startup(desc, resend, IRQ_START_FORCE);`
	`300`	`+ return 0;`
	`301`	`+ return irq_startup(desc, resend, IRQ_START_FORCE);`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`static void __irq_disable(struct irq_desc *desc, bool mask);`