[PATCH] x86: also allow disabling LAPIC NMI watchdog on newer CPUs

[PATCH] x86: also allow disabling LAPIC NMI watchdog on newer CPUs

[Jan Beulich]

[-- Attachment #1: Type: text/plain, Size: 984 bytes --]

This complements c/s 9146:941897e98591, and also replaces a literal
zero with a proper manifest constant.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -175,15 +175,9 @@ static void disable_lapic_nmi_watchdog(v
     case X86_VENDOR_INTEL:
         switch (boot_cpu_data.x86) {
         case 6:
-            if (boot_cpu_data.x86_model > 0xd)
-                break;
-
             wrmsr(MSR_P6_EVNTSEL0, 0, 0);
             break;
         case 15:
-            if (boot_cpu_data.x86_model > 0x4)
-                break;
-
             wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
             wrmsr(MSR_P4_CRU_ESCR0, 0, 0);
             break;
@@ -192,7 +186,7 @@ static void disable_lapic_nmi_watchdog(v
     }
     nmi_active = -1;
     /* tell do_nmi() and others that we're not active any more */
-    nmi_watchdog = 0;
+    nmi_watchdog = NMI_NONE;
 }
 
 static void enable_lapic_nmi_watchdog(void)




[-- Attachment #2: x86-NMI-LAPIC-watchdog-disable.patch --]
[-- Type: text/plain, Size: 1040 bytes --]

x86: also allow disabling LAPIC NMI watchdog on newer CPUs

This complements c/s 9146:941897e98591, and also replaces a literal
zero with a proper manifest constant.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -175,15 +175,9 @@ static void disable_lapic_nmi_watchdog(v
     case X86_VENDOR_INTEL:
         switch (boot_cpu_data.x86) {
         case 6:
-            if (boot_cpu_data.x86_model > 0xd)
-                break;
-
             wrmsr(MSR_P6_EVNTSEL0, 0, 0);
             break;
         case 15:
-            if (boot_cpu_data.x86_model > 0x4)
-                break;
-
             wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
             wrmsr(MSR_P4_CRU_ESCR0, 0, 0);
             break;
@@ -192,7 +186,7 @@ static void disable_lapic_nmi_watchdog(v
     }
     nmi_active = -1;
     /* tell do_nmi() and others that we're not active any more */
-    nmi_watchdog = 0;
+    nmi_watchdog = NMI_NONE;
 }
 
 static void enable_lapic_nmi_watchdog(void)

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] x86: also allow disabling LAPIC NMI watchdog on newer CPUs

[Keir Fraser]

On 01/08/2012 13:07, "Jan Beulich" <JBeulich@suse.com> wrote:

> This complements c/s 9146:941897e98591, and also replaces a literal
> zero with a proper manifest constant.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Keir Fraser <keir@xen.org>

> --- a/xen/arch/x86/nmi.c
> +++ b/xen/arch/x86/nmi.c
> @@ -175,15 +175,9 @@ static void disable_lapic_nmi_watchdog(v
>      case X86_VENDOR_INTEL:
>          switch (boot_cpu_data.x86) {
>          case 6:
> -            if (boot_cpu_data.x86_model > 0xd)
> -                break;
> -
>              wrmsr(MSR_P6_EVNTSEL0, 0, 0);
>              break;
>          case 15:
> -            if (boot_cpu_data.x86_model > 0x4)
> -                break;
> -
>              wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
>              wrmsr(MSR_P4_CRU_ESCR0, 0, 0);
>              break;
> @@ -192,7 +186,7 @@ static void disable_lapic_nmi_watchdog(v
>      }
>      nmi_active = -1;
>      /* tell do_nmi() and others that we're not active any more */
> -    nmi_watchdog = 0;
> +    nmi_watchdog = NMI_NONE;
>  }
>  
>  static void enable_lapic_nmi_watchdog(void)
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel