[src/trunk]: src/sys/arch/x86/acpi Initialize the errata MSRs when waking up, ...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e2b23096bd2b
branches:  trunk
changeset: 826710:e2b23096bd2b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Sep 23 10:38:59 2017 +0000

description:
Initialize the errata MSRs when waking up, otherwise they are clear and
we're re-enabling certain CPU bugs.

diffstat:

 sys/arch/x86/acpi/acpi_wakeup.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r ab365bdc136f -r e2b23096bd2b sys/arch/x86/acpi/acpi_wakeup.c
--- a/sys/arch/x86/acpi/acpi_wakeup.c   Sat Sep 23 10:18:49 2017 +0000
+++ b/sys/arch/x86/acpi/acpi_wakeup.c   Sat Sep 23 10:38:59 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_wakeup.c,v 1.48 2017/09/23 10:00:00 maxv Exp $    */
+/*     $NetBSD: acpi_wakeup.c,v 1.49 2017/09/23 10:38:59 maxv Exp $    */
 
 /*-
  * Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.48 2017/09/23 10:00:00 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.49 2017/09/23 10:38:59 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -274,6 +274,7 @@
        if (rcr4() & CR4_OSXSAVE)
                wrxcr(0, xcr0);
        pat_init(ci);
+       x86_errata();
 #if NLAPIC > 0
        lapic_enable();
        lapic_set_lvt();
@@ -346,6 +347,7 @@
        if (rcr4() & CR4_OSXSAVE)
                wrxcr(0, xcr0);
        pat_init(&cpu_info_primary);
+       x86_errata();
        i8259_reinit();
 #if NLAPIC > 0
        lapic_enable();