6392059 Add sun4v support to the Embedded FCode Interpreter

7 files changed, 111 insertions, 13 deletions

diff --git a/usr/src/cmd/svc/profile/platform_sun4v.xml b/usr/src/cmd/svc/profile/platform_sun4v.xml
index 1201e876a7..e52039ec13 100644
--- a/usr/src/cmd/svc/profile/platform_sun4v.xml
+++ b/usr/src/cmd/svc/profile/platform_sun4v.xml
@@ -35,4 +35,7 @@
 	<service name='platform/sun4v/drd' version='1' type='service'>
 		<instance name='default' enabled='true'/>
 	</service>
+	<service name='platform/sun4v/efdaemon' version='1' type='service'>
+		<instance name='default' enabled='true'/>
+	</service>
 </service_bundle>
diff --git a/usr/src/lib/efcode/efdaemon/Makefile b/usr/src/lib/efcode/efdaemon/Makefile
index 30c27a7953..a5a7958f9a 100644
--- a/usr/src/lib/efcode/efdaemon/Makefile
+++ b/usr/src/lib/efcode/efdaemon/Makefile
@@ -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"
@@ -41,15 +40,22 @@ EFTARGETS += $(EFCODEDIR64)/$(PROG)
 EFTARGETS += $(EFCODEDIR)/efcode.sh
 
 MFSTDIR = $(ROOT)/var/svc/manifest/platform/sun4u
+MFSTDIR_SUN4V = $(ROOT)/var/svc/manifest/platform/sun4v
 MANIFEST = efdaemon.xml
+MANIFEST_SUN4V = efdaemon_sun4v.xml
 EFTARGETS += $(MFSTDIR)/$(MANIFEST)
+EFTARGETS += $(MFSTDIR_SUN4V)/$(MANIFEST_SUN4V)
 
 $(MFSTDIR)/$(MANIFEST) := FILEMODE = 0444
+$(MFSTDIR_SUN4V)/$(MANIFEST_SUN4V) := FILEMODE = 0444
 
 all:	$(PROG)
 
 clean:
 	-$(RM) $(PROG)
+	-$(RM) $(MFSTDIR)/$(MANIFEST)
+	-$(RM) $(MFSTDIR_SUN4V)/$(MANIFEST)
+	-$(RM) $(MFSTDIR_SUN4V)/$(MANIFEST_SUN4V)
 
 $(EFCODEDIR64)/%: %
 	$(INS.file)
@@ -60,7 +66,11 @@ $(EFCODEDIR)/%.sh: %.sh
 $(MFSTDIR)/%: %
 	$(INS.file)
 
+$(MFSTDIR_SUN4V)/%: %
+	$(INS.file)
+
 install: all .WAIT $(EFTARGETS)
+	-$(MV) $(MFSTDIR_SUN4V)/$(MANIFEST_SUN4V) $(MFSTDIR_SUN4V)/$(MANIFEST)
 
 lint:	lint_PROG
 
diff --git a/usr/src/lib/efcode/efdaemon/efdaemon_sun4v.xml b/usr/src/lib/efcode/efdaemon/efdaemon_sun4v.xml
new file mode 100644
index 0000000000..36ee00184b
--- /dev/null
+++ b/usr/src/lib/efcode/efdaemon/efdaemon_sun4v.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+ 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"
+
+	NOTE:  This service manifest is not editable; its contents will
+	be overwritten by package or patch operations, including
+	operating system upgrade.  Make customizations in a different
+	file.
+-->
+
+<service_bundle type='manifest' name='SUNWefcr:efdaemon'>
+
+<service
+	name='platform/sun4v/efdaemon'
+	type='service'
+	version='1'>
+
+	<single_instance />
+
+	<dependency
+	    name='single-user'
+	    grouping='require_all'
+	    restart_on='none'
+	    type='service'>
+		<service_fmri
+		    value='svc:/milestone/single-user:default' />
+	</dependency>
+
+	<exec_method
+		type='method'
+		name='start'
+		exec='/usr/lib/efcode/sparcv9/efdaemon'
+		timeout_seconds='30' />
+
+	<exec_method
+		type='method'
+		name='stop'
+		exec=':kill'
+		timeout_seconds='30' />
+
+	<instance name='default' enabled='false' />
+
+	<stability value='Unstable' />
+
+	<template>
+		<common_name>
+			<loctext xml:lang='C'>
+				embedded FCode interpreter
+			</loctext>
+		</common_name>
+		<documentation>
+			<manpage title='efdaemon' section='1M' manpath='/usr/share/man' />
+		</documentation>
+	</template>
+
+</service>
+
+</service_bundle>
diff --git a/usr/src/lib/efcode/pci/Makefile.com b/usr/src/lib/efcode/pci/Makefile.com
index f999279f69..7438772b18 100644
--- a/usr/src/lib/efcode/pci/Makefile.com
+++ b/usr/src/lib/efcode/pci/Makefile.com
@@ -29,6 +29,7 @@ OBJECTS	= pci.o
 LIBRARY	= lfc_upa_pci.a
 
 SYMLINKS = lfc_pci_pci.so lfc_gptwo_pci.so lfc_pciex_pciex.so \
-		lfc_pciex_pci.so lfc_pci_pciex.so lfc_jupiter_pciex.so
+		lfc_pciex_pci.so lfc_pci_pciex.so lfc_jupiter_pciex.so \
+		lfc_sun4v_pciex.so
 
 include ../../Makefile.efcode
diff --git a/usr/src/lib/efcode/upa/Makefile.com b/usr/src/lib/efcode/upa/Makefile.com
index c3edf9eb42..0eee3cb0b4 100644
--- a/usr/src/lib/efcode/upa/Makefile.com
+++ b/usr/src/lib/efcode/upa/Makefile.com
@@ -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"
@@ -28,5 +27,6 @@
 
 OBJECTS	= upa.o
 LIBRARY	= lfc_upa.a
+SYMLINKS = lfc_sun4v.so
 
 include ../../Makefile.efcode
diff --git a/usr/src/pkgdefs/SUNWefcl/prototype_sparc b/usr/src/pkgdefs/SUNWefcl/prototype_sparc
index 42c8100e4c..0df728aa84 100644
--- a/usr/src/pkgdefs/SUNWefcl/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWefcl/prototype_sparc
@@ -69,3 +69,5 @@ s none usr/lib/efcode/sparcv9/lfc_pciex_pciex.so=lfc_upa_pci.so
 s none usr/lib/efcode/sparcv9/lfc_pciex_pci.so=lfc_upa_pci.so
 s none usr/lib/efcode/sparcv9/lfc_pci_pciex.so=lfc_upa_pci.so
 s none usr/lib/efcode/sparcv9/lfc_jupiter_pciex.so=lfc_upa_pci.so
+s none usr/lib/efcode/sparcv9/lfc_sun4v.so=lfc_upa.so
+s none usr/lib/efcode/sparcv9/lfc_sun4v_pciex.so=lfc_upa_pci.so
diff --git a/usr/src/pkgdefs/SUNWefcr/prototype_sparc b/usr/src/pkgdefs/SUNWefcr/prototype_sparc
index 1772f0de42..05938a7e20 100644
--- a/usr/src/pkgdefs/SUNWefcr/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWefcr/prototype_sparc
@@ -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"
@@ -51,4 +50,6 @@
 #
 #
 d none var/svc/manifest/platform/sun4u 755 root sys
+d none var/svc/manifest/platform/sun4v 755 root sys
 f manifest var/svc/manifest/platform/sun4u/efdaemon.xml 444 root sys
+f manifest var/svc/manifest/platform/sun4v/efdaemon.xml 444 root sys