Mercurial > illumos > illumos-gate

changeset 5140:2b22c477c48d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC/2007/490 Thunder software support 6549776 Solaris support needed for Thunder blades.
author jl139090
date Thu, 27 Sep 2007 18:15:28 -0700
parents 4e79834a8d90
children b5a109cc9cf3
files usr/src/lib/fm/topo/maps/Makefile usr/src/lib/fm/topo/maps/SUNW,USBRDT-5240/Makefile usr/src/lib/fm/topo/maps/SUNW,USBRDT-5240/USBRDT-5240-hc-topology.xml usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h usr/src/lib/libpcp/sparc/Makefile usr/src/pkgdefs/SUNWcart200.v/prototype_com usr/src/pkgdefs/SUNWfmd/prototype_sparc usr/src/pkgdefs/SUNWkvmt200.v/prototype_com usr/src/pkgdefs/etc/exception_list_sparc usr/src/psm/stand/boot/sparcv9/sun4v/Makefile usr/src/uts/sun4v/Makefile usr/src/uts/sun4v/Makefile.sun4v.shared usr/src/uts/sun4v/Makefile.thunder
diffstat 13 files changed, 160 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/fm/topo/maps/Makefile	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/lib/fm/topo/maps/Makefile	Thu Sep 27 18:15:28 2007 -0700
@@ -36,6 +36,7 @@
 		SUNW,SPARC-Enterprise-T5120 \
 		SUNW,T5140 \
 		SUNW,Netra-CP3260 \
+		SUNW,USBRDT-5240 \
 		SUNW,Netra-T5220
 
 i386_SUBDIRS = i86pc \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5240/Makefile	Thu Sep 27 18:15:28 2007 -0700
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+PLATFORMS = SUNW,USBRDT-5240
+CLASS = platform
+DTDFILE =
+TOPOFILE = USBRDT-5240-hc-topology.xml
+SRCDIR = ../SUNW,USBRDT-5240
+
+include ../Makefile.map
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5240/USBRDT-5240-hc-topology.xml	Thu Sep 27 18:15:28 2007 -0700
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!DOCTYPE topology SYSTEM "/usr/share/lib/xml/dtd/topology.dtd.1">
+<!--
+ Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ Use is subject to license terms.
+
+ CDDL HEADER START
+
+ The contents of this file are subject to the terms of the
+ Common Development and Distribution License (the "License").
+ You may not use this file except in compliance with the License.
+
+ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ or http://www.opensolaris.org/os/licensing.
+ See the License for the specific language governing permissions
+ and limitations under the License.
+
+ When distributing Covered Code, include this CDDL HEADER in each
+ file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ If applicable, add the following below this CDDL HEADER, with the
+ fields enclosed by brackets "[]" replaced with your own identifying
+ information: Portions Copyright [yyyy] [name of copyright owner]
+
+ CDDL HEADER END
+
+ ident	"%Z%%M%	%I%	%E% SMI"
+-->
+
+<topology name='SUNW,USBRDT-5240' scheme='hc'>
+  <range name='motherboard' min='0' max='0'>
+   <enum-method name='motherboard' version='1'/>
+ 
+     <dependents grouping='children'>
+       <range name='chip' min='0' max='1'>
+         <enum-method name='chip' version='1'/>
+       </range>
+     </dependents>
+ 
+     <dependents grouping='children'>
+       <range name='hostbridge' min='0' max='254'>
+         <enum-method name='hostbridge' version='1'/>
+       </range>
+     </dependents>
+
+   </range>
+</topology>
--- a/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h	Thu Sep 27 18:15:28 2007 -0700
@@ -59,6 +59,14 @@
 	{   5, "MB/RISER2/PCIE5" }
 };
 
+physnm_t usbrdt5240_pnms[] = {
+	/* Slot #, Label */
+	{   0, "MB/RISER0/EM0" },
+	{   1, "MB/RISER0/EM1" },
+	{   2, "MB/RISER1/EM2" },
+	{   3, "MB/RISER1/EM3" }
+};
+
 physnm_t netra_t5220_pnms[] = {
 	/* Slot #, Label */
 	{   0, "MB/RISER0/PCIE0" },
@@ -89,6 +97,9 @@
 	{ "T5240",
 	    sizeof (t5220_pnms) / sizeof (physnm_t),
 	    t5220_pnms },
+	{ "USBRDT-5240",
+	    sizeof (usbrdt5240_pnms) / sizeof (physnm_t),
+	    usbrdt5240_pnms },
 	{ "Netra-T5220",
 	    sizeof (netra_t5220_pnms) / sizeof (physnm_t),
 	    netra_t5220_pnms }
@@ -124,6 +135,7 @@
 	{ "Netra-T5220",
 	    0,
 	    NULL }
+
 };
 
 missing_names_t Missing = {
--- a/usr/src/lib/libpcp/sparc/Makefile	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/lib/libpcp/sparc/Makefile	Thu Sep 27 18:15:28 2007 -0700
@@ -43,6 +43,7 @@
 		SUNW,SPARC-Enterprise-T5120 \
 		SUNW,T5140 \
 		SUNW,Netra-CP3260 \
+		SUNW,USBRDT-5240 \
 		SUNW,Netra-T5220
 
 
--- a/usr/src/pkgdefs/SUNWcart200.v/prototype_com	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/pkgdefs/SUNWcart200.v/prototype_com	Thu Sep 27 18:15:28 2007 -0700
@@ -68,3 +68,4 @@
 s none platform/SUNW,Sun-Blade-T6300=sun4v
 s none platform/SUNW,Sun-Blade-T6320=sun4v
 s none platform/SUNW,Netra-CP3260=sun4v
+s none platform/SUNW,USBRDT-5240=sun4v
--- a/usr/src/pkgdefs/SUNWfmd/prototype_sparc	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/pkgdefs/SUNWfmd/prototype_sparc	Thu Sep 27 18:15:28 2007 -0700
@@ -207,6 +207,12 @@
 d none usr/platform/SUNW,Netra-CP3260/lib/fm/topo 755 root bin
 d none usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,Netra-CP3260/lib/fm/topo/maps/Netra-CP3260-hc-topology.xml 444 root bin
+d none usr/platform/SUNW,USBRDT-5240 755 root sys
+d none usr/platform/SUNW,USBRDT-5240/lib 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm/topo 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps 755 root bin
+f none usr/platform/SUNW,USBRDT-5240/lib/fm/topo/maps/USBRDT-5240-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,Netra-T5220 755 root sys
 d none usr/platform/SUNW,Netra-T5220/lib 755 root bin
 d none usr/platform/SUNW,Netra-T5220/lib/fm 755 root bin
--- a/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com	Thu Sep 27 18:15:28 2007 -0700
@@ -53,6 +53,7 @@
 d none usr/platform/SUNW,Sun-Blade-T6320 755 root sys
 d none usr/platform/SUNW,SPARC-Enterprise-T5120 755 root sys
 d none usr/platform/SUNW,T5140 755 root sys
+d none usr/platform/SUNW,USBRDT-5240 755 root sys
 d none usr/platform/SUNW,Netra-T5220 755 root sys
 #
 # create links to sun4v platform
@@ -62,6 +63,7 @@
 s none usr/platform/SUNW,Sun-Blade-T6320/sbin=../sun4v/sbin
 s none usr/platform/SUNW,SPARC-Enterprise-T5120/sbin=../sun4v/sbin
 s none usr/platform/SUNW,T5140/sbin=../sun4v/sbin
+s none usr/platform/SUNW,USBRDT-5240/sbin=../sun4v/sbin
 s none usr/platform/SUNW,Netra-T5220/sbin=../sun4v/sbin
 #
 # create include directory
@@ -77,6 +79,8 @@
 d none usr/platform/SUNW,Sun-Blade-T6320/lib 755 root bin
 d none usr/platform/SUNW,SPARC-Enterprise-T5120/lib 755 root bin
 d none usr/platform/SUNW,T5140/lib 755 root bin
+d none usr/platform/SUNW,USBRDT-5240/lib 755 root bin
+
 d none usr/platform/SUNW,Netra-T5220/lib 755 root bin
 #
 # add binary and libraries for prtdiag
@@ -95,6 +99,7 @@
 s none usr/platform/SUNW,Sun-Blade-T6320/lib/libpcp.so=../../sun4v/lib/libpcp.so
 s none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/libpcp.so=../../sun4v/lib/libpcp.so
 s none usr/platform/SUNW,T5140/lib/libpcp.so=../../sun4v/lib/libpcp.so
+s none usr/platform/SUNW,USBRDT-5240/lib/libpcp.so=../../sun4v/lib/libpcp.so
 s none usr/platform/SUNW,Netra-T5220/lib/libpcp.so=../../sun4v/lib/libpcp.so
 
 s none usr/platform/SUNW,Sun-Fire-T200/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
@@ -104,6 +109,7 @@
 s none usr/platform/SUNW,Sun-Blade-T6320/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
 s none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
 s none usr/platform/SUNW,T5140/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
+s none usr/platform/SUNW,USBRDT-5240/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
 s none usr/platform/SUNW,Netra-T5220/lib/libpcp.so.1=../../sun4v/lib/libpcp.so.1
 
 #
@@ -116,6 +122,7 @@
 s none usr/platform/SUNW,Sun-Blade-T6320/lib/fs=../../sun4v/lib/fs
 s none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fs=../../sun4v/lib/fs
 s none usr/platform/SUNW,T5140/lib/fs=../../sun4v/lib/fs
+s none usr/platform/SUNW,USBRDT-5240/lib/fs=../../sun4v/lib/fs
 s none usr/platform/SUNW,Netra-T5220/lib/fs=../../sun4v/lib/fs
 #
 # add erie link
--- a/usr/src/pkgdefs/etc/exception_list_sparc	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/pkgdefs/etc/exception_list_sparc	Thu Sep 27 18:15:28 2007 -0700
@@ -834,6 +834,7 @@
 usr/platform/SUNW,SPARC-Enterprise-T5120/lib/llib-lpcp.ln		sparc
 usr/platform/sun4v/lib/llib-lpcp.ln			sparc
 usr/platform/SUNW,Netra-CP3260/lib/llib-lpcp.ln		sparc
+usr/platform/SUNW,USBRDT-5240/lib/llib-lpcp.ln		sparc
 usr/platform/SUNW,Netra-T5220/lib/llib-lpcp.ln		sparc
 #
 # ZFS internal tools and lint libraries
--- a/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/psm/stand/boot/sparcv9/sun4v/Makefile	Thu Sep 27 18:15:28 2007 -0700
@@ -38,6 +38,7 @@
 PLATLINKS	+= SUNW,Sun-Blade-T6320
 PLATLINKS	+= SUNW,SPARC-Enterprise-T5120
 PLATLINKS	+= SUNW,T5140
+PLATLINKS	+= SUNW,USBRDT-5240
 PLATLINKS	+= SUNW,Netra-T5220
 
 LINKED_DIRS	= $(PLATLINKS:%=$(USR_PLAT_DIR)/%)
--- a/usr/src/uts/sun4v/Makefile	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/uts/sun4v/Makefile	Thu Sep 27 18:15:28 2007 -0700
@@ -34,6 +34,7 @@
 include Makefile.stpaul
 include Makefile.huron
 include Makefile.maramba
+include Makefile.thunder
 include Makefile.turgo
 
 USR_GLENDALE_DIR	= $(USR_PLAT_DIR)/SUNW,Sun-Blade-T6320
@@ -199,6 +200,8 @@
 			$(USR_HURON_SBIN_DIR) $(USR_HURON_LIB_DIR) \
 			$(USR_MARAMBA_DIR) $(USR_MARAMBA_SBIN_DIR) \
 			$(USR_MARAMBA_LIB_DIR) \
+			$(USR_THUNDER_DIR) $(USR_THUNDER_SBIN_DIR) \
+			$(USR_THUNDER_LIB_DIR) \
 			$(USR_TURGO_DIR) $(USR_TURGO_SBIN_DIR) \
 			$(USR_TURGO_LIB_DIR)
 
@@ -252,6 +255,15 @@
 $(USR_MARAMBA_LIB_DIR):		$(USR_MARAMBA_DIR)
 	-$(INS.dir.root.bin)
 
+$(USR_THUNDER_DIR):		$(USR_SUN4V_PLAT_DIR)
+	-$(INS.dir.root.sys)
+
+$(USR_THUNDER_SBIN_DIR):	$(USR_THUNDER_DIR)
+	$(INS.slink5)
+
+$(USR_THUNDER_LIB_DIR):		$(USR_THUNDER_DIR)
+	-$(INS.dir.root.bin)
+
 $(USR_TURGO_DIR):		$(USR_SUN4V_PLAT_DIR)
 	-$(INS.dir.root.sys)
 
--- a/usr/src/uts/sun4v/Makefile.sun4v.shared	Thu Sep 27 15:10:54 2007 -0700
+++ b/usr/src/uts/sun4v/Makefile.sun4v.shared	Thu Sep 27 18:15:28 2007 -0700
@@ -43,6 +43,7 @@
 LINKED_PLATFORMS += SUNW,Sun-Blade-T6320
 LINKED_PLATFORMS += SUNW,Netra-CP3260
 LINKED_PLATFORMS += SUNW,Netra-T5220
+LINKED_PLATFORMS += SUNW,USBRDT-5240
 PROMIF		 = ieee1275
 PSMBASE		 = $(UTSBASE)/../psm
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/sun4v/Makefile.thunder	Thu Sep 27 18:15:28 2007 -0700
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+#	Global definitions for sun4v thunder implementation specific modules.
+#
+
+#
+#	Define directories.
+#
+
+USR_SUN4V_PLAT_DIR	= $(USR_PLAT_DIR)/$(PLATFORM)
+USR_THUNDER_DIR		= $(USR_PLAT_DIR)/SUNW,USBRDT-5240
+USR_THUNDER_SBIN_DIR	= $(USR_THUNDER_DIR)/sbin
+USR_THUNDER_LIB_DIR	= $(USR_THUNDER_DIR)/lib