Skip to contentSkip to conversation

Patch "Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Feb 10, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"

to the 4.9-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:
revert-x86-ioapic-restore-io-apic-irq_chip-retrigger-callback.patch
and it can be found in the queue-4.9 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 d966564fcdc19e13eb6ba1fbe6b8101070339c3d Mon Sep 17 00:00:00 2001

From: Linus Torvalds <[email protected]>
Date: Wed, 8 Feb 2017 18:08:29 -0800
Subject: Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"

From: Linus Torvalds <[email protected]>

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 :

Quoted 2 lines

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 <[email protected]>
Cc Ruslan Ruslichenko <[email protected]>
Cc Thomas Gleixner <[email protected]>
---
 arch/x86/kernel/apic/io_apic.c |    2 --
 1 file changed, 2 deletions(-)
arch/x86/kernel/apic/io_apic.c +0 -2
@@ -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,
 };
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/revert-x86-ioapic-restore-io-apic-irq_chip-retrigger-callback.patch queue-4.9/arc-brown-paper-bag-bug-in-unaligned-access-delay-slot-fixup.patch