Commit 6acf5a8c authored Nov 02, 2012 by Jan Beulich Committed by Thomas Gleixner Nov 02, 2012

x86: hpet: Fix masking of MSI interrupts



HPET_TN_FSB is not a proper mask bit; it merely toggles between MSI and
legacy interrupt delivery. The proper mask bit is HPET_TN_ENABLE, so
use both bits when (un)masking the interrupt.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/5093E09002000078000A60E6@nat28.tlf.novell.com


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 279f1461

arch/x86/kernel/hpet.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -434,7 +434,7 @@ void hpet_msi_unmask(struct irq_data *data)

		/* unmask it */
		cfg = hpet_readl(HPET_Tn_CFG(hdev->num));
		cfg \|= HPET_TN_FSB;
		cfg \|= HPET_TN_ENABLE \| HPET_TN_FSB;
		hpet_writel(cfg, HPET_Tn_CFG(hdev->num));
		}

		@@ -445,7 +445,7 @@ void hpet_msi_mask(struct irq_data *data)

		/* mask it */
		cfg = hpet_readl(HPET_Tn_CFG(hdev->num));
		cfg &= ~HPET_TN_FSB;
		cfg &= ~(HPET_TN_ENABLE \| HPET_TN_FSB);
		hpet_writel(cfg, HPET_Tn_CFG(hdev->num));
		}

Admin message