Mercurial > illumos > illumos-gate

changeset 10907:881ceecbca49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6881922 remove Solaris support for SPARC-Enterprise-T3120
author Sree Vemuri <Sree.Vemuri@Sun.COM>
date Thu, 29 Oct 2009 09:48:49 -0700
parents f2bf04f06f29
children 20912677f009
files usr/src/lib/fm/topo/maps/SUNW,SPARC-Enterprise-T5120/Makefile usr/src/lib/fm/topo/maps/SUNW,SPARC-Enterprise-T5120/SPARC-Enterprise-T3120-hc-topology.xml usr/src/lib/fm/topo/modules/sun4v/niu/niu.c 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/huron/Makefile
diffstat 9 files changed, 17 insertions(+), 113 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/lib/fm/topo/maps/SUNW,SPARC-Enterprise-T5120/Makefile	Thu Oct 29 08:02:51 2009 -0700
+++ b/usr/src/lib/fm/topo/maps/SUNW,SPARC-Enterprise-T5120/Makefile	Thu Oct 29 09:48:49 2009 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
@@ -28,8 +28,7 @@
 CLASS = platform
 DTDFILE = topology.dtd.1
 TOPOFILE = SPARC-Enterprise-T5120-hc-topology.xml \
-	   SPARC-Enterprise-T5220-hc-topology.xml \
-	   SPARC-Enterprise-T3120-hc-topology.xml
+	   SPARC-Enterprise-T5220-hc-topology.xml
 SRCDIR = ../SUNW,SPARC-Enterprise-T5120
 
 include ../Makefile.map
--- a/usr/src/lib/fm/topo/maps/SUNW,SPARC-Enterprise-T5120/SPARC-Enterprise-T3120-hc-topology.xml	Thu Oct 29 08:02:51 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-<?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
-
--->
-
-<topology name='SUNW,SPARC-Enterprise-T3120' scheme='hc'>
-  <range name='motherboard' min='0' max='0'>
-   <enum-method name='motherboard' version='1'/>
- 
-     <dependents grouping='children'>
-       <range name='chip' min='0' max='0'>
-         <enum-method name='chip' version='1'/>
- 
-         <dependents grouping='children'>
-           <range name='hostbridge' min='0' max='254'>
-             <enum-method name='hostbridge' version='1'/>
- 
-             <dependents grouping='children'>
-               <range name='niu' min='0' max='0'>
-                <enum-method name='niu' version='1'/>
-               </range>
-             </dependents>
-
-           </range>
-         </dependents>
-
-       </range>
-     </dependents>
-
-   </range>
-  <range name='ses-enclosure' min='0' max='1024'>
-     <enum-method name='ses' version='1' />
-  </range>
-</topology>
--- a/usr/src/lib/fm/topo/modules/sun4v/niu/niu.c	Thu Oct 29 08:02:51 2009 -0700
+++ b/usr/src/lib/fm/topo/modules/sun4v/niu/niu.c	Thu Oct 29 09:48:49 2009 -0700
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -34,7 +34,6 @@
 #include <sys/systeminfo.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <sys/systeminfo.h>
 
 /*
  * niu.c
@@ -61,8 +60,6 @@
 static const topo_pgroup_info_t io_pgroup =
 	{ TOPO_PGROUP_IO, TOPO_STABILITY_PRIVATE, TOPO_STABILITY_PRIVATE, 1 };
 
-static int ist3120 = 0;
-
 /*ARGSUSED*/
 void
 _topo_init(topo_mod_t *mod, topo_version_t version)
@@ -261,19 +258,12 @@
 	/* set ASRU */
 	(void) niu_asru_set(ntn, priv, mod);
 
-	/*
-	 * The SPARC-Enterprise-T3120 systems do not have XAUI cards.
-	 * Don't enumerate them.
-	 */
-	if (!ist3120) {
-		if (topo_node_range_create(mod, ntn, XAUI,
-		    0, XAUI_MAX) < 0) {
-			topo_node_unbind(ntn);
-			topo_mod_dprintf(mod, "child_range_add of XAUI"
-			    "failed: %s\n",
-			    topo_strerror(topo_mod_errno(mod)));
-			return (NULL); /* mod_errno already set */
-		}
+	if (topo_node_range_create(mod, ntn, XAUI, 0, XAUI_MAX) < 0) {
+		topo_node_unbind(ntn);
+		topo_mod_dprintf(mod, "child_range_add of XAUI"
+		    "failed: %s\n",
+		    topo_strerror(topo_mod_errno(mod)));
+		return (NULL); /* mod_errno already set */
 	}
 	return (ntn);
 }
@@ -334,12 +324,9 @@
 			    topo_strerror(topo_mod_errno(mod)));
 			return (-1);
 		}
-		if (!ist3120) {
-			if (topo_mod_enumerate(mod,
-			    ntn, XAUI, XAUI, inst, inst, sib) != 0) {
-				return (topo_mod_seterrno(mod,
-				    EMOD_PARTIAL_ENUM));
-			}
+		if (topo_mod_enumerate(mod,
+		    ntn, XAUI, XAUI, inst, inst, sib) != 0) {
+			return (topo_mod_seterrno(mod, EMOD_PARTIAL_ENUM));
 		}
 		sib = di_sibling_node(sib);
 	}
@@ -365,7 +352,6 @@
 	tnode_t *niun;
 	di_node_t devtree;
 	di_node_t dnode;
-	char platform[MAXNAMELEN];
 
 	if (strcmp(name, NIU) != 0) {
 		topo_mod_dprintf(mod,
@@ -379,19 +365,11 @@
 		return (-1);
 	}
 
-	platform[0] = '\0';
-	(void) sysinfo(SI_PLATFORM, platform, sizeof (platform));
-	if ((strcmp(platform, "SUNW,SPARC-Enterprise-T3120") == 0)) {
-		ist3120 = 1;
-	}
-
 	/*
-	 * Load XAUI Enum, except for SPARC-Enterprise-T3120
+	 * Load XAUI Enum
 	 */
-	if (!ist3120) {
-		if (xaui_enum_load(mod) == NULL)
-			return (-1);
-	}
+	if (xaui_enum_load(mod) == NULL)
+		return (-1);
 
 	dnode = di_drv_first_node("niumx", devtree);
 	if (dnode != DI_NODE_NIL) {
--- a/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h	Thu Oct 29 08:02:51 2009 -0700
+++ b/usr/src/lib/fm/topo/modules/sun4v/pcibus/pci_sun4v.h	Thu Oct 29 09:48:49 2009 -0700
@@ -64,12 +64,6 @@
 	{   5, "MB/RISER2/PCIE5" }
 };
 
-physnm_t t3120_pnms[] = {
-	/* Slot #, Label */
-	{   0, "MB/RISER0/PCIE0" },
-	{   1, "MB/RISER1/PCIE1" }
-};
-
 physnm_t usbrdt5240_pnms[] = {
 	/* Slot #, Label */
 	{   0, "MB/RISER0/EM0" },
@@ -130,9 +124,6 @@
 	{ "SPARC-Enterprise-T5220",
 	    sizeof (t5220_pnms) / sizeof (physnm_t),
 	    t5220_pnms },
-	{ "SPARC-Enterprise-T3120",
-	    sizeof (t3120_pnms) / sizeof (physnm_t),
-	    t3120_pnms },
 	/*
 	 * T5140/T5240 uses the same chassis as T5120/T5220, hence
 	 * the same PCI slot mappings
--- a/usr/src/pkgdefs/SUNWcart200.v/prototype_com	Thu Oct 29 08:02:51 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcart200.v/prototype_com	Thu Oct 29 09:48:49 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This required package information file contains a list of package contents.
@@ -60,7 +60,6 @@
 s none platform/SUNW,Netra-CP3060/lib=../sun4v/lib
 s none platform/SUNW,SPARC-Enterprise-T5220=sun4v
 s none platform/SUNW,SPARC-Enterprise-T5120=sun4v
-s none platform/SUNW,SPARC-Enterprise-T3120=sun4v
 s none platform/SUNW,T5140=sun4v
 s none platform/SUNW,T5240=sun4v
 s none platform/SUNW,T5440=sun4v
--- a/usr/src/pkgdefs/SUNWfmd/prototype_sparc	Thu Oct 29 08:02:51 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfmd/prototype_sparc	Thu Oct 29 09:48:49 2009 -0700
@@ -231,7 +231,6 @@
 d none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps 755 root bin
 f none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps/SPARC-Enterprise-T5120-hc-topology.xml 444 root bin
 f none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps/SPARC-Enterprise-T5220-hc-topology.xml 444 root bin
-f none usr/platform/SUNW,SPARC-Enterprise-T5120/lib/fm/topo/maps/SPARC-Enterprise-T3120-hc-topology.xml 444 root bin
 d none usr/platform/SUNW,T5140 755 root sys
 d none usr/platform/SUNW,T5140/lib 755 root bin
 d none usr/platform/SUNW,T5140/lib/fm 755 root bin
--- a/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com	Thu Oct 29 08:02:51 2009 -0700
+++ b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com	Thu Oct 29 09:48:49 2009 -0700
@@ -228,7 +228,3 @@
 # add Scottsdale link
 #
 s none usr/platform/SUNW,Sun-Blade-T6340=SUNW,T5140
-#
-# add Tenaya link
-#
-s none usr/platform/SUNW,SPARC-Enterprise-T3120=SUNW,SPARC-Enterprise-T5120
--- a/usr/src/uts/sun4v/Makefile.sun4v.shared	Thu Oct 29 08:02:51 2009 -0700
+++ b/usr/src/uts/sun4v/Makefile.sun4v.shared	Thu Oct 29 09:48:49 2009 -0700
@@ -34,7 +34,6 @@
 LINKED_PLATFORMS += SUNW,Sun-Fire-T1000
 LINKED_PLATFORMS += SUNW,SPARC-Enterprise-T5120
 LINKED_PLATFORMS += SUNW,SPARC-Enterprise-T5220
-LINKED_PLATFORMS += SUNW,SPARC-Enterprise-T3120
 LINKED_PLATFORMS += SUNW,T5140
 LINKED_PLATFORMS += SUNW,T5240
 LINKED_PLATFORMS += SUNW,T5440
--- a/usr/src/uts/sun4v/huron/Makefile	Thu Oct 29 08:02:51 2009 -0700
+++ b/usr/src/uts/sun4v/huron/Makefile	Thu Oct 29 09:48:49 2009 -0700
@@ -20,7 +20,7 @@
 #
 #
 # uts/sun4v/huron/Makefile
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -69,7 +69,6 @@
 
 IMPLEMENTED_PLATFORM	= SUNW,SPARC-Enterprise-T5120
 LINKED_PLATFORMS	= SUNW,SPARC-Enterprise-T5220
-LINKED_PLATFORMS	+= SUNW,SPARC-Enterprise-T3120
 
 
 $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%): $(USR_PLAT_DIR)