genirq: Make force irq threading setup more robust

The support of force threading interrupts which are set up with both a
primary and a threaded handler wreckaged the setup of regular requested
threaded interrupts (primary handler == NULL).

The reason is that it does not check whether the primary handler is set to
the default handler which wakes the handler thread. Instead it replaces the
thread handler with the primary handler as it would do with force threaded
interrupts which have been requested via request_irq(). So both the primary
and the thread handler become the same which then triggers the warnon that
the thread handler tries to wakeup a not configured secondary thread.

Fortunately this only happens when the driver omits the IRQF_ONESHOT flag
when requesting the threaded interrupt, which is normaly caught by the
sanity checks when force irq threading is disabled.

Fix it by skipping the force threading setup when a regular threaded
interrupt is requested. As a consequence the interrupt request which lacks
the IRQ_ONESHOT flag is rejected correctly instead of silently wreckaging
it.

Fixes: 2a1d3ab8986d ("genirq: Handle force threading of irqs with primary and thread handler")
Reported-by: Kurt Kanzenbach <kurt.kanzenbach@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Kurt Kanzenbach <kurt.kanzenbach@linutronix.de>
Cc: stable@vger.kernel.org

+8 -1
+8 -1
kernel/irq/manage.c
··· 1068 if (new->flags & (IRQF_NO_THREAD | IRQF_PERCPU | IRQF_ONESHOT)) 1069 return 0; 1070 1071 new->flags |= IRQF_ONESHOT; 1072 1073 /* ··· 1082 * thread handler. We force thread them as well by creating a 1083 * secondary action. 1084 */ 1085 - if (new->handler != irq_default_primary_handler && new->thread_fn) { 1086 /* Allocate the secondary action */ 1087 new->secondary = kzalloc(sizeof(struct irqaction), GFP_KERNEL); 1088 if (!new->secondary)
··· 1068 if (new->flags & (IRQF_NO_THREAD | IRQF_PERCPU | IRQF_ONESHOT)) 1069 return 0; 1070 1071 + /* 1072 + * No further action required for interrupts which are requested as 1073 + * threaded interrupts already 1074 + */ 1075 + if (new->handler == irq_default_primary_handler) 1076 + return 0; 1077 + 1078 new->flags |= IRQF_ONESHOT; 1079 1080 /* ··· 1075 * thread handler. We force thread them as well by creating a 1076 * secondary action. 1077 */ 1078 + if (new->handler && new->thread_fn) { 1079 /* Allocate the secondary action */ 1080 new->secondary = kzalloc(sizeof(struct irqaction), GFP_KERNEL); 1081 if (!new->secondary)