Mercurial > illumos > illumos-gate

changeset 5670:39c09641c50b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PSARC 2007/633 Scottsdale Platform Software Support 6627561 Solaris support needed for Sun-Blade-T6340
author anovick
date Tue, 11 Dec 2007 12:27:46 -0800
parents f4e076788720
children 58118d0511c2
files usr/src/lib/fm/topo/maps/SUNW,T5140/Makefile usr/src/lib/fm/topo/maps/SUNW,T5140/Sun-Blade-T6340-hc-topology.xml usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h usr/src/pkgdefs/SUNWcart200.v/prototype_com usr/src/pkgdefs/SUNWfmd/prototype_sparc usr/src/pkgdefs/SUNWkvmt200.v/prototype_com usr/src/uts/sun4v/Makefile.sun4v.shared usr/src/uts/sun4v/maramba/Makefile
diffstat 8 files changed, 66 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/fm/topo/maps/SUNW,T5140/Makefile	Mon Dec 10 23:01:02 2007 -0800
+++ b/usr/src/lib/fm/topo/maps/SUNW,T5140/Makefile	Tue Dec 11 12:27:46 2007 -0800
@@ -29,7 +29,8 @@
 DTDFILE =
 TOPOFILE = T5140-hc-topology.xml \
 	T5240-hc-topology.xml \
-	T5440-hc-topology.xml
+	T5440-hc-topology.xml \
+	Sun-Blade-T6340-hc-topology.xml
 SRCDIR = ../SUNW,T5140
 
 include ../Makefile.map
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/fm/topo/maps/SUNW,T5140/Sun-Blade-T6340-hc-topology.xml	Tue Dec 11 12:27:46 2007 -0800
@@ -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,Sun-Blade-T6340' 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	Mon Dec 10 23:01:02 2007 -0800
+++ b/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h	Tue Dec 11 12:27:46 2007 -0800
@@ -103,6 +103,12 @@
 	{   7, "MB/PCIE7" }
 };
 
+physnm_t blade_t6340_pnms[] = {
+	/* Slot #, Label */
+	{   0, "SYS/EM0" },
+	{   1, "SYS/EM1" }
+};
+
 pphysnm_t plat_pnames[] = {
 	{ "Sun-Fire-T200",
 	    sizeof (t200_pnms) / sizeof (physnm_t),
@@ -134,7 +140,10 @@
 	    netra_t5220_pnms },
 	{ "Netra-T5440",
 	    sizeof (netra_t5440_pnms) / sizeof (physnm_t),
-	    netra_t5440_pnms }
+	    netra_t5440_pnms },
+	{ "Sun-Blade-T6340",
+	    sizeof (blade_t6340_pnms) / sizeof (physnm_t),
+	    blade_t6340_pnms }
 };
 
 physlot_names_t PhyslotNMs = {
--- a/usr/src/pkgdefs/SUNWcart200.v/prototype_com	Mon Dec 10 23:01:02 2007 -0800
+++ b/usr/src/pkgdefs/SUNWcart200.v/prototype_com	Tue Dec 11 12:27:46 2007 -0800
@@ -71,3 +71,4 @@
 s none platform/SUNW,Sun-Blade-T6320=sun4v
 s none platform/SUNW,Netra-CP3260=sun4v
 s none platform/SUNW,USBRDT-5240=sun4v
+s none platform/SUNW,Sun-Blade-T6340=sun4v
--- a/usr/src/pkgdefs/SUNWfmd/prototype_sparc	Mon Dec 10 23:01:02 2007 -0800
+++ b/usr/src/pkgdefs/SUNWfmd/prototype_sparc	Tue Dec 11 12:27:46 2007 -0800
@@ -205,6 +205,7 @@
 f none usr/platform/SUNW,T5140/lib/fm/topo/maps/T5140-hc-topology.xml 444 root bin
 f none usr/platform/SUNW,T5140/lib/fm/topo/maps/T5240-hc-topology.xml 444 root bin
 f none usr/platform/SUNW,T5140/lib/fm/topo/maps/T5440-hc-topology.xml 444 root bin
+f none usr/platform/SUNW,T5140/lib/fm/topo/maps/Sun-Blade-T6340-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,Netra-CP3260 755 root sys
 d none usr/platform/SUNW,Netra-CP3260/lib 755 root bin
 d none usr/platform/SUNW,Netra-CP3260/lib/fm 755 root bin
--- a/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com	Mon Dec 10 23:01:02 2007 -0800
+++ b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com	Tue Dec 11 12:27:46 2007 -0800
@@ -189,3 +189,7 @@
 d none usr/platform/SUNW,Netra-CP3260/sbin 0755 root bin
 s none usr/platform/SUNW,Netra-CP3260/sbin/prtdiag=../../sun4v/sbin/prtdiag
 s none usr/platform/SUNW,Netra-CP3260/sbin/trapstat=../../sun4v/sbin/trapstat
+#
+# add Scottsdale link
+#
+s none usr/platform/SUNW,Sun-Blade-T6340=SUNW,T5140
--- a/usr/src/uts/sun4v/Makefile.sun4v.shared	Mon Dec 10 23:01:02 2007 -0800
+++ b/usr/src/uts/sun4v/Makefile.sun4v.shared	Tue Dec 11 12:27:46 2007 -0800
@@ -46,6 +46,7 @@
 LINKED_PLATFORMS += SUNW,Netra-T5220
 LINKED_PLATFORMS += SUNW,USBRDT-5240
 LINKED_PLATFORMS += SUNW,Netra-T5440
+LINKED_PLATFORMS += SUNW,Sun-Blade-T6340
 PROMIF		 = ieee1275
 PSMBASE		 = $(UTSBASE)/../psm
 
--- a/usr/src/uts/sun4v/maramba/Makefile	Mon Dec 10 23:01:02 2007 -0800
+++ b/usr/src/uts/sun4v/maramba/Makefile	Tue Dec 11 12:27:46 2007 -0800
@@ -72,6 +72,7 @@
 IMPLEMENTED_PLATFORM	= SUNW,T5140
 LINKED_PLATFORMS	= SUNW,T5240
 LINKED_PLATFORMS	+= SUNW,T5440
+LINKED_PLATFORMS	+= SUNW,Sun-Blade-T6340
 
 $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%): $(USR_PLAT_DIR)
 	$(INS.slink3)