PSARC/2008/093 Lightning Platform Software Support

6549785 Solaris support needed for SUNW,USBRDT-5440 boards.

6 files changed, 120 insertions, 6 deletions

diff --git a/usr/src/lib/fm/topo/maps/Makefile b/usr/src/lib/fm/topo/maps/Makefile
index a639bc5d28..1984b1bbf5 100644
--- a/usr/src/lib/fm/topo/maps/Makefile
+++ b/usr/src/lib/fm/topo/maps/Makefile
@@ -40,7 +40,8 @@ sparc_SUBDIRS =	sun4u \
 		SUNW,Netra-CP3260 \
 		SUNW,USBRDT-5240 \
 		SUNW,Netra-T5220 \
-		SUNW,Netra-T5440
+		SUNW,Netra-T5440 \
+		SUNW,USBRDT-5440
 
 i386_SUBDIRS = i86pc \
 		i386 \
diff --git a/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/Makefile b/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/Makefile
new file mode 100644
index 0000000000..7637632b4d
--- /dev/null
+++ b/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/Makefile
@@ -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 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+PLATFORMS = SUNW,USBRDT-5440
+CLASS = platform
+DTDFILE =
+TOPOFILE = USBRDT-5440-hc-topology.xml
+SRCDIR = ../SUNW,USBRDT-5440
+
+include ../Makefile.map
diff --git a/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/USBRDT-5440-hc-topology.xml b/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/USBRDT-5440-hc-topology.xml
new file mode 100644
index 0000000000..2d26e738bb
--- /dev/null
+++ b/usr/src/lib/fm/topo/maps/SUNW,USBRDT-5440/USBRDT-5440-hc-topology.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!DOCTYPE topology SYSTEM "/usr/share/lib/xml/dtd/topology.dtd.1">
+<!--
+ Copyright 2008 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-5440' scheme='hc'>
+  <range name='motherboard' min='0' max='0'>
+   <enum-method name='motherboard' version='1'/>
+
+     <dependents grouping='children'>
+       <range name='interconnect' min='0' max='3'>
+         <enum-method name='zambezi' version='1'/>
+       </range>
+     </dependents>
+
+     <dependents grouping='children'>
+       <range name='chip' min='0' max='3'>
+         <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>
+
diff --git a/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c b/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c
index 537f72cdaa..75f57bf538 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c
+++ b/usr/src/lib/fm/topo/modules/sun4v/hostbridge/hb_rcid.c
@@ -44,6 +44,15 @@ prc_t t5140_prcs[] = {
 	{ 1, 0x500 }
 };
 
+/* A list of physical root complexes of the SUNW,USBRDT-5440 platform */
+prc_t usbrdt_5440_prcs[] = {
+	/* physical id, bus address */
+	{ 0, 0x400 },
+	{ 1, 0x500 },
+	{ 1, 0x600 },
+	{ 1, 0x700 }
+};
+
 pprc_t plat_prcids[] = {
 	/*
 	 * platforms that have the same map with T200
@@ -87,7 +96,10 @@ pprc_t plat_prcids[] = {
 	    t5140_prcs },
 	{ "SUNW,USBRDT-5240",
 	    sizeof (t5140_prcs) / sizeof (prc_t),
-	    t5140_prcs }
+	    t5140_prcs },
+	{ "SUNW,USBRDT-5440",
+	    sizeof (usbrdt_5440_prcs) / sizeof (prc_t),
+	    usbrdt_5440_prcs }
 };
 
 pprcs_t prcids = {
diff --git a/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h b/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h
index 96d120a126..8fb181f72a 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h
+++ b/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -109,6 +109,17 @@ physnm_t blade_t6340_pnms[] = {
 	{   1, "SYS/EM1" }
 };
 
+physnm_t usbrdt5440_pnms[] = {
+	/* Slot #, Label */
+	{   0, "MB/RISER0/EM0" },
+	{   1, "MB/RISER0/EM1" },
+	{   2, "MB/RISER0/EM2" },
+	{   3, "MB/RISER0/EM3" },
+	{   4, "MB/RISER1/EM4" },
+	{   5, "MB/RISER1/EM5" },
+	{   6, "MB/RISER1/EM6" }
+};
+
 pphysnm_t plat_pnames[] = {
 	{ "Sun-Fire-T200",
 	    sizeof (t200_pnms) / sizeof (physnm_t),
@@ -143,7 +154,10 @@ pphysnm_t plat_pnames[] = {
 	    netra_t5440_pnms },
 	{ "Sun-Blade-T6340",
 	    sizeof (blade_t6340_pnms) / sizeof (physnm_t),
-	    blade_t6340_pnms }
+	    blade_t6340_pnms },
+	{ "USBRDT-5440",
+	    sizeof (usbrdt5440_pnms) / sizeof (physnm_t),
+	    usbrdt5440_pnms },
 };
 
 physlot_names_t PhyslotNMs = {
diff --git a/usr/src/lib/libpcp/sparc/Makefile b/usr/src/lib/libpcp/sparc/Makefile
index 225d62fa3e..3c354e78d2 100644
--- a/usr/src/lib/libpcp/sparc/Makefile
+++ b/usr/src/lib/libpcp/sparc/Makefile
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -45,7 +45,8 @@ LINKED_PLATFORMS = SUNW,Sun-Fire-T200 \
 		SUNW,Netra-CP3260 \
 		SUNW,USBRDT-5240 \
 		SUNW,Netra-T5220 \
-		SUNW,Netra-T5440
+		SUNW,Netra-T5440 \
+		SUNW,USBRDT-5440
 
 
 include ../Makefile.com