Attachment 271691 Details for Bug 403431 – RT fix for this issue

[patch] RT fix for this issue

rt_nmi.patch (text/plain), 3.98 KB, created by Prarit Bhargava on 2007-11-28 20:14:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2007-11-28 20:14:14 UTC

Size: 3.98 KB

patch

obsolete

>--- linux-2.6.21.x86_64.orig/arch/x86_64/kernel/nmi.c	2007-11-28 11:40:44.000000000 -0500
>+++ linux-2.6.21.x86_64/arch/x86_64/kernel/nmi.c	2007-11-28 15:09:27.000000000 -0500
>@@ -251,42 +251,14 @@ static __cpuinit inline int nmi_known_cp
> }
> 
> /* Run after command line and cpu_init init, but before all other checks */
>-static inline void nmi_watchdog_default(void)
>+void __cpuinit nmi_watchdog_default(void)
> {
> 	if (nmi_watchdog != NMI_DEFAULT)
> 		return;
>-
>-	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)
>-			return;
>+	if (nmi_known_cpu())
> 		nmi_watchdog = NMI_LOCAL_APIC;
>-		break;
>-	case X86_VENDOR_INTEL:
>-		/* Work around Core Duo (Yonah) errata AE49 where perfctr1
>-		   doesn't have a working enable bit. */
>-		if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 14) {
>-			nmi_watchdog = NMI_LOCAL_APIC;
>-			break;
>-		}
>-		switch (boot_cpu_data.x86) {
>-		case 6:
>-			if (boot_cpu_data.x86_model > 0xd)
>-				return;
>-			nmi_watchdog = NMI_LOCAL_APIC;
>-			break;
>-		case 15:
>-			if (boot_cpu_data.x86_model > 0x4)
>-				return;
>-
>-			nmi_watchdog = NMI_LOCAL_APIC;
>-			break;
>-		default:
>-			return;
>-		}
>-		break;
>-	}
>+	else
>+		nmi_watchdog = NMI_IO_APIC;
> }
> 
> static int endflag __initdata = 0;
>@@ -831,6 +803,9 @@ void setup_apic_nmi_watchdog(void *unuse
> 	if (nmi_watchdog == NMI_LOCAL_APIC) {
> 		switch (boot_cpu_data.x86_vendor) {
> 		case X86_VENDOR_AMD:
>+			if ((boot_cpu_data.x86 != 15) ||
>+			    (boot_cpu_data.x86 != 16))
>+				return;
> 			if (strstr(boot_cpu_data.x86_model_id, "Screwdriver"))
> 				return;
> 			if (!setup_k7_watchdog())
>@@ -841,9 +816,13 @@ void setup_apic_nmi_watchdog(void *unuse
> 				if (!setup_intel_arch_watchdog())
> 					return;
> 				break;
>-			}
>-			if (!setup_p4_watchdog())
>+			} else if (boot_cpu_data.x86 == 15) {
>+				if (!setup_p4_watchdog())
>+					return;
>+			} else {
> 				return;
>+			}
>+
> 			break;
> 		default:
> 			return;
>--- linux-2.6.21.x86_64.orig/arch/i386/kernel/nmi.c	2007-11-28 11:40:44.000000000 -0500
>+++ linux-2.6.21.x86_64/arch/i386/kernel/nmi.c	2007-11-28 15:00:15.000000000 -0500
>@@ -253,56 +253,27 @@ static __cpuinit inline int nmi_known_cp
> {
> 	switch (boot_cpu_data.x86_vendor) {
> 	case X86_VENDOR_AMD:
>-		return ((boot_cpu_data.x86 == 15) || (boot_cpu_data.x86 == 6)
>+		return ((boot_cpu_data.x86 == 6) || (boot_cpu_data.x86 == 15)
> 			|| (boot_cpu_data.x86 == 16));
> 	case X86_VENDOR_INTEL:
> 		if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON))
> 			return 1;
> 		else
>-			return ((boot_cpu_data.x86 == 15) || (boot_cpu_data.x86 == 6));
>+			return (boot_cpu_data.x86 == 15);
> 	}
> 	return 0;
> }
> 
> /* Run after command line and cpu_init init, but before all other checks */
>-static inline void nmi_watchdog_default(void)
>+void __cpuinit nmi_watchdog_default(void)
> {
> 	if (nmi_watchdog != NMI_DEFAULT)
> 		return;
>-
>-	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)
>-			return;
>+	if (nmi_known_cpu())
> 		nmi_watchdog = NMI_LOCAL_APIC;
>-		break;
>-	case X86_VENDOR_INTEL:
>-		/* Work around Core Duo (Yonah) errata AE49 where perfctr1
>-		   doesn't have a working enable bit. */
>-		if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 14) {
>-			nmi_watchdog = NMI_LOCAL_APIC;
>-			break;
>-		}
>-		switch (boot_cpu_data.x86) {
>-		case 6:
>-			if (boot_cpu_data.x86_model > 0xd)
>-				return;
>-			nmi_watchdog = NMI_LOCAL_APIC;
>-			break;
>-		case 15:
>-			if (boot_cpu_data.x86_model > 0x4)
>-				return;
>-
>-			nmi_watchdog = NMI_LOCAL_APIC;
>-			break;
>-		default:
>-			return;
>-		}
>-		break;
>-	}
>+	else
>+		nmi_watchdog = NMI_IO_APIC;
> }
>-
> static int endflag __initdata = 0;
> 
> #ifdef CONFIG_SMP
>@@ -925,7 +896,7 @@ void setup_apic_nmi_watchdog (void *unus
> 		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)
> 				return;
> 			if (!setup_k7_watchdog())
> 				return;

Actions: View | Diff

Attachments on bug 403431: 271691