diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-08 21:08:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-08 21:08:29 -0500 |
commit | d966564fcdc19e13eb6ba1fbe6b8101070339c3d (patch) | |
tree | ed5dd611aef574c765a342ae9c7219d9c65e796f | |
parent | 3b802c9455f973fa786eafb4d5bd4634a7dd5130 (diff) |
Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
This reverts commit 020eb3daaba2857b32c4cf4c82f503d6a00a67de.
Gabriel C reports that it causes his machine to not boot, and we haven't
tracked down the reason for it yet. Since the bug it fixes has been
around for a longish time, we're better off reverting the fix for now.
Gabriel says:
"It hangs early and freezes with a lot RCU warnings.
I bisected it down to :
> Ruslan Ruslichenko (1):
> x86/ioapic: Restore IO-APIC irq_chip retrigger callback
Reverting this one fixes the problem for me..
The box is a PRIMERGY TX200 S5 , 2 socket , 2 x E5520 CPU(s) installed"
and Ruslan and Thomas are currently stumped.
Reported-and-bisected-by: Gabriel C <nix.or.die@gmail.com>
Cc: Ruslan Ruslichenko <rruslich@cisco.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@kernel.org # for the backport of the original commit
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 52f352b063fd..bd6b8c270c24 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -1875,7 +1875,6 @@ static struct irq_chip ioapic_chip __read_mostly = { | |||
1875 | .irq_ack = irq_chip_ack_parent, | 1875 | .irq_ack = irq_chip_ack_parent, |
1876 | .irq_eoi = ioapic_ack_level, | 1876 | .irq_eoi = ioapic_ack_level, |
1877 | .irq_set_affinity = ioapic_set_affinity, | 1877 | .irq_set_affinity = ioapic_set_affinity, |
1878 | .irq_retrigger = irq_chip_retrigger_hierarchy, | ||
1879 | .flags = IRQCHIP_SKIP_SET_WAKE, | 1878 | .flags = IRQCHIP_SKIP_SET_WAKE, |
1880 | }; | 1879 | }; |
1881 | 1880 | ||
@@ -1887,7 +1886,6 @@ static struct irq_chip ioapic_ir_chip __read_mostly = { | |||
1887 | .irq_ack = irq_chip_ack_parent, | 1886 | .irq_ack = irq_chip_ack_parent, |
1888 | .irq_eoi = ioapic_ir_ack_level, | 1887 | .irq_eoi = ioapic_ir_ack_level, |
1889 | .irq_set_affinity = ioapic_set_affinity, | 1888 | .irq_set_affinity = ioapic_set_affinity, |
1890 | .irq_retrigger = irq_chip_retrigger_hierarchy, | ||
1891 | .flags = IRQCHIP_SKIP_SET_WAKE, | 1889 | .flags = IRQCHIP_SKIP_SET_WAKE, |
1892 | }; | 1890 | }; |
1893 | 1891 | ||