[src/trunk]: src/sys/arch/sparc64/sparc64 Move the SMP-disabled hack for SUN4...

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

details:   https://anonhg.NetBSD.org/src/rev/191940f132ce
branches:  trunk
changeset: 344761:191940f132ce
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Apr 17 14:32:03 2016 +0000

description:
Move the SMP-disabled hack for SUN4V a bit earlier

diffstat:

 sys/arch/sparc64/sparc64/cpu.c  |  8 ++------
 sys/arch/sparc64/sparc64/pmap.c |  9 +++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diffs (66 lines):

diff -r f60f815bbf9d -r 191940f132ce sys/arch/sparc64/sparc64/cpu.c
--- a/sys/arch/sparc64/sparc64/cpu.c    Sun Apr 17 02:16:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/cpu.c    Sun Apr 17 14:32:03 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.127 2015/09/06 23:48:39 nakayama Exp $ */
+/*     $NetBSD: cpu.c,v 1.128 2016/04/17 14:32:03 martin Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.127 2015/09/06 23:48:39 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.128 2016/04/17 14:32:03 martin Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -670,10 +670,6 @@
                return;
        }
 
-       /* No MP for SUN4V yet */
-       if (CPU_ISSUN4V)
-               return;
-       
        for (ci = cpus; ci != NULL; ci = ci->ci_next) {
                if (ci->ci_cpuid == cpu_myid())
                        continue;
diff -r f60f815bbf9d -r 191940f132ce sys/arch/sparc64/sparc64/pmap.c
--- a/sys/arch/sparc64/sparc64/pmap.c   Sun Apr 17 02:16:26 2016 +0000
+++ b/sys/arch/sparc64/sparc64/pmap.c   Sun Apr 17 14:32:03 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.301 2016/02/03 20:33:52 palle Exp $ */
+/*     $NetBSD: pmap.c,v 1.302 2016/04/17 14:32:03 martin Exp $        */
 /*
  *
  * Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.301 2016/02/03 20:33:52 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.302 2016/04/17 14:32:03 martin Exp $");
 
 #undef NO_VCACHE /* Don't forget the locked TLB in dostart */
 #define        HWREF
@@ -49,6 +49,7 @@
 #include <sys/cpu.h>
 
 #include <sys/exec_aout.h>     /* for MID_* */
+#include <sys/reboot.h>
 
 #include <uvm/uvm.h>
 
@@ -728,6 +729,10 @@
 
        BDPRINTF(PDB_BOOT, ("Entered pmap_bootstrap.\n"));
 
+       /* XXX - incomplete spinup code for SUN4V */
+       if (CPU_ISSUN4V)
+               boothowto |= RB_MD1;
+
        cache_setup_funcs();
 
        /*