diff options
| author | Jan Beulich <JBeulich@suse.com> | 2012-11-02 14:02:40 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-17 10:49:03 -0800 |
| commit | 29a4f067f96ca79c1090e09c1bb83f3c167b43ac (patch) | |
| tree | 1896404679d7be7176df88bb6aa13291a77cb945 /arch/x86/kernel/hpet.c | |
| parent | 15487eba1006de0db3c8d9f78ef16700a4d0a217 (diff) | |
| download | kernel_samsung_smdk4412-29a4f067f96ca79c1090e09c1bb83f3c167b43ac.tar.gz kernel_samsung_smdk4412-29a4f067f96ca79c1090e09c1bb83f3c167b43ac.tar.bz2 kernel_samsung_smdk4412-29a4f067f96ca79c1090e09c1bb83f3c167b43ac.zip | |
x86: hpet: Fix masking of MSI interrupts
commit 6acf5a8c931da9d26c8dd77d784daaf07fa2bff0 upstream.
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>
Link: http://lkml.kernel.org/r/5093E09002000078000A60E6@nat28.tlf.novell.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
| -rw-r--r-- | arch/x86/kernel/hpet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index aa083d35074..0aa649ee563 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -427,7 +427,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)); } @@ -438,7 +438,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)); } |