diff options
author | Pallipadi, Venkatesh <venkatesh.pallipadi@intel.com> | 2010-01-21 11:09:52 -0800 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-01-23 06:21:58 +0100 |
commit | 73472a46b5b28116b145fb5fc05242c1aa8e1461 (patch) | |
tree | bbcb6174edb2ea3c94e64bbfe7f92f3f128d96d3 /arch/x86/include/asm/hpet.h | |
parent | 3a5fc0e40cb467e692737bc798bc99773c81e1e2 (diff) | |
download | linux-stable-73472a46b5b28116b145fb5fc05242c1aa8e1461.tar.gz linux-stable-73472a46b5b28116b145fb5fc05242c1aa8e1461.tar.bz2 linux-stable-73472a46b5b28116b145fb5fc05242c1aa8e1461.zip |
x86: Disable HPET MSI on ATI SB700/SB800
HPET MSI on platforms with ATI SB700/SB800 as they seem to have some
side-effects on floppy DMA. Do not use HPET MSI on such platforms.
Original problem report from Mark Hounschell
http://lkml.indiana.edu/hypermail/linux/kernel/0912.2/01118.html
[ This patch needs to go to stable as well. But, there are some
conflicts that prevents the patch from going as is. I can
rebase/resubmit to stable once the patch goes upstream.
hpa: still Cc:'ing stable@ as an FYI. ]
Tested-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: <stable@kernel.org>
LKML-Reference: <20100121190952.GA32523@linux-os.sc.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm/hpet.h')
-rw-r--r-- | arch/x86/include/asm/hpet.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h index 5d89fd2a3690..1d5c08a1bdfd 100644 --- a/arch/x86/include/asm/hpet.h +++ b/arch/x86/include/asm/hpet.h @@ -67,6 +67,7 @@ extern unsigned long hpet_address; extern unsigned long force_hpet_address; extern u8 hpet_blockid; extern int hpet_force_user; +extern u8 hpet_msi_disable; extern int is_hpet_enabled(void); extern int hpet_enable(void); extern void hpet_disable(void); |