[PATCH 1/1] I have a board it block on i8259A_shutdown when I want to poweroff. It is not always re-produce.

[Figo <tianfei.zhang@intel.com>]

There is the log:
[   27.758391] xhci_hcd 0000:00:14.0: shutdown start
[   27.768329] xhci_hcd 0000:00:14.0: shutdown stop
[   27.773532] pci 0000:00:0b.0: shutdown start
[   27.778335] pci 0000:00:0b.0: shutdown stop
[   27.783041] pci 0000:00:0a.0: shutdown start
[   27.787847] pci 0000:00:0a.0: shutdown stop
[   27.792550] pci 0000:00:03.0: shutdown start
[   27.797362] pci 0000:00:03.0: shutdown stop
[   27.802087] i915 0000:00:02.0: shutdown start
[   27.816006] i915 0000:00:02.0: shutdown stop
[   27.832384] PM: Calling mce_syscore_shutdown+0x0/0x50 start
[   27.838651] PM: Calling mce_syscore_shutdown+0x0/0x50 stop
[   27.844813] PM: Calling i8259A_shutdown+0x0/0x20 start

It seems has a potential race on i8259A_shutdown().

Signed-off-by: Figo <tianfei.zhang@intel.com>
---
 arch/x86/kernel/i8259.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
index 16cb827..06906d4 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -257,12 +257,16 @@ static int i8259A_suspend(void)
 
 static void i8259A_shutdown(void)
 {
+	unsigned long flags;
+
+	raw_spin_lock_irqsave(&i8259A_lock, flags);
 	/* Put the i8259A into a quiescent state that
 	 * the kernel initialization code can get it
 	 * out of.
 	 */
 	outb(0xff, PIC_MASTER_IMR);	/* mask all of 8259A-1 */
 	outb(0xff, PIC_SLAVE_IMR);	/* mask all of 8259A-2 */
+	raw_spin_unlock_irqrestore(&i8259A_lock, flags);
 }
 
 static struct syscore_ops i8259_syscore_ops = {
-- 
1.7.9.5