Module Name: src
Committed By: martin
Date: Sun Apr 17 14:32:03 UTC 2016
Modified Files:
src/sys/arch/sparc64/sparc64: cpu.c pmap.c
Log Message:
Move the SMP-disabled hack for SUN4V a bit earlier
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/sparc64/sparc64/cpu.c
cvs rdiff -u -r1.301 -r1.302 src/sys/arch/sparc64/sparc64/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/cpu.c
diff -u src/sys/arch/sparc64/sparc64/cpu.c:1.127 src/sys/arch/sparc64/sparc64/cpu.c:1.128
--- src/sys/arch/sparc64/sparc64/cpu.c:1.127 Sun Sep 6 23:48:39 2015
+++ src/sys/arch/sparc64/sparc64/cpu.c Sun Apr 17 14:32:03 2016
@@ -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 @@ cpu_boot_secondary_processors(void)
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;
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.301 src/sys/arch/sparc64/sparc64/pmap.c:1.302
--- src/sys/arch/sparc64/sparc64/pmap.c:1.301 Wed Feb 3 20:33:52 2016
+++ src/sys/arch/sparc64/sparc64/pmap.c Sun Apr 17 14:32:03 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.3
#include <sys/cpu.h>
#include <sys/exec_aout.h> /* for MID_* */
+#include <sys/reboot.h>
#include <uvm/uvm.h>
@@ -728,6 +729,10 @@ pmap_bootstrap(u_long kernelstart, u_lon
BDPRINTF(PDB_BOOT, ("Entered pmap_bootstrap.\n"));
+ /* XXX - incomplete spinup code for SUN4V */
+ if (CPU_ISSUN4V)
+ boothowto |= RB_MD1;
+
cache_setup_funcs();
/*
