Patch "genirq: Make legacy autoprobing work again" has been added to the 4.15-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
genirq: Make legacy autoprobing work again
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
genirq-make-legacy-autoprobing-work-again.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
1beaeacdc88b537703d04d5536235d0bbb36db93Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <[email protected]>
Date: Tue, 30 Jan 2018 19:36:32 +0100
Subject: genirq: Make legacy autoprobing work again
From: Thomas Gleixner <[email protected]>
commit 1beaeacdc88b537703d04d5536235d0bbb36db93 upstream.
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.
--- kernel/irq/autoprobe.c | 2 +- kernel/irq/chip.c | 6 +++--- kernel/irq/internals.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
kernel/irq/autoprobe.c +1 -1
@@ -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);
kernel/irq/chip.c +3 -3
@@ -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);
kernel/irq/internals.h +1 -1
@@ -76,7 +76,7 @@ extern void __enable_irq(struct irq_desc#define IRQ_START_COND falseextern 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);
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/clocksource-drivers-stm32-fix-kernel-panic-with-multiple-timers.patch queue-4.15/genirq-make-legacy-autoprobing-work-again.patch queue-4.15/sched-rt-use-container_of-to-get-root-domain-in-rto_push_irq_work_func.patch queue-4.15/sched-rt-up-the-root-domain-ref-count-when-passing-it-around-via-ipis.patch