[src/trunk]: src/sys/arch move XEN CPU feature masking into cpu_probe() so th...

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

details:   https://anonhg.NetBSD.org/src/rev/6a54883245a9
branches:  trunk
changeset: 777568:6a54883245a9
user:      chs <chs%NetBSD.org@localhost>
date:      Thu Feb 23 14:45:54 2012 +0000

description:
move XEN CPU feature masking into cpu_probe() so that it's applied
to all CPUs, not just the boot CPU.

diffstat:

 sys/arch/amd64/amd64/machdep.c |  6 ++----
 sys/arch/i386/i386/machdep.c   |  6 ++----
 sys/arch/x86/x86/identcpu.c    |  5 +++--
 3 files changed, 7 insertions(+), 10 deletions(-)

diffs (80 lines):

diff -r 11c6153e4a3e -r 6a54883245a9 sys/arch/amd64/amd64/machdep.c
--- a/sys/arch/amd64/amd64/machdep.c    Thu Feb 23 13:34:15 2012 +0000
+++ b/sys/arch/amd64/amd64/machdep.c    Thu Feb 23 14:45:54 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.177 2012/02/19 23:15:24 matt Exp $       */
+/*     $NetBSD: machdep.c,v 1.178 2012/02/23 14:45:54 chs Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -111,7 +111,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.177 2012/02/19 23:15:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.178 2012/02/23 14:45:54 chs Exp $");
 
 /* #define XENDEBUG_LOW  */
 
@@ -1591,8 +1591,6 @@
        __PRINTK(("init_x86_64(0x%lx)\n", first_avail));
 #endif /* XEN */
 
-       cpu_feature[0] &= ~CPUID_FEAT_BLACKLIST;
-
        cpu_init_msrs(&cpu_info_primary, true);
 
        pcb = lwp_getpcb(&lwp0);
diff -r 11c6153e4a3e -r 6a54883245a9 sys/arch/i386/i386/machdep.c
--- a/sys/arch/i386/i386/machdep.c      Thu Feb 23 13:34:15 2012 +0000
+++ b/sys/arch/i386/i386/machdep.c      Thu Feb 23 14:45:54 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.719 2012/02/22 18:35:26 bouyer Exp $     */
+/*     $NetBSD: machdep.c,v 1.720 2012/02/23 14:45:55 chs Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.719 2012/02/22 18:35:26 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.720 2012/02/23 14:45:55 chs Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -1284,8 +1284,6 @@
        uvm_lwp_setuarea(&lwp0, lwp0uarea);
        pcb = lwp_getpcb(&lwp0);
 
-       cpu_feature[0] &= ~CPUID_FEAT_BLACKLIST;
-
        cpu_init_msrs(&cpu_info_primary, true);
 
 #ifdef PAE
diff -r 11c6153e4a3e -r 6a54883245a9 sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Thu Feb 23 13:34:15 2012 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Thu Feb 23 14:45:54 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: identcpu.c,v 1.29 2012/02/03 05:06:51 yamt Exp $       */
+/*     $NetBSD: identcpu.c,v 1.30 2012/02/23 14:45:55 chs Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.29 2012/02/03 05:06:51 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.30 2012/02/23 14:45:55 chs Exp $");
 
 #include "opt_xen.h"
 
@@ -700,6 +700,7 @@
                wrmsr(MSR_MISC_ENABLE, rdmsr(MSR_MISC_ENABLE) | (1<<3));
        }
 
+       ci->ci_feat_val[0] &= ~CPUID_FEAT_BLACKLIST;
        if (ci == &cpu_info_primary) {
                /* If first. Boot Processor is the cpu_feature reference. */
                for (i = 0; i < __arraycount(cpu_feature); i++) {