lkml.org 
[lkml]   [2010]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[34/74] x86: Disable HPET MSI on ATI SB700/SB800
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>

    commit 73472a46b5b28116b145fb5fc05242c1aa8e1461 upstream

    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

    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>

    ---
    arch/x86/include/asm/hpet.h | 1 +
    arch/x86/kernel/hpet.c | 8 ++++++++
    arch/x86/kernel/quirks.c | 13 +++++++++++++
    3 files changed, 22 insertions(+)

    --- a/arch/x86/include/asm/hpet.h
    +++ b/arch/x86/include/asm/hpet.h
    @@ -66,6 +66,7 @@
    extern unsigned long hpet_address;
    extern unsigned long force_hpet_address;
    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);
    --- a/arch/x86/kernel/hpet.c
    +++ b/arch/x86/kernel/hpet.c
    @@ -33,6 +33,8 @@
    * HPET address is set in acpi/boot.c, when an ACPI entry exists
    */
    unsigned long hpet_address;
    +u8 hpet_msi_disable;
    +
    #ifdef CONFIG_PCI_MSI
    static unsigned long hpet_num_timers;
    #endif
    @@ -584,6 +586,9 @@ static void hpet_msi_capability_lookup(u
    unsigned int num_timers_used = 0;
    int i;

    + if (hpet_msi_disable)
    + return;
    +
    id = hpet_readl(HPET_ID);

    num_timers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT);
    @@ -911,6 +916,9 @@ static __init int hpet_late_init(void)
    hpet_reserve_platform_timers(hpet_readl(HPET_ID));
    hpet_print_config();

    + if (hpet_msi_disable)
    + return 0;
    +
    for_each_online_cpu(cpu) {
    hpet_cpuhp_notify(NULL, CPU_ONLINE, (void *)(long)cpu);
    }
    --- a/arch/x86/kernel/quirks.c
    +++ b/arch/x86/kernel/quirks.c
    @@ -491,6 +491,19 @@ void force_hpet_resume(void)
    break;
    }
    }
    +
    +/*
    + * HPET MSI on some boards (ATI SB700/SB800) has side effect on
    + * floppy DMA. Disable HPET MSI on such platforms.
    + */
    +static void force_disable_hpet_msi(struct pci_dev *unused)
    +{
    + hpet_msi_disable = 1;
    +}
    +
    +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS,
    + force_disable_hpet_msi);
    +
    #endif

    #if defined(CONFIG_PCI) && defined(CONFIG_NUMA)



    \
     
     \ /
      Last update: 2010-02-04 18:29    [W:0.025 / U:2.552 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site