--- a/usr/src/Makefile.master	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/Makefile.master	Wed Nov 22 11:47:19 2006 -0800
@@ -775,6 +775,10 @@
 			$(CLOSED)/cmd/cmd-crypto/etc/keys/SUNWosnet
 $(EXPORT_RELEASE_BUILD)ELFSIGN_CERT=	\
 			$(CLOSED)/cmd/cmd-crypto/etc/certs/SUNWosnet
+$(EXPORT_RELEASE_BUILD)ELFSIGN_KEY_LIMITED =	\
+			$(CLOSED)/cmd/cmd-crypto/etc/keys/SUNWosnetLimited
+$(EXPORT_RELEASE_BUILD)ELFSIGN_CERT_LIMITED=	\
+			$(CLOSED)/cmd/cmd-crypto/etc/certs/SUNWosnetLimited
 $(EXPORT_RELEASE_BUILD)ELFSIGN_SEKEY =	\
 			$(CLOSED)/cmd/cmd-crypto/etc/keys/SUNWosnetSolaris
 $(EXPORT_RELEASE_BUILD)ELFSIGN_SECERT=	\
@@ -782,6 +786,9 @@
 $(EXPORT_RELEASE_BUILD)ELFSIGN_CRYPTO=	$(ELFSIGN_O) sign \
 			$(ELFSIGN_FORMAT_OPTION) \
 			-k $(ELFSIGN_KEY) -c $(ELFSIGN_CERT) -e $@
+$(EXPORT_RELEASE_BUILD)ELFSIGN_CRYPTO_LIMITED=	$(ELFSIGN_O) sign \
+			$(ELFSIGN_FORMAT_OPTION) \
+			-k $(ELFSIGN_KEY_LIMITED) -c $(ELFSIGN_CERT_LIMITED) -e $@
 $(EXPORT_RELEASE_BUILD)ELFSIGN_OBJECT=	$(ELFSIGN_O) sign \
 			$(ELFSIGN_FORMAT_OPTION) \
 			-k $(ELFSIGN_SEKEY) -c $(ELFSIGN_SECERT) -e $@

--- a/usr/src/cmd/cmd-crypto/etc/Makefile	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/cmd/cmd-crypto/etc/Makefile	Wed Nov 22 11:47:19 2006 -0800
@@ -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,18 +19,20 @@
 # 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.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 RELEASECERTS =		SUNW_SunOS_5.10
+RELEASECRYPTO =		SUNW_SunOS_5.10 \
+			SUNW_SunOS_5.11_Limited
 
 ETCCRYPTOFILES = \
 	kcf.conf \
 	pkcs11.conf \
-	$(RELEASECERTS:%=certs/%) \
+	$(RELEASECRYPTO:%=certs/%) \
 	certs/CA
 
 ETCCERTSFILES = \
@@ -57,7 +58,7 @@
 
 $(ROOTCRYPTODIR)/%:	%
 			$(INS.file)
-$(RELEASECERTS:%=$(ROOTCRYPTODIR)/certs/%): \
+$(RELEASECRYPTO:%=$(ROOTCRYPTODIR)/certs/%): \
 			certs/$(@F:SUNW_SunOS_5.%=SUNWCryptographic%)
 			$(RM) $@
 			$(INS) -s -m $(FILEMODE) -f $(@D) \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/cmd-crypto/etc/certs/SUNWCryptographic11_Limited	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,49 @@
+ Copyright 2006 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"
+
+-----BEGIN CERTIFICATE-----
+MIID+DCCAuCgAwIBAgIEFAAAJDANBgkqhkiG9w0BAQUFADBMMR0wGwYDVQQKExRT
+dW4gTWljcm9zeXN0ZW1zIEluYzErMCkGA1UEAxMiU29sYXJpcyBDcnlwdG9ncmFw
+aGljIEZyYW1ld29yayBDQTAeFw0wNjAxMTcyMTUzMzhaFw0xMjA1MjYyMDUzMzha
+MHUxEzARBgNVBAMTClN1bk9TIDUuMTExFTATBgNVBAsTDFVzYWdlTGltaXRlZDEo
+MCYGA1UECxMfU29sYXJpcyBDcnlwdG9ncmFwaGljIEZyYW1ld29yazEdMBsGA1UE
+ChMUU3VuIE1pY3Jvc3lzdGVtcyBJbmMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBAJFtVRdwryKcSX5lqz6aAbmNy9RbHhy1KF+F6ddDAMTJcZMlg8AynhMLhtVe
+LBNKpTnJ4B/Nb8mNRYl4L6ajoVG1G5F0YA5TKVEjUGUaEIz3cup1sG7ljNTs+lWb
+8O7M+19kZCrsxM2sbvzJx60JhmjjpKxPy8FP/hJ+cFYqbqeZAgMBAAGjggE7MIIB
+NzAdBgNVHQ4EFgQUqy6nnhlVDZg5ftV6j/lR8Z1qiCwwHwYDVR0jBBgwFoAUQghO
+JN0Okzm+CUHvKd4bEFFPLMcwDgYDVR0PAQH/BAQDAgeAMEcGA1UdIARAMD4wPAYL
+YIZIAYb3AIN9k18wLTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5zdW4uY29tL3Br
+aS9jcHMuaHRtbDCBhgYDVR0fBH8wfTB7oCegJYYjaHR0cDovL3d3dy5zdW4uY29t
+L3BraS9wa2lzY2ZjYS5jcmyiUKROMEwxKzApBgNVBAMTIlNvbGFyaXMgQ3J5cHRv
+Z3JhcGhpYyBGcmFtZXdvcmsgQ0ExHTAbBgNVBAoTFFN1biBNaWNyb3N5c3RlbXMg
+SW5jMBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBBQUAA4IBAQAkIzct
+iqdNTMVBLh8xh4Mvqw8tVM9y2tVksxLzK/Clbtu0QyaRNylc2+B0ScPkKwKs9GDT
+oLzZmcx+hOmmxA4UDUsKrbTdncVoX6qdwSDvHbwu5vndfwAcItULJt+pHz10UCFB
+3fGbZe3ZUu0hzViD2NF2uRWcpCIFKCfTESbQ16IOCoCWOSK0QJdkSU2bwe5r7pBl
+HznAEkX8XRI25cXCzg6wSS2dAJ9Lk5SS3LswWZt1M0FDUQfb8LjAq4nuJ58sKmNI
+HEUxf8QGrcXNiRqJP8v5lQGxnBes6Y9g7ASjzTCpFr+xefjCY0HqckDghbcd1XA2
+yzJtabW9y96Rf251
+-----END CERTIFICATE-----

--- a/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.c	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.c	Wed Nov 22 11:47:19 2006 -0800
@@ -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.
  */
 
@@ -265,21 +264,17 @@
 		}
 	}
 
-	if (strcmp(hdd_location, HDD0) == 0) {
-		req_ptr->sbl_id = PCP_SBL_HDD0;
-		target = 0;
-	} else if (strcmp(hdd_location, HDD1) == 0) {
-		req_ptr->sbl_id = PCP_SBL_HDD1;
-		target = 1;
-	} else if (strcmp(hdd_location, HDD2) == 0) {
-		req_ptr->sbl_id = PCP_SBL_HDD2;
-		target = 2;
-	} else if (strcmp(hdd_location, HDD3) == 0) {
-		req_ptr->sbl_id = PCP_SBL_HDD3;
-		target = 3;
+	/*
+	 * Strip off the target from the NAC name.
+	 * The disk NAC will always be HDD#
+	 */
+	if (strncmp(hdd_location, NAC_DISK_PREFIX,
+		strlen(NAC_DISK_PREFIX)) == 0) {
+			(void) sscanf(hdd_location, "%*3s%d", &req_ptr->sbl_id);
+			target = (int)req_ptr->sbl_id;
 	} else {
-		/* this is not one of the onboard disks */
-		goto sbl_return;
+			/* this is not one of the onboard disks */
+			goto sbl_return;
 	}
 
 	/*

--- a/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.h	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/cmd/picl/plugins/sun4v/ontario/piclsbl/piclsbl.h	Wed Nov 22 11:47:19 2006 -0800
@@ -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.
  */
 
@@ -51,10 +50,7 @@
 #define	PCPINIT_TIMEOUT	0x05
 #define	PCPCOMM_TIMEOUT	0x10
 
-#define	HDD0	"HDD0"
-#define	HDD1	"HDD1"
-#define	HDD2	"HDD2"
-#define	HDD3	"HDD3"
+#define	NAC_DISK_PREFIX	"HDD"
 
 /* message types */
 #define	PCP_SBL_CONTROL		0x3
@@ -66,12 +62,6 @@
 	uint32_t sbl_action;
 } pcp_sbl_req_t;
 
-/* sbl_id */
-#define	PCP_SBL_HDD0		0x0
-#define	PCP_SBL_HDD1		0x1
-#define	PCP_SBL_HDD2		0x2
-#define	PCP_SBL_HDD3		0x3
-
 /* sbl_action */
 #define	PCP_SBL_ENABLE		0x1
 #define	PCP_SBL_DISABLE		0x2

--- a/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/Makefile	Wed Nov 22 11:47:19 2006 -0800
@@ -28,7 +28,7 @@
 
 UTSBASE   = ../../../../uts
 
-PLATFORM_OBJECTS= ontario.o erie.o pelton.o stpaul.o
+PLATFORM_OBJECTS= ontario.o erie.o pelton.o stpaul.o huron.o
 
 include ../Makefile.com
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.c	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,489 @@
+/*
+ * 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 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Sun4v Platform specific functions.
+ *
+ * 	called when :
+ *      machine_type ==  huron
+ *
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <kstat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <assert.h>
+#include <libintl.h>
+#include <note.h>
+#include <sys/systeminfo.h>
+#include <sys/openpromio.h>
+#include <sys/sysmacros.h>
+#include <picl.h>
+#include "picldefs.h"
+#include <pdevinfo.h>
+#include <display.h>
+#include <display_sun4v.h>
+#include <libprtdiag.h>
+#include "huron.h"
+
+#if !defined(TEXT_DOMAIN)
+#define	TEXT_DOMAIN	"SYS_TEST"
+#endif
+
+static void
+huron_get_bus_type(char *path, struct io_card *card)
+{
+	if ((strcmp(path, HURON_N2_XAUI0) == 0) ||
+		(strcmp(path, HURON_N2_XAUI1) == 0)) {
+		(void) strcpy(card->bus_type, "SIU");
+	} else {
+		(void) strcpy(card->bus_type, "PCIE");
+	}
+}
+
+void
+huron_get_slot_number(char *path, struct io_card *card)
+{
+	if (strcmp(path, HURON_N2_XAUI0) == 0) {
+		(void) strcpy(card->slot_str, "0");
+		card->slot = 0;
+	} else if (strcmp(path, HURON_N2_XAUI1) == 0) {
+		(void) strcpy(card->slot_str, "1");
+		card->slot = 1;
+	} else if (strncmp(path, HURON_PCIE_SLOT1,
+		strlen(HURON_PCIE_SLOT1)) == 0) {
+		(void) strcpy(card->slot_str, "1");
+		card->slot = 1;
+	} else if (strncmp(path, HURON_PCIE_SLOT2,
+		strlen(HURON_PCIE_SLOT2)) == 0) {
+		(void) strcpy(card->slot_str, "2");
+		card->slot = 2;
+	} else if (strncmp(path, HURON_PCIE_SLOT3,
+		strlen(HURON_PCIE_SLOT3)) == 0) {
+		(void) strcpy(card->slot_str, "3");
+		card->slot = 3;
+	} else if (strncmp(path, HURON_PCIE_SLOT4,
+		strlen(HURON_PCIE_SLOT4)) == 0) {
+		(void) strcpy(card->slot_str, "4");
+		card->slot = 4;
+	} else if (strncmp(path, HURON_PCIE_SLOT5,
+		strlen(HURON_PCIE_SLOT5)) == 0) {
+		(void) strcpy(card->slot_str, "5");
+		card->slot = 5;
+	} else if (strncmp(path, HURON_PCIE_SLOT6,
+		strlen(HURON_PCIE_SLOT6)) == 0) {
+		(void) strcpy(card->slot_str, "6");
+		card->slot = 6;
+	} else {
+		(void) strcpy(card->slot_str, MOTHERBOARD);
+		card->slot = NO_SLOT;
+	}
+}
+
+int
+huron_get_network_instance(char *path)
+{
+	if (strcmp(path, HURON_NETWORK_0) == 0) {
+		return (0);
+	} else if (strcmp(path, HURON_NETWORK_1) == 0) {
+		return (1);
+	} else if (strcmp(path, HURON_NETWORK_2) == 0) {
+		return (2);
+	} else if (strcmp(path, HURON_NETWORK_3) == 0) {
+		return (3);
+	} else if (strcmp(path, HURON_N2_XAUI0) == 0) {
+		return (0);
+	} else if (strcmp(path, HURON_N2_XAUI1) == 0) {
+		return (1);
+	} else {
+		return (-1);
+	}
+}
+/*
+ * add all io devices under pci in io list
+ */
+/* ARGSUSED */
+int
+huron_pci_callback(picl_nodehdl_t pcih, void *args)
+{
+	int		err = PICL_SUCCESS;
+	picl_nodehdl_t	nodeh;
+	char		path[MAXSTRLEN];
+	char		parent_path[MAXSTRLEN];
+	char		piclclass[PICL_CLASSNAMELEN_MAX];
+	char		name[MAXSTRLEN];
+	char		model[MAXSTRLEN];
+	char		*compatible;
+	char		binding_name[MAXSTRLEN];
+	struct io_card	pci_card;
+	int32_t		instance;
+
+	err = picl_get_propval_by_name(pcih, PICL_PROP_DEVFS_PATH, parent_path,
+	    sizeof (parent_path));
+	if (err != PICL_SUCCESS) {
+		return (err);
+	}
+
+	/* Walk through the children */
+
+	err = picl_get_propval_by_name(pcih, PICL_PROP_CHILD, &nodeh,
+	    sizeof (picl_nodehdl_t));
+
+	while (err == PICL_SUCCESS) {
+		err = picl_get_propval_by_name(nodeh, PICL_PROP_CLASSNAME,
+		    piclclass, sizeof (piclclass));
+		if (err !=  PICL_SUCCESS)
+			return (err);
+
+		if (strcmp(piclclass, "pciex") == 0) {
+			err = picl_get_propval_by_name(nodeh, PICL_PROP_PEER,
+			    &nodeh, sizeof (picl_nodehdl_t));
+			continue;
+		}
+
+		if (strcmp(piclclass, "siu") == 0) {
+			err = picl_get_propval_by_name(nodeh, PICL_PROP_CHILD,
+			    &nodeh, sizeof (picl_nodehdl_t));
+			continue;
+		}
+
+		err = picl_get_propval_by_name(nodeh, PICL_PROP_DEVFS_PATH,
+		    path, sizeof (path));
+		if (err != PICL_SUCCESS) {
+			return (err);
+		}
+
+		(void) strlcpy(pci_card.notes, path, sizeof (pci_card.notes));
+
+		huron_get_bus_type(parent_path, &pci_card);
+
+		huron_get_slot_number(parent_path, &pci_card);
+
+		err = picl_get_propval_by_name(nodeh, PICL_PROP_NAME, &name,
+		    sizeof (name));
+		if (err == PICL_PROPNOTFOUND)
+			(void) strcpy(name, "");
+		else if (err != PICL_SUCCESS)
+			return (err);
+
+
+		/* Figure NAC name */
+		if ((strcmp(name, NETWORK) == 0) &&
+		    (strcmp(pci_card.slot_str, MOTHERBOARD) == 0)) {
+			instance = huron_get_network_instance(path);
+			(void) snprintf(pci_card.status,
+			    sizeof (pci_card.status), "%s/%s%d", MOTHERBOARD,
+			    "NET", instance);
+		} else {
+			if (pci_card.slot != NO_SLOT) {
+				(void) snprintf(pci_card.status,
+				    sizeof (pci_card.status), "%s/%s%d",
+				    MOTHERBOARD, pci_card.bus_type,
+				    pci_card.slot);
+			} else {
+				(void) snprintf(pci_card.status,
+				    sizeof (pci_card.status), "%s/%s",
+				    MOTHERBOARD, pci_card.bus_type);
+			}
+		}
+
+		/*
+		 * Get the name of this card. Iif binding_name is found,
+		 * name will be <nodename>-<binding_name>
+		 */
+
+		err = picl_get_propval_by_name(nodeh, PICL_PROP_BINDING_NAME,
+		    &binding_name, sizeof (binding_name));
+		if (err == PICL_PROPNOTFOUND) {
+			/*
+			 * if compatible prop is found, name will be
+			 * <nodename>-<compatible>
+			 */
+			err = huron_get_first_compatible_value(nodeh,
+			    &compatible);
+			if (err == PICL_SUCCESS) {
+				(void) strlcat(name, "-", MAXSTRLEN);
+				(void) strlcat(name, compatible, MAXSTRLEN);
+				free(compatible);
+			} else if (err != PICL_PROPNOTFOUND) {
+				return (err);
+			}
+		} else if (err != PICL_SUCCESS) {
+			return (err);
+		} else if (strcmp(name, binding_name) != 0) {
+			(void) strlcat(name, "-", MAXSTRLEN);
+			(void) strlcat(name, binding_name, MAXSTRLEN);
+		}
+
+		(void) strlcpy(pci_card.name, name, sizeof (pci_card.name));
+
+		/* Get the model of this card */
+
+		err = picl_get_propval_by_name(nodeh, OBP_PROP_MODEL,
+		    &model, sizeof (model));
+		if (err == PICL_PROPNOTFOUND)
+			(void) strcpy(model, "");
+		else if (err != PICL_SUCCESS)
+			return (err);
+		(void) strlcpy(pci_card.model, model, sizeof (pci_card.model));
+
+		/* Print NAC name */
+		log_printf("%-11s", pci_card.status);
+		/* Print IO Type */
+		log_printf("%6s", pci_card.bus_type);
+		/* Print Slot # */
+		log_printf("%5s", pci_card.slot_str);
+		/* Print Parent Path */
+		log_printf("%46.45s", pci_card.notes);
+		/* Printf Card Name */
+		if (strlen(pci_card.name) > 24)
+			log_printf("%25.24s+", pci_card.name);
+		else
+			log_printf("%26s", pci_card.name);
+		/* Print Card Model */
+		if (strlen(pci_card.model) > 10)
+			log_printf("%10.9s+", pci_card.model);
+		else
+			log_printf("%10s", pci_card.model);
+		log_printf("\n");
+
+		err = picl_get_propval_by_name(nodeh, PICL_PROP_PEER, &nodeh,
+		    sizeof (picl_nodehdl_t));
+
+	}
+
+	return (PICL_WALK_CONTINUE);
+}
+
+/*
+ * local functions
+ */
+/*
+ * add all io devices under pci in io list
+ */
+/* ARGSUSED */
+int
+huron_hw_rev_callback(picl_nodehdl_t pcih, void *args)
+{
+	int		err = PICL_SUCCESS;
+	char		path[MAXSTRLEN] = "";
+	char		device_path[MAXSTRLEN];
+	char		NAC[MAXSTRLEN];
+	char		*compatible;
+	int32_t		revision;
+	int		device_found = 0;
+
+	err = picl_get_propval_by_name(pcih, PICL_PROP_DEVFS_PATH, path,
+	    sizeof (path));
+	if (err != PICL_SUCCESS) {
+		return (err);
+	}
+
+	if ((strcmp(path, HURON_NETWORK_0) == 0) ||
+	    (strcmp(path, HURON_NETWORK_1) == 0)) {
+		device_found = 1;
+		(void) snprintf(NAC, sizeof (NAC), "%s/%s%d",
+			MOTHERBOARD, OPHIR, 0);
+		revision = huron_get_int_propval(pcih, OBP_PROP_REVISION_ID,
+		    &err);
+	}
+
+	if ((strcmp(path, HURON_NETWORK_2) == 0) ||
+	    (strcmp(path, HURON_NETWORK_3) == 0)) {
+		device_found = 1;
+		(void) snprintf(NAC, sizeof (NAC), "%s/%s%d", MOTHERBOARD,
+			OPHIR, 1);
+		revision = huron_get_int_propval(pcih, OBP_PROP_REVISION_ID,
+		    &err);
+	}
+
+	if (strcmp(path, HURON_SWITCH_A_PATH) == 0) {
+		device_found = 1;
+		(void) snprintf(NAC, sizeof (NAC), "%s/%s",
+			MOTHERBOARD, HURON_SWITCH_A);
+		revision = huron_get_int_propval(pcih, OBP_PROP_REVISION_ID,
+		    &err);
+	}
+
+	if (strcmp(path, HURON_SWITCH_B_PATH) == 0) {
+		device_found = 1;
+		(void) snprintf(NAC, sizeof (NAC), "%s/%s", MOTHERBOARD,
+			HURON_SWITCH_B);
+		revision = huron_get_int_propval(pcih, OBP_PROP_REVISION_ID,
+		    &err);
+	}
+
+	if (strcmp(path, HURON_SWITCH_C_PATH) == 0) {
+		device_found = 1;
+		(void) snprintf(NAC, sizeof (NAC), "%s/%s", MOTHERBOARD,
+			HURON_SWITCH_C);
+		revision = huron_get_int_propval(pcih, OBP_PROP_REVISION_ID,
+		    &err);
+	}
+
+	if (strcmp(path, HURON_LSI_PATH) == 0) {
+		device_found = 1;
+		(void) snprintf(NAC, sizeof (NAC), "%s/%s", MOTHERBOARD,
+		    SAS_SATA_HBA);
+		revision = huron_get_int_propval(pcih, OBP_PROP_REVISION_ID,
+		    &err);
+	}
+	if (device_found == 1) {
+		(void) strcpy(device_path, path);
+		err = huron_get_first_compatible_value(pcih, &compatible);
+
+		/* Print NAC name */
+		log_printf("%-20s", NAC);
+		/* Print Device Path */
+		if (strlen(device_path) > 45)
+			log_printf("%45.44s+", device_path);
+		else
+			log_printf("%46s", device_path);
+		/* Print Compatible # */
+		log_printf("%31s", compatible);
+		free(compatible);
+		/* Print Revision */
+		log_printf("%6d", revision);
+		log_printf("\n");
+	}
+
+	return (PICL_WALK_CONTINUE);
+}
+
+/*
+ * return the first compatible value
+ */
+int
+huron_get_first_compatible_value(picl_nodehdl_t nodeh, char **outbuf)
+{
+	int		err;
+	picl_prophdl_t	proph;
+	picl_propinfo_t	pinfo;
+	picl_prophdl_t	tblh;
+	picl_prophdl_t	rowproph;
+	char		*pval;
+
+	err = picl_get_propinfo_by_name(nodeh, OBP_PROP_COMPATIBLE,
+	    &pinfo, &proph);
+	if (err != PICL_SUCCESS)
+	    return (err);
+
+	if (pinfo.type == PICL_PTYPE_CHARSTRING) {
+		pval = malloc(pinfo.size);
+		if (pval == NULL)
+			return (PICL_FAILURE);
+		err = picl_get_propval(proph, pval, pinfo.size);
+		if (err != PICL_SUCCESS) {
+			free(pval);
+			return (err);
+		}
+		*outbuf = pval;
+		return (PICL_SUCCESS);
+	}
+
+	if (pinfo.type != PICL_PTYPE_TABLE)
+		return (PICL_FAILURE);
+
+	/* get first string from table */
+	err = picl_get_propval(proph, &tblh, pinfo.size);
+	if (err != PICL_SUCCESS)
+		return (err);
+
+	err = picl_get_next_by_row(tblh, &rowproph);
+	if (err != PICL_SUCCESS)
+		return (err);
+
+	err = picl_get_propinfo(rowproph, &pinfo);
+	if (err != PICL_SUCCESS)
+	    return (err);
+
+	pval = malloc(pinfo.size);
+	if (pval == NULL)
+		return (PICL_FAILURE);
+
+	err = picl_get_propval(rowproph, pval, pinfo.size);
+	if (err != PICL_SUCCESS) {
+		free(pval);
+		return (err);
+	}
+
+	*outbuf = pval;
+	return (PICL_SUCCESS);
+}
+
+int64_t
+huron_get_int_propval(picl_nodehdl_t modh, char *prop_name, int *ret)
+{
+	int		err;
+	picl_prophdl_t	proph;
+	picl_propinfo_t	pinfo;
+	int8_t		int8v;
+	int16_t		int16v;
+	int32_t		int32v;
+	int64_t		int64v;
+
+	err = picl_get_propinfo_by_name(modh, prop_name, &pinfo, &proph);
+	if (err != PICL_SUCCESS) {
+		*ret = err;
+		return (0);
+	}
+
+	/*
+	 * If it is not an int, uint or byte array prop, return failure
+	 */
+	if ((pinfo.type != PICL_PTYPE_INT) &&
+		(pinfo.type != PICL_PTYPE_UNSIGNED_INT) &&
+		(pinfo.type != PICL_PTYPE_BYTEARRAY)) {
+		*ret = PICL_FAILURE;
+		return (0);
+	}
+
+	switch (pinfo.size) {
+	case sizeof (int8_t):
+		err = picl_get_propval(proph, &int8v, sizeof (int8v));
+		*ret = err;
+		return (int8v);
+	case sizeof (int16_t):
+		err = picl_get_propval(proph, &int16v, sizeof (int16v));
+		*ret = err;
+		return (int16v);
+	case sizeof (int32_t):
+		err = picl_get_propval(proph, &int32v, sizeof (int32v));
+		*ret = err;
+		return (int32v);
+	case sizeof (int64_t):
+		err = picl_get_propval(proph, &int64v, sizeof (int64v));
+		*ret = err;
+		return (int64v);
+	default:	/* not supported size */
+		*ret = PICL_FAILURE;
+		return (0);
+	}
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/huron.h	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,126 @@
+/*
+ * 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 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Sun4v Platform header file.
+ *
+ * 	called when :
+ *      machine_type ==  huron
+ *
+ */
+
+#ifndef _HURON_H
+#define	_HURON_H
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define	HURON_2U_PLATFORM	"SUNW,SPARC-Enterprise-T5220"
+#define	HURON_1U_PLATFORM	"SUNW,SPARC-Enterprise-T5120"
+#define	HURON_PCIE_COMP		30
+#define	HURON_XAUI_COMP		17
+#define	NO_SLOT 		-1
+#define	NET_COMP_NUM		3
+#define	MOTHERBOARD		"MB"
+#define	HURON_SWITCH_A		"PCI-SWITCH0"
+#define	HURON_SWITCH_B		"PCI-SWITCH1"
+#define	HURON_SWITCH_C		"PCI-SWITCH2"
+#define	SOUTHBRIDGE		"southbridge"
+#define	OPHIR			"GBE"
+#define	NETWORK			"network"
+#define	PCIE			"/PCIE"
+#define	HURON_SIU		"/siu@80"
+#define	HURON_SWITCH_A_PATH	"/pci@0/pci@0"
+#define	HURON_SWITCH_B_PATH	"/pci@0/pci@0/pci@1/pci@0"
+#define	HURON_SWITCH_C_PATH	"/pci@0/pci@0/pci@8/pci@0"
+#define	HURON_NETWORK_0		"/pci@0/pci@0/pci@1/pci@0/pci@2/network@0"
+#define	HURON_NETWORK_1		"/pci@0/pci@0/pci@1/pci@0/pci@2/network@0,1"
+#define	HURON_NETWORK_2		"/pci@0/pci@0/pci@1/pci@0/pci@3/network@0"
+#define	HURON_NETWORK_3		"/pci@0/pci@0/pci@1/pci@0/pci@3/network@0,1"
+#define	HURON_USB_0		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@1c"
+#define	HURON_USB_1		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@1c,1"
+#define	HURON_USB_2		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@1c,2"
+#define	HURON_USB_3		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@1c,3"
+#define	HURON_IDE		"/pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/ide@1f"
+#define	HURON_PCIE_SLOT1	"/pci@0/pci@0/pci@8/pci@0/pci@2"
+#define	HURON_PCIE_SLOT2	"/pci@0/pci@0/pci@8/pci@0/pci@1"
+#define	HURON_PCIE_SLOT3	"/pci@0/pci@0/pci@8/pci@0/pci@8"
+#define	HURON_PCIE_SLOT4	"/pci@0/pci@0/pci@9"
+#define	HURON_PCIE_SLOT5	"/pci@0/pci@0/pci@8/pci@0/pci@a"
+#define	HURON_PCIE_SLOT6	"/pci@0/pci@0/pci@8/pci@0/pci@9"
+#define	HURON_LSI_PATH		"/pci@0/pci@0/pci@2/scsi@0"
+#define	HURON_N2_XAUI0		"/siu@80/network@0"
+#define	HURON_N2_XAUI1		"/siu@80/network@1"
+#define	SAS_SATA_HBA		"SAS-SATA-HBA"
+
+
+
+/*
+ * Property names
+ */
+#define	OBP_PROP_REG		"reg"
+#define	OBP_PROP_CLOCK_FREQ	"clock-frequency"
+#define	OBP_PROP_BOARD_NUM	"board#"
+#define	OBP_PROP_REVISION_ID	"revision-id"
+#define	OBP_PROP_VERSION_NUM	"version#"
+#define	OBP_PROP_BOARD_TYPE	"board_type"
+#define	OBP_PROP_ECACHE_SIZE	"ecache-size"
+#define	OBP_PROP_IMPLEMENTATION	"implementation#"
+#define	OBP_PROP_MASK		"mask#"
+#define	OBP_PROP_COMPATIBLE	"compatible"
+#define	OBP_PROP_BANNER_NAME	"banner-name"
+#define	OBP_PROP_MODEL		"model"
+#define	OBP_PROP_66MHZ_CAPABLE	"66mhz-capable"
+#define	OBP_PROP_FBC_REG_ID	"fbc_reg_id"
+#define	OBP_PROP_VERSION	"version"
+#define	OBP_PROP_INSTANCE	"instance"
+
+/*
+ * Function Headers
+ */
+
+
+/* local functions */
+
+int huron_pci_callback(picl_nodehdl_t pcih, void *args);
+int huron_hw_rev_callback(picl_nodehdl_t pcih, void *args);
+int huron_get_first_compatible_value(picl_nodehdl_t nodeh,
+    char **outbuf);
+int64_t huron_get_int_propval(picl_nodehdl_t modh, char *prop_name,
+    int *ret);
+void huron_get_nac(char bus_type[], char path[], int s,
+    char name[],  char loc[], int size);
+int huron_get_name(picl_nodehdl_t nodeh, char name[], int size);
+int huron_get_model(picl_nodehdl_t nodeh, char model[], int size);
+int huron_get_path(picl_nodehdl_t nodeh, char path[], int size);
+int huron_get_class(picl_nodehdl_t nodeh, char piclclass[], int size);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _HURON_H */

--- a/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/lib/libprtdiag_psr/sparc/ontario/common/ontario.c	Wed Nov 22 11:47:19 2006 -0800
@@ -55,6 +55,7 @@
 #include "erie.h"
 #include "pelton.h"
 #include "stpaul.h"
+#include "huron.h"
 
 #if !defined(TEXT_DOMAIN)
 #define	TEXT_DOMAIN	"SYS_TEST"
@@ -331,6 +332,13 @@
 		strlen(STPAUL_PLATFORM))) == 0) {
 		(void) picl_walk_tree_by_class(plafh, "pciex",
 		    "pciex", stpaul_pci_callback);
+	} else if ((strncmp(platbuf, HURON_1U_PLATFORM,
+		strlen(HURON_1U_PLATFORM)) == 0) || (strncmp(platbuf,
+		HURON_2U_PLATFORM, strlen(HURON_2U_PLATFORM)) == 0)) {
+			(void) picl_walk_tree_by_class(plafh, "siu",
+				"siu", huron_pci_callback);
+			(void) picl_walk_tree_by_class(plafh, "pciex",
+				"pciex", huron_pci_callback);
 	} else {
 		(void) picl_walk_tree_by_class(plafh, "pciex", "pciex",
 		    erie_pci_callback);
@@ -479,7 +487,7 @@
 	Prom_node	*pnode;
 	char		*value;
 	char 		platbuf[MAXSTRLEN];
-	char	*fmt = "%-20s %-40s %-30s %-9s";
+	char	*fmt = "%-20s %-45s %-30s %-9s";
 
 	log_printf(dgettext(TEXT_DOMAIN, "\n"
 		"========================= HW Revisions "
@@ -500,7 +508,7 @@
 			    "------------------\n"));
 	log_printf(fmt, "Location", "Path", "Device", "Revision\n", 0);
 	log_printf(fmt, "--------------------",
-	    "----------------------------------------",
+	    "---------------------------------------------",
 	    "------------------------------",
 	    "---------\n", 0);
 
@@ -542,6 +550,17 @@
 		    "network", stpaul_hw_rev_callback);
 		(void) picl_walk_tree_by_class(plafh, "scsi-2", "scsi-2",
 		    stpaul_hw_rev_callback);
+	} else if ((strncmp(platbuf, HURON_1U_PLATFORM,
+		strlen(HURON_1U_PLATFORM)) == 0) || (strncmp(platbuf,
+		HURON_2U_PLATFORM, strlen(HURON_2U_PLATFORM)) == 0)) {
+		(void) picl_walk_tree_by_class(plafh, "pciex",
+			"pciex", huron_hw_rev_callback);
+		(void) picl_walk_tree_by_class(plafh, "siu",
+			"siu", huron_hw_rev_callback);
+		(void) picl_walk_tree_by_class(plafh, "network",
+			"network", huron_hw_rev_callback);
+		(void) picl_walk_tree_by_class(plafh, "scsi-2", "scsi-2",
+			huron_hw_rev_callback);
 	} else {
 		(void) picl_walk_tree_by_class(plafh, "pciex", "pciex",
 		    erie_hw_rev_callback);

--- a/usr/src/pkgdefs/Makefile	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/pkgdefs/Makefile	Wed Nov 22 11:47:19 2006 -0800
@@ -74,6 +74,10 @@
 	SUNWldomu.v  \
 	SUNWluxd.u \
 	SUNWluxl \
+	SUNWn2cp.v \
+	SUNWn2cpact.v \
+	SUNWniumx.v \
+	SUNWnxge.v \
 	SUNWonmtst.u \
 	SUNWonmtst.v \
 	SUNWiopc.u \
@@ -90,6 +94,7 @@
 	SUNWstc.u \
 	SUNWus.u \
 	SUNWust1.v \
+	SUNWust2.v \
 	SUNWwrsa.u \
 	SUNWwrsd.u \
 	SUNWwrsm.u \

--- a/usr/src/pkgdefs/SUNWcakr.v/prototype_com	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/pkgdefs/SUNWcakr.v/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -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.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -59,6 +58,7 @@
 f none platform/sun4v/kernel/drv/bge.conf 644 root sys
 f none platform/sun4v/kernel/drv/trapstat.conf 644 root sys
 f none platform/sun4v/kernel/drv/ncp.conf 644 root sys
+f none platform/sun4v/kernel/drv/n2rng.conf 644 root sys
 d none platform/sun4v/kernel/drv/sparcv9 755 root sys
 f none platform/sun4v/kernel/drv/sparcv9/bge 755 root sys
 f none platform/sun4v/kernel/drv/sparcv9/ebus 755 root sys
@@ -71,6 +71,7 @@
 f none platform/sun4v/kernel/drv/sparcv9/vnex 755 root sys
 f none platform/sun4v/kernel/drv/sparcv9/glvc 755 root sys
 f none platform/sun4v/kernel/drv/sparcv9/ncp 755 root sys
+f none platform/sun4v/kernel/drv/sparcv9/n2rng 755 root sys
 f none platform/sun4v/kernel/drv/sparcv9/mdesc 755 root sys
 f none platform/sun4v/kernel/drv/mdesc.conf 644 root sys
 d none platform/sun4v/kernel/misc 755 root sys

--- a/usr/src/pkgdefs/SUNWcart200.v/prototype_com	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/pkgdefs/SUNWcart200.v/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -58,6 +58,8 @@
 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-T5220=sun4v
+s none platform/SUNW,SPARC-Enterprise-T5120=sun4v
 s none platform/SUNW,SPARC-Enterprise-T2000=SUNW,Sun-Fire-T200
 s none platform/SUNW,SPARC-Enterprise-T1000=sun4v
 s none platform/SUNW,Sun-Blade-T6300=sun4v

--- a/usr/src/pkgdefs/SUNWcryptoint/postinstall	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/pkgdefs/SUNWcryptoint/postinstall	Wed Nov 22 11:47:19 2006 -0800
@@ -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 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -63,9 +62,10 @@
 
 if [ $start -eq 1 ]
 then
+	cp -p $kcfconf $tmpfile || error=yes
 	sed -e "/$pkg_start/,/$pkg_end/d" $kcfconf > $tmpfile || error=yes
 else
-	cp $kcfconf $tmpfile || error=yes
+	cp -p $kcfconf $tmpfile || error=yes
 fi
 
 #

--- a/usr/src/pkgdefs/SUNWcryptoint/preremove	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/pkgdefs/SUNWcryptoint/preremove	Wed Nov 22 11:47:19 2006 -0800
@@ -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 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -63,6 +62,7 @@
 
 if [ $start -eq 1 ]
 then
+	cp -p $kcfconf $tmpfile || error=yes
 	sed -e "/$pkg_start/,/$pkg_end/d" $kcfconf > $tmpfile || error=yes
 	if [ "$error" = no ]
 	then 

--- a/usr/src/pkgdefs/SUNWcryptoint/prototype_com	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/pkgdefs/SUNWcryptoint/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -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 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -52,6 +51,7 @@
 d none etc/crypto 755 root sys
 d none etc/crypto/certs 755 root sys
 f none etc/crypto/certs/SUNWosnet 644 root sys
+f none etc/crypto/certs/SUNWosnetLimited 644 root sys
 d none kernel 755 root sys
 d none kernel/crypto 755 root sys
 d none kernel/drv 755 root sys

--- a/usr/src/pkgdefs/SUNWcsr/prototype_com	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/pkgdefs/SUNWcsr/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -111,6 +111,7 @@
 d none etc/crypto/certs 755 root sys
 f none etc/crypto/certs/CA 644 root sys
 f none etc/crypto/certs/SUNW_SunOS_5.10 644 root sys
+f none etc/crypto/certs/SUNW_SunOS_5.11_Limited 644 root sys
 d none etc/crypto/crls 755 root sys
 f none etc/datemsk 444 root sys
 s none etc/dcopy=../usr/sbin/dcopy

--- a/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/pkgdefs/SUNWkvmt200.v/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -93,6 +93,14 @@
 #
 s none usr/platform/SUNW,Netra-T2000=SUNW,Sun-Fire-T200
 #
+# add huron 1U link
+#
+s none usr/platform/SUNW,SPARC-Enterprise-T5120=SUNW,Sun-Fire-T200
+#
+# add huron 2U link
+#
+s none usr/platform/SUNW,SPARC-Enterprise-T5220=SUNW,Sun-Fire-T200
+#
 # add erie fujitsu link
 #
 s none usr/platform/SUNW,SPARC-Enterprise-T1000=SUNW,Sun-Fire-T200

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cp.v/Makefile	Wed Nov 22 11:47:19 2006 -0800
@@ -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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+
+DATAFILES += depend
+
+.KEEP_STATE:
+
+all: $(FILES) postinstall preremove
+
+install: all pkg
+
+include ../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cp.v/pkginfo.tmpl	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,59 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWn2cp"
+NAME="UltraSPARC-T2 Crypto Provider"
+ARCH="sparc.sun4v"
+VERSION="ONVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="root"
+MAXINST="1000"
+CATEGORY="system"
+DESC="UltraSPARC-T2 Crypto Provider"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="true"
+SUNW_PKG_HOLLOW="true"
+SUNW_PKG_THISZONE="false"
+#VSTOCK="<reserved by Release Engineering for package part #>"
+#ISTATES="<developer defined>"
+#RSTATES='<developer defined>'
+#ULIMIT="<developer defined>"
+#ORDER="<developer defined>"
+#PSTAMP="<developer defined>"
+#INTONLY="<developer defined>"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cp.v/postinstall	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,117 @@
+#! /bin/sh
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# install the UltraSPARC-T2 Crypto Provider device driver
+#
+
+PATH="/usr/bin:/usr/sbin:${PATH}"
+export PATH
+
+# Add hardware provider section for the n2cp driver
+# to /etc/crypto/kcf.conf
+
+pkg_start="# Start $PKGINST"
+pkg_end="# End $PKGINST"
+kcfconf=${BASEDIR}/etc/crypto/kcf.conf
+tmpfile=/tmp/$$kcfconf
+error=no
+
+#
+# If /etc/crypto/kcf.conf doesn't exist, bail immediately
+#
+if [ ! -f "$kcfconf" ]
+then
+	echo "$0: ERROR - $kcfconf doesn't exist"
+        exit 2
+fi
+
+#
+# If the package has been already installed, remove old entries
+#
+start=0
+end=0
+egrep -s "$pkg_start" $kcfconf && start=1
+egrep -s "$pkg_end" $kcfconf && end=1
+
+if [ $start -ne $end ] ; then
+	echo "$0: missing Start or End delimiters for $PKGINST in $kcfconf."
+	echo "$0: $kcfconf may be corrupted and was not updated."
+	error=yes
+	exit 2
+fi
+
+if [ $start -eq 1 ]
+then
+	cp -p $kcfconf $tmpfile || error=yes
+	sed -e "/$pkg_start/,/$pkg_end/d" $kcfconf > $tmpfile || error=yes
+else
+	cp -p $kcfconf $tmpfile || error=yes
+fi
+
+#
+# Append the delimiters for this package
+#
+echo "$pkg_start driver_names=n2cp" >> $tmpfile || error=yes
+echo "$pkg_end" >> $tmpfile || error=yes
+
+#
+# Install the updated config file and clean up the tmp file
+#
+if [ "$error" = no ]
+then
+	mv $tmpfile $kcfconf || error=yes
+fi
+rm -f $tmpfile
+
+#
+# All done, if any of the steps above fail, report the error
+#
+if [ "$error" = yes ]
+then
+	echo "$0: ERROR - failed to update $kcfconf."
+        exit 2
+fi
+
+NAMEMAJOR="${BASEDIR}/etc/name_to_major"
+
+if [ "${BASEDIR:=/}" = "/" ]
+then
+	ADD_DRV="/usr/sbin/add_drv"
+else
+	ADD_DRV="/usr/sbin/add_drv -b ${BASEDIR}"
+fi
+
+grep -w n2cp ${NAMEMAJOR} > /dev/null 2>&1
+if [ $? -ne 0 ]
+then
+    $ADD_DRV -i "SUNW,n2-cwq" n2cp || exit 1
+fi
+
+exit 0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cp.v/preremove	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,105 @@
+#! /bin/sh
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+#
+# Preremove script for SUNWn2cp.v.
+#
+# This script removes the hardware provider section for the n2cp
+# driver from /etc/crypto/kcf.conf
+#
+DRV=n2cp
+
+NAMEMAJOR="${BASEDIR}/etc/name_to_major"
+
+#
+# Determine if we are on an alternate BASEDIR
+#
+if [ "${BASEDIR:=/}" = "/" ]
+then
+        REM_DRV="/usr/sbin/rem_drv"
+else
+        REM_DRV="/usr/sbin/rem_drv -b ${BASEDIR}"
+fi
+
+#
+# Remove the driver, but only if this has not already been done.
+#
+grep -w "${DRV}" ${NAMEMAJOR} > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+    ${REM_DRV} ${DRV} || exit 1
+fi
+
+pkg_start="# Start $PKGINST"
+pkg_end="# End $PKGINST"
+kcfconf=${BASEDIR}/etc/crypto/kcf.conf
+tmpfile=/tmp/$$kcfconf
+error=no
+
+#
+# If /etc/crypto/kcf.conf doesn't exist, bail immediately
+#
+if [ ! -f "$kcfconf" ]
+then
+	echo "$0: ERROR - $kcfconf doesn't exist"
+	exit 2
+fi
+
+#
+# Strip all entries belonging to this package
+#
+start=0
+end=0
+egrep -s "$pkg_start" $kcfconf && start=1
+egrep -s "$pkg_end" $kcfconf && end=1
+
+if [ $start -ne $end ] ; then
+	echo "$0: missing Start or End delimiters for $PKGINST in $kcfconf."
+	echo "$0: $kcfconf may be corrupted and was not updated."
+	error=yes
+	exit 2
+fi
+
+if [ $start -eq 1 ]
+then
+	cp -p $kcfconf $tmpfile || error=yes
+	sed -e "/$pkg_start/,/$pkg_end/d" $kcfconf > $tmpfile || error=yes
+	if [ "$error" = no ]
+	then 
+		mv $tmpfile $kcfconf || error=yes
+	fi
+	rm -f $tmpfile
+else
+	exit 0
+fi
+
+if [ "$error" = yes ]
+then
+	echo "$0: ERROR - failed to update $kcfconf."
+	exit 2
+fi
+exit 0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cp.v/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,55 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+i postinstall
+i preremove
+#
+# source locations relative to the prototype file
+#
+# SUNWn2cp.v
+#
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+f none platform/sun4v/kernel/drv/n2cp.conf 644 root sys
+d none platform/sun4v/kernel/drv/sparcv9 755 root sys
+f none platform/sun4v/kernel/drv/sparcv9/n2cp 755 root sys

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cp.v/prototype_sparc	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,48 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWn2cp.v
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cpact.v/Makefile	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,36 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+
+.KEEP_STATE:
+
+all: $(FILES)
+
+install: all pkg
+
+include ../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cpact.v/depend	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,45 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#	 P indicates a prerequisite for installation
+#	 I indicates an incompatible package
+#	 R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+# 	(<arch>)<version>
+# 	(<arch>)<version>
+# 	...
+# <type> <pkg.abbr> <name>
+# ...
+
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWn2cp	UltraSPARC-T2 Crypto Provider

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cpact.v/pkginfo.tmpl	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,59 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWn2cpact"
+NAME="UltraSPARC-T2 Crypto Provider Activation File"
+ARCH="sparc.sun4v"
+VERSION="ONVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="root"
+MAXINST="1000"
+CATEGORY="system"
+DESC="UltraSPARC-T2 Crypto Provider Activation File"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="true"
+SUNW_PKG_HOLLOW="true"
+SUNW_PKG_THISZONE="false"
+#VSTOCK="<reserved by Release Engineering for package part #>"
+#ISTATES="<developer defined>"
+#RSTATES='<developer defined>'
+#ULIMIT="<developer defined>"
+#ORDER="<developer defined>"
+#PSTAMP="<developer defined>"
+#INTONLY="<developer defined>"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cpact.v/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,52 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+#
+# source locations relative to the prototype file
+#
+# SUNWn2cpact.v
+#
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+d none platform/sun4v/kernel/drv/sparcv9 755 root sys
+f none platform/sun4v/kernel/drv/sparcv9/n2cp.esa 644 root sys

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWn2cpact.v/prototype_sparc	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,48 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWn2cpact.v
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWniumx.v/Makefile	Wed Nov 22 11:47:19 2006 -0800
@@ -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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+
+DATAFILES += depend
+
+.KEEP_STATE:
+
+all: $(FILES) postinstall postremove
+
+install: all pkg
+
+include ../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWniumx.v/pkginfo.tmpl	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,48 @@
+#
+# Copyright 2006 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"
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWniumx"
+NAME="UltraSPARC-T2 NIU nexus driver"
+ARCH="sparc.sun4v"
+VERSION="ONVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="root"
+SUNW_PKG_ALLZONES="true"
+SUNW_PKG_HOLLOW="true"
+SUNW_PKG_THISZONE="false"
+MAXINST="1000"
+CATEGORY="system"
+DESC="UltraSPARC-T2 NIU nexus driver"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWniumx.v/postinstall	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,132 @@
+#!/sbin/sh
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+# Function: check_add_drv()
+#
+# This function will check if the module has an entry in etc/name_to_major
+# If not simply calls add_drv with the arguments given. If there is
+# such an entry in name_to_major file, it adds entries in driver_aliases
+# driver_classes and minor_perm if necessary.
+# The syntax of this function is the same as add_drv. 
+
+check_add_drv()
+{
+	if [ "$BASEDIR" = "" ]
+	then
+		BASEDIR=/  
+	fi
+	alias=""
+	class=""
+	ADD_ALIAS=0
+	ADD_CLASS=0
+	ADD_MINOR=0
+	OPTIND=1
+	IS_NET_DRIVER=0
+
+	cmd="add_drv"
+
+	NO_CMD=
+	while getopts i:b:m:c:N  opt
+	do
+		case $opt in
+			N )	NO_CMD=1;;
+			i )	ADD_ALIAS=1	
+				alias=$OPTARG
+				cmd=$cmd" -i '$alias'"
+				;;
+			m )	ADD_MINOR=1
+				minor=$OPTARG
+				cmd=$cmd" -m '$minor'"
+				;;
+			c)	ADD_CLASS=1
+				class=$OPTARG
+				cmd=$cmd" -c $class"
+				;;
+			b)	BASEDIR=$OPTARG
+				cmd=$cmd" -b $BASEDIR"
+				;;
+			\?) 	echo "check_add_drv can not handle this option"
+				return
+				;;
+			esac
+	done 
+	shift `/usr/bin/expr $OPTIND - 1`
+	
+	drvname=$1
+
+	cmd=$cmd" "$drvname
+
+	drvname=`echo $drvname | /usr/bin/sed 's;.*/;;g'`
+
+	/usr/bin/grep "^$drvname[ 	]" $BASEDIR/etc/name_to_major >  /dev/null 2>&1
+
+	if [ "$NO_CMD" = "" -a $? -ne 0 ] 
+	then
+		eval $cmd
+	else	
+		# entry already in name_to_major, add alias, class, minorperm
+		# if necessary
+		if [ $ADD_ALIAS = 1 ]	
+		then
+			for i in $alias
+			do
+				/usr/bin/egrep "^$drvname[ 	]+$i" $BASEDIR/etc/driver_aliases>/dev/null 2>&1
+				if [ $? -ne 0 ]
+				then
+					echo "$drvname $i" >> $BASEDIR/etc/driver_aliases	
+				fi
+			done
+		fi
+
+		if [ $ADD_CLASS = 1 ]
+		then
+			/usr/bin/egrep "^$drvname[ 	]+$class( |	|$)" $BASEDIR/etc/driver_classes > /dev/null 2>&1
+			if [ $? -ne 0 ]
+			then 
+				echo "$drvname\t$class" >> $BASEDIR/etc/driver_classes
+			fi
+		fi
+
+		if [ $ADD_MINOR = 1 ]
+		then
+			/usr/bin/grep "^$drvname:" $BASEDIR/etc/minor_perm > /dev/null 2>&1
+			if [ $? -ne 0 ]
+			then 
+				minorentry="$drvname:$minor"
+				echo $minorentry >> $BASEDIR/etc/minor_perm
+			fi
+		fi
+
+	fi
+
+	
+}
+
+check_add_drv -b "${BASEDIR}" -i \
+'"SUNW,niumx"
+'\
+-m '* 0666 root sys' niumx

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWniumx.v/postremove	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,38 @@
+#!/sbin/sh
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+BD=${BASEDIR:-/}
+if grep -w niumx $BD/etc/name_to_major > /dev/null 2>&1
+then
+	rem_drv -b ${BD} niumx
+	if [ $? -ne 0 ]
+	then
+		exit 1 	
+	fi
+fi
+exit 0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWniumx.v/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,48 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+i postinstall
+i postremove
+
+#
+# source locations relative to the prototype file
+#
+# SUNWniumx.v
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWniumx.v/prototype_sparc	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,57 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWniumx.v
+#
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+d none platform/sun4v/kernel/drv/sparcv9 755 root sys
+f none platform/sun4v/kernel/drv/sparcv9/niumx 755 root sys

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnxge.v/Makefile	Wed Nov 22 11:47:19 2006 -0800
@@ -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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+
+DATAFILES += depend
+
+.KEEP_STATE:
+
+all: $(FILES) postinstall postremove
+
+install: all pkg
+
+include ../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnxge.v/pkginfo.tmpl	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,49 @@
+#
+# Copyright 2006 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"
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWnxge"
+NAME="UltraSPARC-T2 NIU leaf driver"
+ARCH="sparc.sun4v"
+VERSION="ONVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="root"
+SUNW_PKG_ALLZONES="true"
+SUNW_PKG_HOLLOW="true"
+SUNW_PKG_THISZONE="false"
+MAXINST="1000"
+CATEGORY="system"
+DESC="UltraSPARC-T2 NIU leaf driver"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnxge.v/postinstall	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,132 @@
+#!/sbin/sh
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+
+# Function: check_add_drv()
+#
+# This function will check if the module has an entry in etc/name_to_major
+# If not simply calls add_drv with the arguments given. If there is
+# such an entry in name_to_major file, it adds entries in driver_aliases
+# driver_classes and minor_perm if necessary.
+# The syntax of this function is the same as add_drv. 
+
+check_add_drv()
+{
+	if [ "$BASEDIR" = "" ]
+	then
+		BASEDIR=/  
+	fi
+	alias=""
+	class=""
+	ADD_ALIAS=0
+	ADD_CLASS=0
+	ADD_MINOR=0
+	OPTIND=1
+	IS_NET_DRIVER=0
+
+	cmd="add_drv"
+
+	NO_CMD=
+	while getopts i:b:m:c:N  opt
+	do
+		case $opt in
+			N )	NO_CMD=1;;
+			i )	ADD_ALIAS=1	
+				alias=$OPTARG
+				cmd=$cmd" -i '$alias'"
+				;;
+			m )	ADD_MINOR=1
+				minor=$OPTARG
+				cmd=$cmd" -m '$minor'"
+				;;
+			c)	ADD_CLASS=1
+				class=$OPTARG
+				cmd=$cmd" -c $class"
+				;;
+			b)	BASEDIR=$OPTARG
+				cmd=$cmd" -b $BASEDIR"
+				;;
+			\?) 	echo "check_add_drv can not handle this option"
+				return
+				;;
+			esac
+	done 
+	shift `/usr/bin/expr $OPTIND - 1`
+	
+	drvname=$1
+
+	cmd=$cmd" "$drvname
+
+	drvname=`echo $drvname | /usr/bin/sed 's;.*/;;g'`
+
+	/usr/bin/grep "^$drvname[ 	]" $BASEDIR/etc/name_to_major >  /dev/null 2>&1
+
+	if [ "$NO_CMD" = "" -a $? -ne 0 ] 
+	then
+		eval $cmd
+	else	
+		# entry already in name_to_major, add alias, class, minorperm
+		# if necessary
+		if [ $ADD_ALIAS = 1 ]	
+		then
+			for i in $alias
+			do
+				/usr/bin/egrep "^$drvname[ 	]+$i" $BASEDIR/etc/driver_aliases>/dev/null 2>&1
+				if [ $? -ne 0 ]
+				then
+					echo "$drvname $i" >> $BASEDIR/etc/driver_aliases	
+				fi
+			done
+		fi
+
+		if [ $ADD_CLASS = 1 ]
+		then
+			/usr/bin/egrep "^$drvname[ 	]+$class( |	|$)" $BASEDIR/etc/driver_classes > /dev/null 2>&1
+			if [ $? -ne 0 ]
+			then 
+				echo "$drvname\t$class" >> $BASEDIR/etc/driver_classes
+			fi
+		fi
+
+		if [ $ADD_MINOR = 1 ]
+		then
+			/usr/bin/grep "^$drvname:" $BASEDIR/etc/minor_perm > /dev/null 2>&1
+			if [ $? -ne 0 ]
+			then 
+				minorentry="$drvname:$minor"
+				echo $minorentry >> $BASEDIR/etc/minor_perm
+			fi
+		fi
+
+	fi
+
+	
+}
+
+check_add_drv -b "${BASEDIR}" -i \
+'"SUNW,niusl"
+'\
+-m '* 0666 root sys' nxge

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnxge.v/postremove	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,38 @@
+#!/sbin/sh
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+BD=${BASEDIR:-/}
+if grep -w nxge $BD/etc/name_to_major > /dev/null 2>&1
+then
+	rem_drv -b ${BD} nxge
+	if [ $? -ne 0 ]
+	then
+		exit 1 	
+	fi
+fi
+exit 0

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnxge.v/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,47 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+i postinstall
+i postremove
+#
+# source locations relative to the prototype file
+#
+# SUNWnxge.v
+#

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWnxge.v/prototype_sparc	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,57 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+#
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWnxge.v
+#
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/drv 755 root sys
+d none platform/sun4v/kernel/drv/sparcv9 755 root sys
+f none platform/sun4v/kernel/drv/sparcv9/nxge 755 root sys

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWust2.v/Makefile	Wed Nov 22 11:47:19 2006 -0800
@@ -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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+include ../Makefile.com
+
+DATAFILES += depend
+
+.KEEP_STATE:
+
+all: $(FILES)
+
+install: all pkg
+
+include ../Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWust2.v/pkginfo.tmpl	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,55 @@
+#
+# Copyright 2006 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"
+#
+# This required package information file describes characteristics of the
+# package, such as package abbreviation, full package name, package version,
+# and package architecture.
+#
+PKG="SUNWust2"
+NAME="UltraSPARC-T2 (Root)"
+ARCH="sparc.sun4v"
+VERSION="ONVERS,REV=0.0.0"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+SUNW_PKGTYPE="root"
+MAXINST="1000"
+CATEGORY="system"
+DESC="UltraSPARC-T2 core kernel software"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+CLASSES="none"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKG_ALLZONES="true"
+SUNW_PKG_HOLLOW="true"
+SUNW_PKG_THISZONE="false"
+#VSTOCK="<reserved by Release Engineering for package part #>"
+#ISTATES="<developer defined>"
+#RSTATES='<developer defined>'
+#ULIMIT="<developer defined>"
+#ORDER="<developer defined>"
+#PSTAMP="<developer defined>"
+#INTONLY="<developer defined>"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWust2.v/prototype_com	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,55 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+# packaging files
+i pkginfo
+i copyright
+i depend
+#
+# source locations relative to the prototype file
+#
+# SUNWust2.v
+#
+d none platform 755 root sys
+d none platform/sun4v 755 root sys
+d none platform/sun4v/kernel 755 root sys
+d none platform/sun4v/kernel/cpu 755 root sys
+d none platform/sun4v/kernel/cpu/sparcv9 755 root sys
+f none platform/sun4v/kernel/cpu/sparcv9/SUNW,UltraSPARC-T2 755 root sys
+d none platform/sun4v/kernel/pcbe 755 root sys
+d none platform/sun4v/kernel/pcbe/sparcv9 755 root sys
+f none platform/sun4v/kernel/pcbe/sparcv9/pcbe.SUNW,UltraSPARC-T2 755 root sys

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWust2.v/prototype_sparc	Wed Nov 22 11:47:19 2006 -0800
@@ -0,0 +1,48 @@
+#
+# 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 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# This required package information file contains a list of package contents.
+# The 'pkgmk' command uses this file to identify the contents of a package
+# and their location on the development machine when building the package.
+# Can be created via a text editor or through use of the 'pkgproto' command.
+#
+
+#!search <pathname pathname ...>	# where to find pkg objects
+#!include <filename>			# include another 'prototype' file
+#!default <mode> <owner> <group>	# default used if not specified on entry
+#!<param>=<value>			# puts parameter in pkg environment
+
+#
+# Include ISA independent files (prototype_com)
+#
+!include prototype_com
+#
+# List files which are SPARC specific here
+#
+# source locations relative to the prototype file
+#
+# SUNWust2.v
+#

--- a/usr/src/req.flg	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/req.flg	Wed Nov 22 11:47:19 2006 -0800
@@ -38,6 +38,8 @@
 echo_file usr/src/tools/abi/etc/ABI_i386.db
 echo_file usr/src/tools/abi/etc/exceptions
 echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnet
+echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnetLimited
 echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnetSolaris
 echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnet
+echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnetLimited
 echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnetSolaris

--- a/usr/src/tools/findunref/exception_list	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/tools/findunref/exception_list	Wed Nov 22 11:47:19 2006 -0800
@@ -122,6 +122,8 @@
 #
 # Ignore files that get used during a EXPORT_SRC or CRYPT_SRC build only.
 #
+./closed/uts/sun4v/io/n2cp/Makefile
+./closed/uts/sun4v/io/ncp/Makefile
 ./src/common/crypto/aes/Makefile
 ./src/common/crypto/arcfour/Makefile
 ./src/common/crypto/blowfish/Makefile
@@ -139,7 +141,6 @@
 ./src/uts/common/gssapi/include/Makefile
 ./src/uts/common/gssapi/mechs/dummy/Makefile
 ./src/uts/common/gssapi/mechs/krb5/Makefile
-./closed/uts/sun4v/io/ncp/Makefile
 ./src/xmod
 
 #

--- a/usr/src/uts/Makefile.targ	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/Makefile.targ	Wed Nov 22 11:47:19 2006 -0800
@@ -251,6 +251,12 @@
 	$(INS.conffile)
 
 #
+#	Targets for '.esa' (activation) file installation.
+#
+$(ROOT_ACTFILE):
+	$(INS.actfile)
+
+#
 #	Targets for creating links between common platforms. ROOT_PLAT_LINKS
 #	are are the /platform level while ROOT_PLAT_LINKS_2 are one level
 #	down (/platform/`uname -i`/{lib|sbin|kernel}.

--- a/usr/src/uts/Makefile.uts	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/Makefile.uts	Wed Nov 22 11:47:19 2006 -0800
@@ -289,12 +289,19 @@
 ROOT_CONFFILE_64	= $(ROOTMODULE:%/$(SUBDIR64)/$(MODULE)=%/$(MODULE)).conf
 ROOT_CONFFILE		= $(ROOT_CONFFILE_$(CLASS))
 
+ROOT_ACTFILE		= $(ROOTMODULE).esa
+
 
 INS.conffile= \
 	$(RM) $@; $(INS) -s -m $(CFILEMODE) -f $(@D) $(SRC_CONFFILE)
 $(CH)INS.conffile= \
     $(INS) -s -m $(CFILEMODE) -u $(OWNER) -g $(GROUP) -f $(@D) $(SRC_CONFFILE)
 
+INS.actfile= \
+	$(RM) $@; $(INS) -s -m $(CFILEMODE) -f $(@D) $(BINARY).esa
+$(CH)INS.actfile= \
+	$(INS) -s -m $(CFILEMODE) -u $(OWNER) -g $(GROUP) -f $(@D) $(BINARY).esa
+
 #
 # The CTF merge of child kernel modules is performed against one of the genunix
 # modules.  For Intel builds, all modules will be used with a single genunix:

--- a/usr/src/uts/common/io/pcie.c	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/common/io/pcie.c	Wed Nov 22 11:47:19 2006 -0800
@@ -37,7 +37,10 @@
 #include <sys/pcie.h>
 #include <sys/pci_cap.h>
 #include <sys/pcie_impl.h>
+#include <sys/pci_impl.h>
 
+static int pcie_get_bdf_from_dip(dev_info_t *dip, uint32_t *bdf);
+dev_info_t *pcie_get_my_childs_dip(dev_info_t *dip, dev_info_t *rdip);
 
 #ifdef  DEBUG
 uint_t pcie_debug_flags = 0;
@@ -127,10 +130,24 @@
 	uint8_t			bcr;
 	uint16_t		command_reg, status_reg;
 	uint16_t		cap_ptr;
+	pci_parent_data_t	*pd_p;
 
 	if (pci_config_setup(cdip, &config_handle) != DDI_SUCCESS)
 		return (DDI_FAILURE);
 
+	/* Allocate memory for pci parent data */
+	pd_p = kmem_zalloc(sizeof (pci_parent_data_t), KM_SLEEP);
+
+	/*
+	 * Retrieve and save BDF and PCIE2PCI bridge's secondary bus
+	 * information in the parent private data structure.
+	 */
+	if (pcie_get_bdf_from_dip(cdip, &pd_p->pci_bdf) != DDI_SUCCESS)
+		goto fail;
+
+	pd_p->pci_sec_bus = ddi_prop_get_int(DDI_DEV_T_ANY, cdip, 0,
+	    "pcie2pci-sec-bus", 0);
+
 	/*
 	 * Determine the configuration header type.
 	 */
@@ -168,14 +185,20 @@
 	}
 
 	if ((PCI_CAP_LOCATE(config_handle, PCI_CAP_ID_PCI_E, &cap_ptr))
-		!= DDI_FAILURE)
+		!= DDI_FAILURE) {
 		pcie_enable_errors(cdip, config_handle);
 
+		pd_p->pci_phfun = (pci_config_get8(config_handle,
+		    cap_ptr + PCIE_DEVCAP) & PCIE_DEVCAP_PHTM_FUNC_MASK) >> 3;
+	}
+
+	ddi_set_parent_data(cdip, (void *)pd_p);
 	pci_config_teardown(&config_handle);
-
 	return (DDI_SUCCESS);
 fail:
 	cmn_err(CE_WARN, "PCIE init child failed\n");
+	kmem_free(pd_p, sizeof (pci_parent_data_t));
+	pci_config_teardown(&config_handle);
 	return (DDI_FAILURE);
 }
 
@@ -208,6 +231,12 @@
 pcie_uninitchild(dev_info_t *cdip)
 {
 	ddi_acc_handle_t	config_handle;
+	pci_parent_data_t	*pd_p;
+
+	if (pd_p = ddi_get_parent_data(cdip)) {
+		ddi_set_parent_data(cdip, NULL);
+		kmem_free(pd_p, sizeof (pci_parent_data_t));
+	}
 
 	if (pci_config_setup(cdip, &config_handle) != DDI_SUCCESS)
 		return;
@@ -472,6 +501,39 @@
 		PCIE_AER_SUCE_BITS);
 }
 
+static int
+pcie_get_bdf_from_dip(dev_info_t *dip, uint32_t *bdf)
+{
+	pci_regspec_t	*regspec;
+	int		reglen;
+
+	if (ddi_prop_lookup_int_array(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
+	    "reg", (int **)&regspec, (uint_t *)&reglen) != DDI_SUCCESS)
+		return (DDI_FAILURE);
+
+	if (reglen < (sizeof (pci_regspec_t) / sizeof (int))) {
+		ddi_prop_free(regspec);
+		return (DDI_FAILURE);
+	}
+
+	/* Get phys_hi from first element.  All have same bdf. */
+	*bdf = (regspec->pci_phys_hi & (PCI_REG_BDFR_M ^ PCI_REG_REG_M)) >> 8;
+
+	ddi_prop_free(regspec);
+	return (DDI_SUCCESS);
+}
+
+dev_info_t *
+pcie_get_my_childs_dip(dev_info_t *dip, dev_info_t *rdip)
+{
+	dev_info_t *cdip = rdip;
+
+	for (; ddi_get_parent(cdip) != dip; cdip = ddi_get_parent(cdip))
+		;
+
+	return (cdip);
+}
+
 #ifdef	DEBUG
 /*
  * This is a temporary stop gap measure.

--- a/usr/src/uts/common/os/kcpc.c	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/common/os/kcpc.c	Wed Nov 22 11:47:19 2006 -0800
@@ -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.
@@ -891,7 +890,15 @@
 	if (pcbe_ops == NULL ||
 	    (bitmap = pcbe_ops->pcbe_overflow_bitmap()) == 0)
 		return (DDI_INTR_UNCLAIMED);
-
+#ifdef N2_ERRATUM_134
+	/*
+	 * Check if any of the supported counters overflowed. If
+	 * not, it's a spurious overflow trap (Niagara2 1.x silicon
+	 * bug). Ignore this trap.
+	 */
+	if ((bitmap & ((1 <<cpc_ncounters)-1)) == 0)
+		return (DDI_INTR_CLAIMED);
+#endif
 	/*
 	 * Prevent any further interrupts.
 	 */

--- a/usr/src/uts/common/sys/pci_impl.h	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/common/sys/pci_impl.h	Wed Nov 22 11:47:19 2006 -0800
@@ -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.
  */
 
@@ -124,6 +123,22 @@
 #endif /* __i386 || __amd64 */
 
 /*
+ * Parent private data structure for PCI/PCI-X/PCIe devices.
+ */
+typedef struct pci_parent_data {
+	uint32_t	pci_bdf;	/* BDF for pci/pci-x/pcie */
+	uint8_t		pci_sec_bus;	/* PCIE2PCI bridge's secondary bus */
+	uint8_t		pci_phfun;	/* Phantom funs for pci-x/pcie */
+} pci_parent_data_t;
+
+#define	PCI_GET_BDF(dip)	\
+	((pci_parent_data_t *)DEVI((dip))->devi_parent_data)->pci_bdf
+#define	PCI_GET_SEC_BUS(dip)	\
+	((pci_parent_data_t *)DEVI((dip))->devi_parent_data)->pci_sec_bus
+#define	PCI_GET_PHFUN(dip)	\
+	((pci_parent_data_t *)DEVI((dip))->devi_parent_data)->pci_phfun
+
+/*
  * PCI capability related definitions.
  */
 

--- a/usr/src/uts/common/sys/pcie_impl.h	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/common/sys/pcie_impl.h	Wed Nov 22 11:47:19 2006 -0800
@@ -50,6 +50,7 @@
     ddi_acc_handle_t config_handle);
 extern void pcie_disable_errors(dev_info_t *dip,
     ddi_acc_handle_t config_handle);
+extern dev_info_t *pcie_get_my_childs_dip(dev_info_t *dip, dev_info_t *rdip);
 extern int pcie_enable_ce(dev_info_t *dip,
     ddi_acc_handle_t config_handle);
 

--- a/usr/src/uts/common/sys/sha1.h	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/common/sys/sha1.h	Wed Nov 22 11:47:19 2006 -0800
@@ -34,6 +34,12 @@
 extern "C" {
 #endif
 
+/*
+ * NOTE: n2rng (Niagara2 RNG driver) accesses the state field of
+ * SHA1_CTX directly.  NEVER change this structure without verifying
+ * compatiblity with n2rng.  The important thing is that the state
+ * must be in a field declared as uint32_t state[5].
+ */
 /* SHA-1 context. */
 typedef struct 	{
 	uint32_t state[5];	/* state (ABCDE) */

--- a/usr/src/uts/sparc/os/driver_aliases	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/sparc/os/driver_aliases	Wed Nov 22 11:47:19 2006 -0800
@@ -170,3 +170,6 @@
 oplmsu  "FJSV,oplmsu"
 mc-opl "FJSV,oplmc"
 scfd "FJSV,scfc"
+ncp "SUNW,sun4v-ncp"
+ncp "SUNW,n2-mau"
+n2rng "SUNW,n2-rng"

--- a/usr/src/uts/sparc/os/name_to_major	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/sparc/os/name_to_major	Wed Nov 22 11:47:19 2006 -0800
@@ -214,3 +214,4 @@
 oplkmdrv 266
 pxb_bcm 267
 pxb_plx 268
+n2rng 269

--- a/usr/src/uts/sun4/io/px/px_dma.c	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/sun4/io/px/px_dma.c	Wed Nov 22 11:47:19 2006 -0800
@@ -112,6 +112,13 @@
 	mp->dmai_error.err_fep = NULL;
 	mp->dmai_error.err_cf = NULL;
 
+	/*
+	 * For a given rdip, set mp->dmai_bdf with the bdf value of px's
+	 * immediate child. As we move down the PCIe fabric, this field
+	 * may be modified by switch and bridge drivers.
+	 */
+	mp->dmai_bdf = PCI_GET_BDF(pcie_get_my_childs_dip(dip, rdip));
+
 	return (mp);
 }
 
@@ -204,7 +211,6 @@
 		mp->dmai_flags |= PX_DMAI_FLAGS_NOCTX;
 
 	/* store augumented dev input to mp->dmai_attr */
-	mp->dmai_minxfer	= lim_p->dlim_minxfer;
 	mp->dmai_burstsizes	= lim_p->dlim_burstsizes;
 	attr_p = &mp->dmai_attr;
 	SET_DMAATTR(attr_p, lo, hi, -1, count_max);
@@ -343,7 +349,6 @@
 	if (PX_DMA_NOCTX(mp->dmai_rdip))
 		mp->dmai_flags |= PX_DMAI_FLAGS_NOCTX;
 
-	mp->dmai_minxfer	= attrp->dma_attr_minxfer;
 	mp->dmai_burstsizes	= attrp->dma_attr_burstsizes;
 	attrp = &mp->dmai_attr;
 	SET_DMAATTR(attrp, lo, hi, nocross, count_max);
@@ -718,11 +723,11 @@
 	i *= clustsz;
 	dvma_pg = mmu_p->dvma_base_pg + i;
 
-	if (px_lib_iommu_map(dip, PCI_TSBID(0, i), npages, attr,
-	    (void *)mp, 0, MMU_MAP_PFN) != DDI_SUCCESS) {
+	if (px_lib_iommu_map(dip, PCI_TSBID(0, i), npages,
+	    PX_ADD_ATTR_EXTNS(attr, mp->dmai_bdf), (void *)mp, 0,
+	    MMU_MAP_PFN) != DDI_SUCCESS) {
 		DBG(DBG_MAP_WIN, dip, "px_dvma_map_fast: "
 		    "px_lib_iommu_map failed\n");
-
 		return (DDI_FAILURE);
 	}
 
@@ -733,8 +738,9 @@
 
 	ASSERT(PX_HAS_REDZONE(mp));
 
-	if (px_lib_iommu_map(dip, PCI_TSBID(0, i + npages), 1, attr,
-	    (void *)mp, npages - 1, MMU_MAP_PFN) != DDI_SUCCESS) {
+	if (px_lib_iommu_map(dip, PCI_TSBID(0, i + npages), 1,
+	    PX_ADD_ATTR_EXTNS(attr, mp->dmai_bdf), (void *)mp, npages - 1,
+	    MMU_MAP_PFN) != DDI_SUCCESS) {
 		DBG(DBG_MAP_WIN, dip, "px_dvma_map_fast: "
 		    "mapping REDZONE page failed\n");
 

--- a/usr/src/uts/sun4/io/px/px_dma.h	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/sun4/io/px/px_dma.h	Wed Nov 22 11:47:19 2006 -0800
@@ -94,6 +94,7 @@
 #define	dmai_winlst		dmai_minfo
 #define	dmai_pfn0		dmai_sbi
 #define	dmai_roffset		dmai_pool
+#define	dmai_bdf		dmai_minxfer
 #define	PX_MP_PFN0(mp)		((px_iopfn_t)(mp)->dmai_pfn0)
 #define	PX_WINLST(mp)		((px_dma_win_t *)(mp)->dmai_winlst)
 #define	PX_DEV_ATTR(mp)		((ddi_dma_attr_t *)(mp + 1))

--- a/usr/src/uts/sun4/io/px/px_fdvma.c	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/sun4/io/px/px_fdvma.c	Wed Nov 22 11:47:19 2006 -0800
@@ -89,8 +89,9 @@
 
 	attr = PX_GET_TTE_ATTR(mp->dmai_rflags, mp->dmai_attr.dma_attr_flags);
 
-	if (px_lib_iommu_map(dip, PCI_TSBID(0, pg_index), npages, attr,
-	    (void *)a, 0, MMU_MAP_BUF) != DDI_SUCCESS) {
+	if (px_lib_iommu_map(dip, PCI_TSBID(0, pg_index), npages,
+	    PX_ADD_ATTR_EXTNS(attr, mp->dmai_bdf), (void *)a, 0,
+	    MMU_MAP_BUF) != DDI_SUCCESS) {
 		cmn_err(CE_WARN, "%s%d: kaddr_load can't get "
 		    "page frame for vaddr %lx", ddi_driver_name(dip),
 		    ddi_get_instance(dip), (uintptr_t)a);
@@ -197,7 +198,6 @@
 	 */
 	mp->dmai_rdip = rdip;
 	mp->dmai_rflags = DMP_BYPASSNEXUS | DDI_DMA_READ | DMP_NOSYNC;
-	mp->dmai_minxfer = dmareq->dmar_limits->dlim_minxfer;
 	mp->dmai_burstsizes = dmareq->dmar_limits->dlim_burstsizes;
 	mp->dmai_mapping = MMU_PTOB(dvma_pg);
 	mp->dmai_ndvmapages = npages;

--- a/usr/src/uts/sun4/io/px/px_ioapi.h	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/sun4/io/px/px_ioapi.h	Wed Nov 22 11:47:19 2006 -0800
@@ -100,16 +100,36 @@
  *		Attributes for iommu mappings. One or more of the
  *		following attribute bits stored in a 64-bit unsigned int.
  *
- *		PCI_MAP_ATTR_READ	0x01 - xfr direction is from memory
- *		PCI_MAP_ATTR_WRITE	0x02 - xfr direction is to memory
- *		PCI_MAP_ATTR_RO		0x04 - enable relaxed ordering
+ *	6				    3				      0
+ *	3				    1				      0
+ *	00000000 00000000 00000000 00000000 BBBBBBBB DDDDDFFF 00000000 00PP0LWR
  *
- *		Bits 63:3 are unused and must be set to zero for this
- *		version of the specification.
+ *		R: DMA data is transferred from main memory to device.
+ *		W: DMA data is transferred from device to main memory.
+ *		L: Requested DMA transaction can be relaxed ordered within RC.
+ *		P: Value of PCI Express and PCI-X phantom function
+ *		   configuration. Its encoding is identical to the
+ *		   "Phantom Function Supported" field of the
+ *		   "Device Capabilities Register (offset 0x4)"
+ *		   in the "PCI Express Capability Structure".
+ *		   The structure is part of a device's config space.
+ *	      BDF: Bus, device and function number of the device
+ *		   that is going to issue DMA transactions.
+ *		   The BDF values are used to guarantee the mapping
+ *		   only be accessed by the specified device.
+ *		   If the BDF is set to all 0, RID based protection
+ *		   will be turned off.
+ *
+ *		Relaxed Ordering (L) is advisory. Not all hardware implements a
+ *		relaxed ordering attribute. If L attribute is not implemented in
+ *		hardware, the implementation is permitted to ignore the L bit.
+ *
+ *		Bits 3, 15:6 and 63:32 are unused and must be set to zero for
+ *		this version of the specification.
  *
  *		Note: For compatibility with future versions of this
- *		specification, the caller must set 63:3 to zero.
- *		The implementation shall ignore bits 63:3
+ *		specification, the caller must set bits 3, 15:6 and 63:32 to
+ *		zero. The implementation shall ignore these bits.
  *
  * r_addr -	64-bit Real Address.
  *
@@ -195,11 +215,17 @@
 	((tsbid >> PCI_TSB_INDEX) & PCI_TSB_INDEX_MASK)
 
 typedef enum io_attributes {
-	PCI_MAP_ATTR_READ 	= (uint32_t)0x01,
-	PCI_MAP_ATTR_WRITE 	= (uint32_t)0x02,
-	PCI_MAP_ATTR_RO		= (uint32_t)0x04
+	PCI_MAP_ATTR_READ 	= 0x1ull,
+	PCI_MAP_ATTR_WRITE 	= 0x2ull,
+	PCI_MAP_ATTR_RO		= 0x4ull
 } io_attributes_t;
 
+#define	PCI_MAP_ATTR_PHFUN	4
+#define	PCI_MAP_ATTR_BDF	16
+
+#define	PX_ADD_ATTR_EXTNS(attr, bdf) \
+	(attr | (bdf << PCI_MAP_ATTR_BDF))
+
 typedef enum io_sync_direction {
 	IO_SYNC_DEVICE		= (uint32_t)0x01,
 	IO_SYNC_CPU		= (uint32_t)0x02

--- a/usr/src/uts/sun4/io/px/px_mmu.c	Wed Nov 22 11:03:49 2006 -0800
+++ b/usr/src/uts/sun4/io/px/px_mmu.c	Wed Nov 22 11:47:19 2006 -0800
@@ -171,8 +171,9 @@
 	    "npages=0x%x pfn_index=0x%x\n", (uint_t)mmu_p->dvma_base_pg,
 	    (uint_t)pg_index, dvma_pg, (uint_t)npages, (uint_t)pfn_index);
 
-	if (px_lib_iommu_map(dip, PCI_TSBID(0, pg_index), npages, attr,
-	    (void *)mp, pfn_index, MMU_MAP_PFN) != DDI_SUCCESS) {
+	if (px_lib_iommu_map(dip, PCI_TSBID(0, pg_index), npages,
+	    PX_ADD_ATTR_EXTNS(attr, mp->dmai_bdf), (void *)mp, pfn_index,
+	    MMU_MAP_PFN) != DDI_SUCCESS) {
 		DBG(DBG_MAP_WIN, dip, "px_mmu_map_pages: "
 		    "px_lib_iommu_map failed\n");
 
@@ -187,8 +188,9 @@
 
 	ASSERT(PX_HAS_REDZONE(mp));
 
-	if (px_lib_iommu_map(dip, PCI_TSBID(0, pg_index + npages), 1, attr,
-	    (void *)mp, pfn_index + npages - 1, MMU_MAP_PFN) != DDI_SUCCESS) {
+	if (px_lib_iommu_map(dip, PCI_TSBID(0, pg_index + npages), 1,
+	    PX_ADD_ATTR_EXTNS(attr, mp->dmai_bdf), (void *)mp,
+	    pfn_index + npages - 1, MMU_MAP_PFN) != DDI_SUCCESS) {
 		DBG(DBG_MAP_WIN, dip, "px_mmu_map_pages: mapping "
 		    "REDZONE page failed\n");