keir.xen at gmail
Aug 1, 2012, 8:22 AM
Post #2 of 2
(42 views)
Permalink
|
|
Re: [PATCH] x86: also allow disabling LAPIC NMI watchdog on newer CPUs
[In reply to]
|
|
On 01/08/2012 13:07, "Jan Beulich" <JBeulich [at] suse> wrote:
> This complements c/s 9146:941897e98591, and also replaces a literal
> zero with a proper manifest constant.
>
> Signed-off-by: Jan Beulich <jbeulich [at] suse>
Acked-by: Keir Fraser <keir [at] xen>
> --- 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 [at] lists
> http://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel [at] lists
http://lists.xen.org/xen-devel
|
x86-NMI-LAPIC-watchdog-disable.patch
