6278422 Need to support new ontario platform SPARC-Enterprise-T2000 for fujitsu re-branding

6446309 Need to support new Erie platform SPARC-Enterprise-T1000 for fujitsu re-branding

11 files changed, 41 insertions, 17 deletions

diff --git a/usr/src/lib/fm/topo/modules/sun4v/ioboard/iob_platform.c b/usr/src/lib/fm/topo/modules/sun4v/ioboard/iob_platform.c
index c4c19c1d38..a3796223a6 100644
--- a/usr/src/lib/fm/topo/modules/sun4v/ioboard/iob_platform.c
+++ b/usr/src/lib/fm/topo/modules/sun4v/ioboard/iob_platform.c
@@ -43,6 +43,7 @@
 #define	LABEL	"IOBD"
 #define	IOBDFRU	"hc:///component="LABEL
 #define	ERIE	"SUNW,Sun-Fire-T1000"
+#define	ERIE2	"SUNW,SPARC-Enterprise-T1000"
 #define	HB_MAX	1
 
 /*ARGSUSED*/
@@ -133,7 +134,8 @@ platform_iob_enum(tnode_t *parent, topo_instance_t imin, topo_instance_t imax,
 	 * compatibility, we continue to allow the
 	 * ioboard to be a peer to the motherboard SUNW,SunFireT200 systems.
 	 */
-	if (strcmp(plat, ERIE) == 0) {
+	if ((strcmp(plat, ERIE) == 0) ||
+	    (strcmp(plat, ERIE2) == 0)) {
 		if (strcmp(topo_node_name(parent), "motherboard") != 0) {
 			topo_mod_strfree(mod, plat);
 			return (0);
diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/erie.h b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/erie.h
index e507541f89..9e65c5dbfc 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/erie.h
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/erie.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * 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.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -42,6 +41,7 @@ extern "C" {
 #endif
 
 #define	ERIE_PLATFORM			"SUNW,Sun-Fire-T1000"
+#define	ERIE_PLATFORM2			"SUNW,SPARC-Enterprise-T1000"
 #define	ERIE_PCIE_COMP			8
 #define	ERIE_PCIX_COMP			20
 #define	NO_SLOT 			-1
diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c
index 4cbe33a73d..c2ff7503b0 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c
@@ -317,9 +317,11 @@ sun4v_display_pci(picl_nodehdl_t plafh)
 	 * Call functions based on appropriate platform
 	 */
 	if ((strncmp(platbuf, ONTARIO_PLATFORM,
-	    strlen(ONTARIO_PLATFORM))) == 0) {
+		strlen(ONTARIO_PLATFORM)) == 0) ||
+	    (strncmp(platbuf, ONTARIO_PLATFORM2,
+		strlen(ONTARIO_PLATFORM2)) == 0)) {
 		(void) picl_walk_tree_by_class(plafh, "pciex",
-		    "pciex", ontario_pci_callback);
+			"pciex", ontario_pci_callback);
 	} else if ((strncmp(platbuf, PELTON_PLATFORM,
 		strlen(PELTON_PLATFORM))) == 0) {
 		(void) picl_walk_tree_by_class(plafh, "pciex",
diff --git a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.h b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.h
index cfb5646fec..d6bdd45faa 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.h
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * 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.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -42,6 +41,7 @@ extern "C" {
 #endif
 
 #define	ONTARIO_PLATFORM		"SUNW,Sun-Fire-T200"
+#define	ONTARIO_PLATFORM2		"SUNW,SPARC-Enterprise-T2000"
 #define	H20_IMPL			0x5678
 #define	IS_H20(impl)			((impl) == H20_IMPL)
 #define	PCIE_COMP_NUM			20
diff --git a/usr/src/pkgdefs/SUNWcart200.v/pkginfo.tmpl b/usr/src/pkgdefs/SUNWcart200.v/pkginfo.tmpl
index f5112884aa..7e10435412 100644
--- a/usr/src/pkgdefs/SUNWcart200.v/pkginfo.tmpl
+++ b/usr/src/pkgdefs/SUNWcart200.v/pkginfo.tmpl
@@ -32,7 +32,8 @@
 # and package architecture.
 #
 PKG="SUNWcart200"
-NAME="Core Architecture Sun-Fire-T200 Sun-Fire-T100, (Root)"
+NAME="Core Architecture Sun-Fire-T200 Sun-Fire-T100 SPARC-Enterprise-T2000 \
+SPARC-Enterprise-T1000, (Root)"
 ARCH="sparc.sun4v"
 VERSION="ONVERS,REV=0.0.0"
 SUNW_PRODNAME="SunOS"
diff --git a/usr/src/pkgdefs/SUNWcart200.v/prototype_com b/usr/src/pkgdefs/SUNWcart200.v/prototype_com
index 1167f40a1d..4e8733965d 100644
--- a/usr/src/pkgdefs/SUNWcart200.v/prototype_com
+++ b/usr/src/pkgdefs/SUNWcart200.v/prototype_com
@@ -57,3 +57,5 @@ s none platform/SUNW,Sun-Fire-T200/lib=../sun4v/lib
 s none platform/SUNW,Sun-Fire-T1000=sun4v
 s none platform/SUNW,Netra-T2000=SUNW,Sun-Fire-T200
 s none platform/SUNW,Netra-CP3060/lib=../sun4v/lib
+s none platform/SUNW,SPARC-Enterprise-T2000=SUNW,Sun-Fire-T200
+s none platform/SUNW,SPARC-Enterprise-T1000=sun4v
diff --git a/usr/src/pkgdefs/SUNWkvmt200.v/pkginfo.tmpl b/usr/src/pkgdefs/SUNWkvmt200.v/pkginfo.tmpl
index c3db43ca9d..4072e14702 100644
--- a/usr/src/pkgdefs/SUNWkvmt200.v/pkginfo.tmpl
+++ b/usr/src/pkgdefs/SUNWkvmt200.v/pkginfo.tmpl
@@ -32,7 +32,8 @@
 # and package architecture.
 #
 PKG="SUNWkvmt200"
-NAME="Core Architecture Sun-Fire-T200 Sun-Fire-T1000, (Kvm)"
+NAME="Core Architecture Sun-Fire-T200 Sun-Fire-T1000 SPARC-Enterprise-T2000 \
+SPARC-Enterprise-T1000, (Kvm)"
 ARCH="sparc.sun4v"
 VERSION="ONVERS,REV=0.0.0"
 SUNW_PRODNAME="SunOS"
diff --git a/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com
index fa2be912a2..8d9b7f5a61 100644
--- a/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com
+++ b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com
@@ -84,3 +84,11 @@ s none usr/platform/SUNW,Sun-Fire-T1000=SUNW,Sun-Fire-T200
 # add pelton link
 #
 s none usr/platform/SUNW,Netra-T2000=SUNW,Sun-Fire-T200
+#
+# add erie fujitsu link
+#
+s none usr/platform/SUNW,SPARC-Enterprise-T1000=SUNW,Sun-Fire-T200
+#
+# add ontario fujitsu link
+#
+s none usr/platform/SUNW,SPARC-Enterprise-T2000=SUNW,Sun-Fire-T200
diff --git a/usr/src/uts/sun4v/Makefile.sun4v.shared b/usr/src/uts/sun4v/Makefile.sun4v.shared
index eb40af014d..817dd7993f 100644
--- a/usr/src/uts/sun4v/Makefile.sun4v.shared
+++ b/usr/src/uts/sun4v/Makefile.sun4v.shared
@@ -34,6 +34,7 @@
 #
 PLATFORM	 = sun4v
 LINKED_PLATFORMS += SUNW,Sun-Fire-T1000
+LINKED_PLATFORMS += SUNW,SPARC-Enterprise-T1000
 PROMIF		 = ieee1275
 PSMBASE		 = $(UTSBASE)/../psm
 
diff --git a/usr/src/uts/sun4v/ontario/Makefile b/usr/src/uts/sun4v/ontario/Makefile
index e8cc5a38e7..196cd5ce08 100644
--- a/usr/src/uts/sun4v/ontario/Makefile
+++ b/usr/src/uts/sun4v/ontario/Makefile
@@ -68,8 +68,11 @@ modlintlib:   $(ONTARIO_KMODS)
 
 IMPLEMENTED_PLATFORM	= SUNW,Sun-Fire-T200
 LINKED_PLATFORMS	= SUNW,Sun-Fire-T1000
+LINKED_PLATFORMS	+= SUNW,SPARC-Enterprise-T1000
 LINKED_PLATFORMS	+= SUNW,Netra-T2000
+LINKED_PLATFORMS	+= SUNW,SPARC-Enterprise-T2000
 PPLINKED_PLATFORMS	= SUNW,Netra-T2000
+PPLINKED_PLATFORMS	+= SUNW,SPARC-Enterprise-T2000
 
 install:	$(ROOT_ONTARIO_DIR) $(USR_ONTARIO_DIR) \
 		$(USR_ONTARIO_SBIN_DIR) \
diff --git a/usr/src/uts/sun4v/os/fillsysinfo.c b/usr/src/uts/sun4v/os/fillsysinfo.c
index 402aea35f2..e01ae77ac4 100644
--- a/usr/src/uts/sun4v/os/fillsysinfo.c
+++ b/usr/src/uts/sun4v/os/fillsysinfo.c
@@ -103,8 +103,10 @@ map_wellknown_devices()
  */
 #define	ONTARIO_PLATNAME1	"SUNW,Sun-Fire-T200"
 #define	ONTARIO_PLATNAME2	"SUNW,Sun-Fire-T2000"
+#define	ONTARIO_PLATNAME3	"SUNW,SPARC-Enterprise-T2000"
 #define	ERIE_PLATNAME1		"SUNW,Sun-Fire-T100"
 #define	ERIE_PLATNAME2		"SUNW,Sun-Fire-T1000"
+#define	ERIE_PLATNAME3		"SUNW,SPARC-Enterprise-T1000"
 
 void
 fill_cpu(md_t *mdp, mde_cookie_t cpuc)
@@ -778,10 +780,12 @@ init_md_broken(md_t *mdp)
 	 */
 
 	if (md_get_prop_val(mdp, platlist[0], "domaining-enabled", &val) != 0 &&
-	    ((strcmp(vbuf, ONTARIO_PLATNAME1) == 0) ||
-	    (strcmp(vbuf, ONTARIO_PLATNAME2) == 0) ||
-	    (strcmp(vbuf, ERIE_PLATNAME1) == 0) ||
-	    (strcmp(vbuf, ERIE_PLATNAME2) == 0)))
+	((strcmp(vbuf, ONTARIO_PLATNAME1) == 0) ||
+	(strcmp(vbuf, ONTARIO_PLATNAME2) == 0) ||
+	(strcmp(vbuf, ONTARIO_PLATNAME3) == 0) ||
+	(strcmp(vbuf, ERIE_PLATNAME1) == 0) ||
+	(strcmp(vbuf, ERIE_PLATNAME2) == 0) ||
+	(strcmp(vbuf, ERIE_PLATNAME3) == 0)))
 		broken_md_flag = 1;
 
 	md_free_scan_dag(mdp, &platlist);