PSARC/2005/469 X86 Energy Star compliance

PSARC/2006/632 PSMI extension for state save and restore
6330209 nge needs to support DDI_SUSPEND/DDI_RESUME
6381827 Suspend to RAM on x86
6393154 audio810 needs to support DDI_SUSPEND/DDI_RESUME
6397047 fd, fdc needs to support Suspend/Resume
6401974 cannot enter S3 with ohci PME enable set on Tyan 2865 with Sun or Tyan 2.01 BIOS
6422613 memscrubber doesn't re-acquire lock before CALLB_CPR_EXIT
6455736 ata/dadk/cmdk should support DDI_SUSPEND/DDI_RESUME
6511370 CPR on SPARC regression
6586018 TODOP Macros in i86pc/sys/machclock.h not in sun4u/sun4v equivilent (Sparc only)
6610124 It takes more than 3 minutes after printing "pci_pre_resume nv_sata:0"
6617143 powerd/pmconfig emits a different default message for an existing on or off action.

--HG--
rename : usr/src/cmd/power/power.conf => usr/src/cmd/power/power.conf.sparc

10 files changed, 315 insertions, 1 deletions

diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile
index f98abc3fa9..7843cd9174 100644
--- a/usr/src/pkgdefs/Makefile
+++ b/usr/src/pkgdefs/Makefile
@@ -117,6 +117,7 @@ i386_SUBDIRS= \
 	SUNWcar.i  \
 	SUNWcarx.i  \
 	SUNWcpc.i \
+	SUNWcpr.i \
 	SUNWdfb.i  \
 	SUNWdrmr \
 	SUNWgrub \
diff --git a/usr/src/pkgdefs/SUNWcakr.i/prototype_com b/usr/src/pkgdefs/SUNWcakr.i/prototype_com
index 11eae3f62d..10f820f3dd 100644
--- a/usr/src/pkgdefs/SUNWcakr.i/prototype_com
+++ b/usr/src/pkgdefs/SUNWcakr.i/prototype_com
@@ -77,6 +77,10 @@ d none platform/i86pc/kernel/dacf/amd64 755 root sys
 f none platform/i86pc/kernel/dacf/amd64/consconfig_dacf 755 root sys
 d none platform/i86pc/kernel/drv 755 root sys
 d none platform/i86pc/kernel/drv/amd64 755 root sys
+f none platform/i86pc/kernel/drv/amd64/acpippm 755 root sys
+f none platform/i86pc/kernel/drv/acpippm 755 root sys
+f none platform/i86pc/kernel/drv/acpippm.conf 644 root sys
+f none platform/i86pc/kernel/drv/amd64/ppm 755 root sys
 f none platform/i86pc/kernel/drv/amd64/isa 755 root sys
 f none platform/i86pc/kernel/drv/amd64/mc-amd 755 root sys
 f none platform/i86pc/kernel/drv/amd64/npe 755 root sys
@@ -114,4 +118,3 @@ f none platform/i86pc/multiboot 755 root sys
 d none platform/i86pc/ucode 755 root sys
 v none platform/i86pc/ucode/intel-ucode.txt 444 root sys
 f none platform/i86pc/kernel/drv/amd64/cpudrv 755 root sys
-f none platform/i86pc/kernel/drv/amd64/ppm 755 root sys
diff --git a/usr/src/pkgdefs/SUNWcpr.i/Makefile b/usr/src/pkgdefs/SUNWcpr.i/Makefile
new file mode 100644
index 0000000000..5a3782f224
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWcpr.i/Makefile
@@ -0,0 +1,37 @@
+#
+# 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"
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+include ../Makefile.com
+
+DATAFILES += depend
+
+.KEEP_STATE:
+
+all: $(FILES)
+install: all pkg
+
+include ../Makefile.targ
diff --git a/usr/src/pkgdefs/SUNWcpr.i/pkginfo.tmpl b/usr/src/pkgdefs/SUNWcpr.i/pkginfo.tmpl
new file mode 100644
index 0000000000..e682d41925
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWcpr.i/pkginfo.tmpl
@@ -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 2007 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="SUNWcpr"
+NAME="Suspend, Resume package"
+ARCH="i386.i86pc"
+VERSION="ONVERS,REV=0.0.0"
+CATEGORY="system"
+SUNW_PRODNAME="SunOS"
+SUNW_PRODVERS="RELEASE/VERSION"
+DESC="Suspend, Resume package"
+BASEDIR=/
+SUNW_PKGVERS="1.0"
+SUNW_PKGTYPE="root"
+VENDOR="Sun Microsystems, Inc."
+HOTLINE="Please contact your local service provider"
+EMAIL=""
+MAXINST="1000"
+CLASSES="none"
+SUNW_PKG_ALLZONES="true"
+SUNW_PKG_HOLLOW="true"
+SUNW_PKG_THISZONE="false"
diff --git a/usr/src/pkgdefs/SUNWcpr.i/postinstall b/usr/src/pkgdefs/SUNWcpr.i/postinstall
new file mode 100644
index 0000000000..37cf851cd3
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWcpr.i/postinstall
@@ -0,0 +1,41 @@
+#!/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 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# SUNWcpr postinstall script
+
+#
+# Unload old copy of cpr from system
+#
+
+if [ "$BASEDIR" = "/" ] ; then
+	old_cpr=`/usr/sbin/modinfo | grep -w "cpr" | awk '{print $1}'`
+	if [ "X${old_cpr}" != "X" ] ; then
+		/usr/sbin/modunload -i ${old_cpr}
+	fi
+fi
+
+exit 0
diff --git a/usr/src/pkgdefs/SUNWcpr.i/postremove b/usr/src/pkgdefs/SUNWcpr.i/postremove
new file mode 100644
index 0000000000..09f00bf613
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWcpr.i/postremove
@@ -0,0 +1,60 @@
+#!/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
+#
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# SUNWcpr postremove script
+
+#
+# Unload old copy of cpr from system
+# In the current version of x86, none of the files to be removed will exist
+#
+
+CPRLOWER="${PKG_INSTALL_ROOT}/.cpr_generic_info \
+		${PKG_INSTALL_ROOT}/.cpr_turbo_info \
+		${PKG_INSTALL_ROOT}/.cpr_defaultboot_info \
+		${PKG_INSTALL_ROOT}/.cpr_config \
+		${PKG_INSTALL_ROOT}/.cpr_default"
+CPRFILES="${CPRLOWER} ${PKG_INSTALL_ROOT}/.CPR_TB ${PKG_INSTALL_ROOT}/.CPR"
+
+if [ "$BASEDIR" = "/" ] ; then
+	old_cpr=`/usr/sbin/modinfo | grep -w "cpr" | awk '{print $1}'`
+	if [ "X${old_cpr}" != "X" ] ; then
+		/usr/sbin/modunload -i ${old_cpr}
+	fi
+	
+	if [ -s ${PKG_INSTALL_ROOT}/etc/power.conf ]; then
+		state_filesystem=`/usr/bin/grep "^[	 ]*statefile[ 	]" \
+					${PKG_INSTALL_ROOT}/etc/power.conf`
+		if [ "X${state_filesystem}" != "X" ] ; then
+			set - ${state_filesystem}
+			CPRSF=${PKG_INSTALL_ROOT}/"$2" 
+		fi
+	fi
+
+	rm -f ${CPRFILES} ${CPRSF}
+fi
+
+exit 0
diff --git a/usr/src/pkgdefs/SUNWcpr.i/prototype_com b/usr/src/pkgdefs/SUNWcpr.i/prototype_com
new file mode 100644
index 0000000000..f3cba0b721
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWcpr.i/prototype_com
@@ -0,0 +1,50 @@
+#
+# 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"
+#
+# 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 postremove
+i postinstall
+# source locations relative to the prototype file
+#
+# SUNWcpr.i
+#
+d none kernel 0755 root sys
+d none kernel/drv 0755 root sys
+d none platform 0755 root sys
diff --git a/usr/src/pkgdefs/SUNWcpr.i/prototype_i386 b/usr/src/pkgdefs/SUNWcpr.i/prototype_i386
new file mode 100644
index 0000000000..063a56632a
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWcpr.i/prototype_i386
@@ -0,0 +1,60 @@
+#
+# 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"
+#
+# 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 x86 specific here
+#
+# source locations relative to the prototype file
+#
+#
+# SUNWcpr.i
+#
+f none kernel/drv/srn 755 root sys
+f none kernel/drv/srn.conf 644 root sys
+d none kernel/drv/amd64 0755 root sys
+f none kernel/drv/amd64/srn 755 root sys
+d none platform/i86pc 0755 root sys
+d none platform/i86pc/kernel 0755 root sys
+d none platform/i86pc/kernel/misc 0755 root sys
+f none platform/i86pc/kernel/misc/cpr 0755 root sys
+d none platform/i86pc/kernel/misc/amd64 0755 root sys
+f none platform/i86pc/kernel/misc/amd64/cpr 0755 root sys
diff --git a/usr/src/pkgdefs/etc/exception_list_i386 b/usr/src/pkgdefs/etc/exception_list_i386
index 175f5276c8..58fc7ddd64 100644
--- a/usr/src/pkgdefs/etc/exception_list_i386
+++ b/usr/src/pkgdefs/etc/exception_list_i386
@@ -894,3 +894,8 @@ usr/include/sys/kiconv_latin1.h		i386
 # At this time, the ttydefs.cleanup file is only useful on sun4u systems
 #
 etc/flash/postdeployment/ttydefs.cleanup	i386
+#
+# This header file is shared only between the power commands and
+# ppm/srn modules # and should not be in any package
+#
+usr/include/sys/srn.h			i386
diff --git a/usr/src/pkgdefs/etc/exception_list_sparc b/usr/src/pkgdefs/etc/exception_list_sparc
index 5fe6ef0e3e..cc929f34b0 100644
--- a/usr/src/pkgdefs/etc/exception_list_sparc
+++ b/usr/src/pkgdefs/etc/exception_list_sparc
@@ -977,3 +977,8 @@ usr/include/sqlite/sqlite.h		sparc
 usr/include/sys/kiconv_emea1.h		sparc
 usr/include/sys/kiconv_emea2.h		sparc
 usr/include/sys/kiconv_latin1.h		sparc
+#
+# This header file is shared only between the power commands and
+# ppm/srn modules # and should not be in any package
+#
+usr/include/sys/srn.h			sparc