6571487 HotPlug on Glendale, St. Paul blades needs drvconfig or boot -r

5 files changed, 68 insertions, 6 deletions

diff --git a/usr/src/pkgdefs/SUNWckr/prototype_sparc b/usr/src/pkgdefs/SUNWckr/prototype_sparc
index 84b9e06346..957e5e0b5d 100644
--- a/usr/src/pkgdefs/SUNWckr/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWckr/prototype_sparc
@@ -63,6 +63,8 @@ f none kernel/crypto/sparcv9/swrand 755 root sys
 d none kernel/dacf/sparcv9 755 root sys
 f none kernel/dacf/sparcv9/consconfig_dacf 755 root sys
 f none kernel/drv/dad.conf 644 root sys
+f none kernel/drv/px_pci.conf 644 root sys
+f none kernel/drv/pxb_plx.conf 644 root sys
 e sdconf kernel/drv/sd.conf 644 root sys
 e preserve kernel/drv/uata.conf 644 root sys
 d none kernel/drv/sparcv9 755 root sys
diff --git a/usr/src/uts/sparc/px_pci/Makefile b/usr/src/uts/sparc/px_pci/Makefile
index 08a93d0954..7bd7e1c8b6 100644
--- a/usr/src/uts/sparc/px_pci/Makefile
+++ b/usr/src/uts/sparc/px_pci/Makefile
@@ -21,7 +21,7 @@
 #
 # uts/sparc/px_pci/Makefile
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -43,6 +43,7 @@ MODULE		= px_pci
 OBJECTS		= $(PX_PCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(PX_PCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/sun4/io/px/
 
 #
 #	Include common rules.
@@ -52,9 +53,9 @@ include $(UTSBASE)/sparc/Makefile.sparc
 #
 #	Define targets
 #
-ALL_TARGET	= $(BINARY)
+ALL_TARGET	= $(BINARY) $(SRC_CONFFILE)
 LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
 #	Include sun4 specific headers files
diff --git a/usr/src/uts/sparc/pxb_plx/Makefile b/usr/src/uts/sparc/pxb_plx/Makefile
index 21c7bdcdc3..5c1e21036c 100644
--- a/usr/src/uts/sparc/pxb_plx/Makefile
+++ b/usr/src/uts/sparc/pxb_plx/Makefile
@@ -21,7 +21,7 @@
 #
 # uts/sparc/pxb_plx/Makefile
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -43,6 +43,7 @@ MODULE		= pxb_plx
 OBJECTS		= $(PX_PCI_OBJS:%=$(OBJS_DIR)/%)
 LINTS		= $(PX_PCI_OBJS:%.o=$(LINTS_DIR)/%.ln)
 ROOTMODULE	= $(ROOT_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/sun4/io/px/
 
 #
 #	Include common rules.
@@ -52,9 +53,9 @@ include $(UTSBASE)/sparc/Makefile.sparc
 #
 #	Define targets
 #
-ALL_TARGET	= $(BINARY)
+ALL_TARGET	= $(BINARY) $(SRC_CONFFILE)
 LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE)
 
 #
 #	Include sun4 specific headers files
diff --git a/usr/src/uts/sun4/io/px/px_pci.conf b/usr/src/uts/sun4/io/px/px_pci.conf
new file mode 100644
index 0000000000..c0172bcd95
--- /dev/null
+++ b/usr/src/uts/sun4/io/px/px_pci.conf
@@ -0,0 +1,29 @@
+#
+# 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 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Force load driver to support hotplug activity
+#
+ddi-forceattach=1;
diff --git a/usr/src/uts/sun4/io/px/pxb_plx.conf b/usr/src/uts/sun4/io/px/pxb_plx.conf
new file mode 100644
index 0000000000..c0172bcd95
--- /dev/null
+++ b/usr/src/uts/sun4/io/px/pxb_plx.conf
@@ -0,0 +1,29 @@
+#
+# 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 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Force load driver to support hotplug activity
+#
+ddi-forceattach=1;