]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.9-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2017 13:37:01 +0000 (14:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2017 13:37:01 +0000 (14:37 +0100)
added patches:
revert-x86-ioapic-restore-io-apic-irq_chip-retrigger-callback.patch

queue-4.9/revert-x86-ioapic-restore-io-apic-irq_chip-retrigger-callback.patch [new file with mode: 0644]
queue-4.9/series

diff --git a/queue-4.9/revert-x86-ioapic-restore-io-apic-irq_chip-retrigger-callback.patch b/queue-4.9/revert-x86-ioapic-restore-io-apic-irq_chip-retrigger-callback.patch
new file mode 100644 (file)
index 0000000..37cc8d8
--- /dev/null
@@ -0,0 +1,57 @@
+From d966564fcdc19e13eb6ba1fbe6b8101070339c3d Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Wed, 8 Feb 2017 18:08:29 -0800
+Subject: Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
+
+From: Linus Torvalds <torvalds@linux-foundation.org>
+
+commit d966564fcdc19e13eb6ba1fbe6b8101070339c3d upstream.
+
+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>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/apic/io_apic.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -1876,7 +1876,6 @@ static struct irq_chip ioapic_chip __rea
+       .irq_ack                = irq_chip_ack_parent,
+       .irq_eoi                = ioapic_ack_level,
+       .irq_set_affinity       = ioapic_set_affinity,
+-      .irq_retrigger          = irq_chip_retrigger_hierarchy,
+       .flags                  = IRQCHIP_SKIP_SET_WAKE,
+ };
+@@ -1888,7 +1887,6 @@ static struct irq_chip ioapic_ir_chip __
+       .irq_ack                = irq_chip_ack_parent,
+       .irq_eoi                = ioapic_ir_ack_level,
+       .irq_set_affinity       = ioapic_set_affinity,
+-      .irq_retrigger          = irq_chip_retrigger_hierarchy,
+       .flags                  = IRQCHIP_SKIP_SET_WAKE,
+ };
index 8a4d4039ca8e38d6a9305ac85954f03471496207..44da863a1924575c89f934b7ac4b43ab688c3592 100644 (file)
@@ -12,3 +12,4 @@ crypto-ccp-fix-double-add-when-creating-new-dma-command.patch
 arc-brown-paper-bag-bug-in-unaligned-access-delay-slot-fixup.patch
 input-uinput-fix-crash-when-mixing-old-and-new-init-style.patch
 selinux-fix-off-by-one-in-setprocattr.patch
+revert-x86-ioapic-restore-io-apic-irq_chip-retrigger-callback.patch