lkml.org 
[lkml]   [2009]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[09/18] x86, apic: Enable lapic nmi watchdog on AMD Family 11h
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------
    From: Mikael Pettersson <mikpe@it.uu.se>
    commit 7d1849aff6687a135a8da3a75e32a00e3137a5e2 upstream.

    The x86 lapic nmi watchdog does not recognize AMD Family 11h,
    resulting in:

    NMI watchdog: CPU not supported

    As far as I can see from available documentation (the BKDM),
    family 11h looks identical to family 10h as far as the PMU
    is concerned.

    Extending the check to accept family 11h results in:

    Testing NMI watchdog ... OK.

    I've been running with this change on a Turion X2 Ultra ZM-82
    laptop for a couple of weeks now without problems.

    Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
    Cc: Andreas Herrmann <andreas.herrmann3@amd.com>
    Cc: Joerg Roedel <joerg.roedel@amd.com>
    LKML-Reference: <19223.53436.931768.278021@pilspetsen.it.uu.se>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)
    --- a/arch/x86/kernel/cpu/perfctr-watchdog.c
    +++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
    @@ -646,7 +646,7 @@ static void probe_nmi_watchdog(void)
    switch (boot_cpu_data.x86_vendor) {
    case X86_VENDOR_AMD:
    if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15 &&
    - boot_cpu_data.x86 != 16)
    + boot_cpu_data.x86 != 16 && boot_cpu_data.x86 != 17)
    return;
    wd_ops = &k7_wd_ops;
    break;



    \
     
     \ /
      Last update: 2009-12-17 01:59    [from the cache]
    ©2003-2011 Jasper Spaans. Advertise on this site