Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7d1849aff6687a135a8da3a75e32a00e3137a5e2

Authored by Mikael Pettersson
Committed by Ingo Molnar
1 parent 6d20792e85
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

x86, apic: Enable lapic nmi watchdog on AMD Family 11h 

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>
Cc: <stable@kernel.org>
LKML-Reference: <19223.53436.931768.278021@pilspetsen.it.uu.se>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/x86/kernel/cpu/perfctr-watchdog.c
Diff comments   View file @ 7d1849a
... ... @@ -712,7 +712,7 @@
712 712 switch (boot_cpu_data.x86_vendor) {
713 713 case X86_VENDOR_AMD:
714 714 if (boot_cpu_data.x86 != 6 && boot_cpu_data.x86 != 15 &&
715   - boot_cpu_data.x86 != 16)
  715 + boot_cpu_data.x86 != 16 && boot_cpu_data.x86 != 17)
716 716 return;
717 717 wd_ops = &k7_wd_ops;
718 718 break;