[src/trunk]: src convert sparc64 to MULTIPROCESSOR kernel by default, and int...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src convert sparc64 to MULTIPROCESSOR kernel by default, and int...
From: mrg <mrg%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 18:41:18 +0000

details:   https://anonhg.NetBSD.org/src/rev/175d4bc786b0
branches:  trunk
changeset: 752959:175d4bc786b0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Mar 13 08:36:06 2010 +0000

description:
convert sparc64 to MULTIPROCESSOR kernel by default, and introduce
s/MP/UP/ kernels were otherwise in place.

in my testing on a U60, i couldn't really notice any different in
speed, but we need testing on a U1/U5/U10 systems to be sure that
GENERIC.UP isn't necessary.

for sparc64, this is some what required as USIIIi systems have the
memory controller on the CPU, and unless the CPU is spunup, a UP
kernel will not function on these systems.  (we obviously need to
join the NUMA-for-netbsd camp now, too! :-)


this should enable the installer to function on all systems that we
support, but also give the option for people to install GENERIC.UP
on their single-cpu systems if they choose.


XXX: i haven't actually tested sysinst with this, but i have built
both sparc and sparc64 release iso's successfully with this change
(sans having to comment out kern_ctf.c.)

diffstat:

 distrib/utils/sysinst/arch/sparc64/md.h |   4 ++--
 etc/etc.sparc64/Makefile.inc            |   4 ++--
 sys/arch/sparc64/conf/GENERIC           |   9 +++++----
 sys/arch/sparc64/conf/GENERIC.DEBUG     |  16 ++++++++++++++++
 sys/arch/sparc64/conf/GENERIC.MP        |  11 -----------
 sys/arch/sparc64/conf/GENERIC.UP        |  12 ++++++++++++
 sys/arch/sparc64/conf/GENERIC32.MP      |  11 -----------
 sys/arch/sparc64/conf/GENERIC32.UP      |  12 ++++++++++++
 sys/arch/sparc64/conf/SCHIZO            |  22 ----------------------
 9 files changed, 49 insertions(+), 52 deletions(-)

diffs (175 lines):

diff -r 464a758726db -r 175d4bc786b0 distrib/utils/sysinst/arch/sparc64/md.h
--- a/distrib/utils/sysinst/arch/sparc64/md.h   Sat Mar 13 08:33:26 2010 +0000
+++ b/distrib/utils/sysinst/arch/sparc64/md.h   Sat Mar 13 08:36:06 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.16 2010/02/28 22:42:44 martin Exp $   */
+/*     $NetBSD: md.h,v 1.17 2010/03/13 08:36:06 mrg Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -71,7 +71,7 @@
  * or upgrade.
  */
 #define SET_KERNEL_1_NAME      "kern-GENERIC"
-#define SET_KERNEL_2_NAME      "kern-GENERIC.MP"
+#define SET_KERNEL_2_NAME      "kern-GENERIC.UP"
 
 /*
  * Machine-specific command to write a new label to a disk.
diff -r 464a758726db -r 175d4bc786b0 etc/etc.sparc64/Makefile.inc
--- a/etc/etc.sparc64/Makefile.inc      Sat Mar 13 08:33:26 2010 +0000
+++ b/etc/etc.sparc64/Makefile.inc      Sat Mar 13 08:36:06 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.30 2009/03/12 17:16:58 abs Exp $
+#      $NetBSD: Makefile.inc,v 1.31 2010/03/13 08:36:06 mrg Exp $
 #
 #      etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
 #
@@ -8,7 +8,7 @@
 # If you change the list of distributed kernels, don't forget
 # to update the release documentation in distrib/notes/common/contents
 
-KERNEL_SETS=           GENERIC GENERIC.MP
+KERNEL_SETS=           GENERIC GENERIC.UP
 
 BUILD_KERNELS+=                INSTALL
 
diff -r 464a758726db -r 175d4bc786b0 sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC     Sat Mar 13 08:33:26 2010 +0000
+++ b/sys/arch/sparc64/conf/GENERIC     Sat Mar 13 08:36:06 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2010/03/12 15:12:12 roy Exp $
+# $NetBSD: GENERIC,v 1.123 2010/03/13 08:36:06 mrg Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.122 $"
+#ident                 "GENERIC-$Revision: 1.123 $"
 
 maxusers       64
 
@@ -228,9 +228,10 @@
 #options       ALTQ_WFQ        # Weighted Fair Queueing
 
 
-#### Main bus and CPU .. all systems.
+#### Main bus and CPUs .. all systems.
 mainbus0 at root
-cpu0   at mainbus0
+options        MULTIPROCESSOR          # include multiprocessor support
+cpu*           at mainbus0             # declare additional CPUs
 
 #### Bus types found on SPARC systems.
 
diff -r 464a758726db -r 175d4bc786b0 sys/arch/sparc64/conf/GENERIC.DEBUG
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sparc64/conf/GENERIC.DEBUG       Sat Mar 13 08:36:06 2010 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: GENERIC.DEBUG,v 1.1 2010/03/13 08:36:06 mrg Exp $
+#
+# GENERIC with debugging support enabled.
+#
+
+include        "arch/sparc64/conf/GENERIC"
+
+#ident         "GENERIC.DEBUG.$Revision: 1.1 $"
+
+makeoptions    DEBUG="-g"
+options        DEBUG
+options        DIAGNOSTIC
+options        LOCKDEBUG
+
+options        DB_MAX_WIDTH=160
+options        DDB_ONPANIC=2   # print stack trace
diff -r 464a758726db -r 175d4bc786b0 sys/arch/sparc64/conf/GENERIC.MP
--- a/sys/arch/sparc64/conf/GENERIC.MP  Sat Mar 13 08:33:26 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: GENERIC.MP,v 1.6 2008/06/29 08:05:43 nakayama Exp $
-#
-# GENERIC kernel configuration with multiprocessor support.
-#
-
-include        "arch/sparc64/conf/GENERIC"
-
-#ident         "GENERIC.MP-$Revision: 1.6 $"
-
-options        MULTIPROCESSOR          # include multiprocessor support
-cpu*           at mainbus0             # declare additional CPUs
diff -r 464a758726db -r 175d4bc786b0 sys/arch/sparc64/conf/GENERIC.UP
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sparc64/conf/GENERIC.UP  Sat Mar 13 08:36:06 2010 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: GENERIC.UP,v 1.1 2010/03/13 08:36:06 mrg Exp $
+#
+# GENERIC kernel configuration without multiprocessor support.
+#
+
+include        "arch/sparc64/conf/GENERIC"
+
+#ident         "GENERIC-$Revision: 1.1 $"
+
+no options     MULTIPROCESSOR
+no cpu
+cpu0   at mainbus0
diff -r 464a758726db -r 175d4bc786b0 sys/arch/sparc64/conf/GENERIC32.MP
--- a/sys/arch/sparc64/conf/GENERIC32.MP        Sat Mar 13 08:33:26 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# $NetBSD: GENERIC32.MP,v 1.1 2008/06/29 08:05:43 nakayama Exp $
-#
-# GENERIC kernel configuration for 32-bit kernel with multiprocessor support.
-#
-
-include        "arch/sparc64/conf/GENERIC32"
-
-#ident         "GENERIC32.MP-$Revision: 1.1 $"
-
-options        MULTIPROCESSOR          # include multiprocessor support
-cpu*           at mainbus0             # declare additional CPUs
diff -r 464a758726db -r 175d4bc786b0 sys/arch/sparc64/conf/GENERIC32.UP
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/sparc64/conf/GENERIC32.UP        Sat Mar 13 08:36:06 2010 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: GENERIC32.UP,v 1.1 2010/03/13 08:36:06 mrg Exp $
+#
+# GENERIC kernel configuration for 32-bit kernel without multiprocessor support.
+#
+
+include        "arch/sparc64/conf/GENERIC32"
+
+#ident         "GENERIC32.UP-$Revision: 1.1 $"
+
+no options     MULTIPROCESSOR
+no cpu
+cpu0   at mainbus0
diff -r 464a758726db -r 175d4bc786b0 sys/arch/sparc64/conf/SCHIZO
--- a/sys/arch/sparc64/conf/SCHIZO      Sat Mar 13 08:33:26 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-# $NetBSD: SCHIZO,v 1.7 2010/02/28 11:49:44 martin Exp $
-#
-# GENERIC with schizo support enabled, with the annoying schizo interupt
-# option
-#
-
-include        "arch/sparc64/conf/GENERIC.MP"
-#include       "arch/sparc64/conf/GENERIC"
-
-#ident         "SCHIZO.$Revision: 1.7 $"
-
-options        CHEETAH
-
-makeoptions    DEBUG="-g"
-options        DEBUG
-options        DIAGNOSTIC
-options        LOCKDEBUG
-options        DB_MAX_WIDTH=160
-options        DDB_ONPANIC=2   # print stack trace
-
-# this crashes when attaching.
-#no machfb

Prev by Date: [src/trunk]: src/sys/arch/evbarm/lubbock pass correct atttach args to sacc_pr...
Next by Date: [src/trunk]: src/sys/arch/evbarm/g42xxeb apply struct device split to the res...
Previous by Thread: [src/trunk]: src/sys/arch/evbarm/lubbock pass correct atttach args to sacc_pr...
Next by Thread: [src/trunk]: src/sys/arch/evbarm/g42xxeb apply struct device split to the res...
Indexes:

Home | Main Index | Thread Index | Old Index