git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1efa8a5
)
x86: hpet: Fix masking of MSI interrupts
author
Jan Beulich
<JBeulich@suse.com>
Fri, 2 Nov 2012 14:02:40 +0000
(14:02 +0000)
committer
Ben Hutchings
<ben@decadent.org.uk>
Thu, 3 Jan 2013 03:33:01 +0000
(
03:33
+0000)
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: Ben Hutchings <ben@decadent.org.uk>
arch/x86/kernel/hpet.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/hpet.c
b/arch/x86/kernel/hpet.c
index
1bb0bf4
..
4970ef0
100644
(file)
--- a/
arch/x86/kernel/hpet.c
+++ b/
arch/x86/kernel/hpet.c
@@
-429,7
+429,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));
}
@@
-440,7
+440,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));
}