Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 420b13b6 authored by Andreas Herrmann's avatar Andreas Herrmann Committed by H. Peter Anvin
Browse files

x86, nmi: Support NMI watchdog on newer AMD CPU families 



CPU families 0x12, 0x14 and 0x15 support this functionality.

Signed-off-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
LKML-Reference: <20100930123357.GC20545@loge.amd.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 3fdbf004

arch/x86/kernel/cpu/perfctr-watchdog.c

+4 −5
Original line number Diff line number Diff line
@@ -700,11 +700,10 @@ 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 != 17)

			return;

		if (boot_cpu_data.x86 == 6 ||

		    (boot_cpu_data.x86 >= 0xf && boot_cpu_data.x86 <= 0x15))

			wd_ops = &k7_wd_ops;

		break;

		return;

	case X86_VENDOR_INTEL:

		/* Work around where perfctr1 doesn't have a working enable

		 * bit as described in the following errata: