--- a/usr/src/uts/sun4u/Makefile.files	Tue May 15 15:37:17 2007 -0700
+++ b/usr/src/uts/sun4u/Makefile.files	Tue May 15 17:17:05 2007 -0700
@@ -85,7 +85,6 @@
 UPA64S_OBJS	+= upa64s.o
 SYSIO_SBUS_OBJS	+= iommu.o sysioerr.o sysiosbus.o iocache.o
 PX_OBJS		+= px_asm_4u.o px_err.o px_hlib.o px_lib4u.o px_tools_4u.o
-FPC_OBJS	+= fpc-impl-4u.o
 PCI_COMMON_OBJS	+= pci.o pci_util.o pci_dma.o pci_devctl.o \
 			pci_fdvma.o pci_iommu.o pci_sc.o pci_debug.o \
 			pci_cb.o pci_ib.o pci_ecc.o pci_pbm.o pci_intr.o \

--- a/usr/src/uts/sun4u/Makefile.rules	Tue May 15 15:37:17 2007 -0700
+++ b/usr/src/uts/sun4u/Makefile.rules	Tue May 15 17:17:05 2007 -0700
@@ -84,10 +84,6 @@
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/io/fpc/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
 $(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/io/px/%.s
 	$(COMPILE.s) -o $@ $<
 
@@ -212,9 +208,6 @@
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/io/px/%.s
 	@($(LHEAD) $(LINT.s) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/io/fpc/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/io/wrsm/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 

--- a/usr/src/uts/sun4u/Makefile.sun4u.shared	Tue May 15 15:37:17 2007 -0700
+++ b/usr/src/uts/sun4u/Makefile.sun4u.shared	Tue May 15 17:17:05 2007 -0700
@@ -373,7 +373,6 @@
 DRV_KMODS	+= sbus
 DRV_KMODS	+= pcisch pcipsy simba
 DRV_KMODS	+= px
-DRV_KMODS	+= fpc
 DRV_KMODS	+= ebus
 DRV_KMODS	+= su
 DRV_KMODS	+= tod

--- a/usr/src/uts/sun4u/chicago/Makefile.chicago	Tue May 15 15:37:17 2007 -0700
+++ b/usr/src/uts/sun4u/chicago/Makefile.chicago	Tue May 15 17:17:05 2007 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# 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"
@@ -64,7 +64,7 @@
 #
 #	Define modules.
 #
-CHICAGO_KMODS	= ppm platmod
+CHICAGO_KMODS	= ppm platmod fpc
 
 #
 #	Links to UltraSparc III cyrpto modules

--- a/usr/src/uts/sun4u/chicago/Makefile.files	Tue May 15 15:37:17 2007 -0700
+++ b/usr/src/uts/sun4u/chicago/Makefile.files	Tue May 15 17:17:05 2007 -0700
@@ -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.
@@ -21,7 +20,7 @@
 #
 #
 # uts/sun4u/chicago/Makefile.files
-# Copyright 2005 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"
@@ -32,6 +31,11 @@
 #
 
 #
+# Driver modules
+#
+FPC_OBJS	+= fpc-impl-4u.o
+
+#
 # Miscellaneous
 #
 INC_PATH	+= -I$(UTSBASE)/sun4u/chicago

--- a/usr/src/uts/sun4u/chicago/Makefile.rules	Tue May 15 15:37:17 2007 -0700
+++ b/usr/src/uts/sun4u/chicago/Makefile.rules	Tue May 15 17:17:05 2007 -0700
@@ -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 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -46,9 +45,17 @@
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
+$(OBJS_DIR)/%.o:		$(UTSBASE)/sun4u/chicago/io/fpc/%.c
+	$(COMPILE.c) -o $@ $<
+	$(CTFCONVERT_O)
+
 #
 #	Section 1b: Lint `object' build rules
 #
 
 $(LINTS_DIR)/%.ln:	$(UTSBASE)/sun4u/chicago/os/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
+
+$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/chicago/io/fpc/%.c
+	@($(LHEAD) $(LINT.c) $< $(LTAIL))
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/sun4u/chicago/fpc/Makefile	Tue May 15 17:17:05 2007 -0700
@@ -0,0 +1,167 @@
+#
+# 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"
+#
+#	uts/sun4u/chicago/fpc/Makefile
+#
+#	This makefile drives the production of the sun4u
+#	fire performance counter kernel module
+#
+#	sun4u implementation architecture dependent
+#
+
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= fpc
+OBJECTS		= $(FPC_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(FPC_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_CHICAGO_DRV_DIR)/$(MODULE)
+CONF_SRCDIR	= $(UTSBASE)/sun4/io/fpc
+
+ROOT_BOSTON_DIR		= $(ROOT_PLAT_DIR)/SUNW,Sun-Fire-V445
+ROOT_BOSTON_MOD_DIR	= $(ROOT_BOSTON_DIR)/kernel
+ROOT_BOSTON_DRV_DIR_32	= $(ROOT_BOSTON_MOD_DIR)/drv
+ROOT_BOSTON_DRV_DIR_64	= $(ROOT_BOSTON_DRV_DIR_32)/$(SUBDIR64)
+
+ROOT_SEATTLE_DIR	= $(ROOT_PLAT_DIR)/SUNW,Sun-Fire-V215
+ROOT_SEATTLE_MOD_DIR	= $(ROOT_SEATTLE_DIR)/kernel
+ROOT_SEATTLE_DRV_DIR_32	= $(ROOT_SEATTLE_MOD_DIR)/drv
+ROOT_SEATTLE_DRV_DIR_64	= $(ROOT_SEATTLE_DRV_DIR_32)/$(SUBDIR64)
+
+ROOTMODULE_SOFTLINK	= $(ROOT_BOSTON_DRV_DIR_64:$(ROOT_BOSTON_DIR)%=../../../../SUNW,A70%/$(MODULE))
+
+CONFFILE_SOFTLINK	= $(ROOT_BOSTON_DRV_DIR_32:$(ROOT_BOSTON_DIR)%=../../../SUNW,A70%/$(CONFFILE))
+
+BOSTON_ROOTMODULE	= $(ROOT_BOSTON_DRV_DIR_64)/$(MODULE)
+BOSTON_CONFFILE		= $(ROOT_BOSTON_DRV_DIR_32)/$(CONFFILE)
+
+SEATTLE_ROOTMODULE	= $(ROOT_SEATTLE_DRV_DIR_64)/$(MODULE)
+SEATTLE_CONFFILE	= $(ROOT_SEATTLE_DRV_DIR_32)/$(CONFFILE)
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/sun4u/chicago/Makefile.chicago
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY) $(SRC_CONFFILE)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) \
+			$(BOSTON_ROOTMODULE) $(BOSTON_CONFFILE) \
+			$(SEATTLE_ROOTMODULE) $(SEATTLE_CONFFILE)
+
+#
+#	Include SUN4 and SUN4U specific headers files
+#
+INC_PATH	+= -I$(UTSBASE)/sun4/io/fpc
+
+#
+# lint pass one enforcement
+#
+CFLAGS += $(CCVERBOSE)
+
+#
+# Turn on doubleword alignment for 64 bit registers
+#
+CFLAGS += -dalign
+
+#
+# For now, disable these lint checks; maintainers should endeavor
+# to investigate and remove these for maximum lint coverage.
+# Please do not carry these forward to new Makefiles.
+#
+LINTTAGS	+= -erroff=E_STATIC_UNUSED
+
+#
+#	Default build targets.
+#
+.KEEP_STATE:
+
+def:		$(DEF_DEPS)
+
+all:		$(ALL_DEPS)
+
+clean:		$(CLEAN_DEPS)
+
+clobber:	$(CLOBBER_DEPS)
+
+lint:		$(LINT_DEPS)
+
+modlintlib:	$(MODLINTLIB_DEPS)
+
+clean.lint:	$(CLEAN_LINT_DEPS)
+
+install:	$(INSTALL_DEPS)
+
+$(ROOT_BOSTON_DIR): $(ROOT_PLAT_DIR)
+	-$(INS.dir.root.sys)
+
+$(ROOT_BOSTON_MOD_DIR): $(ROOT_BOSTON_DIR)
+	-$(INS.dir.root.sys)
+
+$(ROOT_BOSTON_DRV_DIR_32): $(ROOT_BOSTON_MOD_DIR)
+	-$(INS.dir.root.sys)
+
+$(ROOT_BOSTON_DRV_DIR_64): $(ROOT_BOSTON_DRV_DIR_32)
+	-$(INS.dir.root.sys)
+
+$(ROOT_SEATTLE_DIR): $(ROOT_PLAT_DIR)
+	-$(INS.dir.root.sys)
+
+$(ROOT_SEATTLE_MOD_DIR): $(ROOT_SEATTLE_DIR)
+	-$(INS.dir.root.sys)
+
+$(ROOT_SEATTLE_DRV_DIR_32): $(ROOT_SEATTLE_MOD_DIR)
+	-$(INS.dir.root.sys)
+
+$(ROOT_SEATTLE_DRV_DIR_64): $(ROOT_SEATTLE_DRV_DIR_32)
+	-$(INS.dir.root.sys)
+
+$(BOSTON_ROOTMODULE): $(ROOTMODULE) $(ROOT_BOSTON_DRV_DIR_64)
+	$(RM) $@; $(SYMLINK) $(ROOTMODULE_SOFTLINK) $@
+
+$(BOSTON_CONFFILE): $(ROOT_CONFFILE) $(ROOT_BOSTON_DRV_DIR_32)
+	$(RM) $@; $(SYMLINK) $(CONFFILE_SOFTLINK) $@
+
+$(SEATTLE_ROOTMODULE): $(ROOTMODULE) $(ROOT_SEATTLE_DRV_DIR_64)
+	$(RM) $@; $(SYMLINK) $(ROOTMODULE_SOFTLINK) $@
+
+$(SEATTLE_CONFFILE): $(ROOT_CONFFILE) $(ROOT_SEATTLE_DRV_DIR_32)
+	$(RM) $@; $(SYMLINK) $(CONFFILE_SOFTLINK) $@
+
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sun4u/chicago/Makefile.targ

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/uts/sun4u/chicago/io/fpc/fpc-impl-4u.c	Tue May 15 17:17:05 2007 -0700
@@ -0,0 +1,333 @@
+/*
+ * 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.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <sys/file.h>
+#include <sys/sunndi.h>
+#include <sys/sunddi.h>
+#include <sys/sunldi.h>
+#include <io/px/px_regs.h>
+#include <sys/pci_tools.h>
+#include <fpc.h>
+#include <fpc-impl.h>
+
+#define	CHIP_COMPATIBLE_NAME	"pciex108e,80f0"
+#define	BANK_ADDR_MASK		0x7FFFFF
+
+#define	OPEN_FLAGS (FREAD | FWRITE)
+
+#define	PCIE_BANK	0
+#define	JBUS_BANK	1
+
+typedef struct px_regs {
+	uint32_t addr_hi;
+	uint32_t addr_lo;
+	uint32_t size_hi;
+	uint32_t size_lo;
+} px_regs_t;
+
+/* There is one of these for every root nexus device found */
+typedef struct fire4u_specific {
+	char *nodename;
+	uintptr_t jbus_bank_base;
+} fire4u_specific_t;
+
+typedef struct fire_counter_handle_impl {
+	ldi_handle_t devhandle;
+	fire4u_specific_t *devspec; /* Points to proper one for specific dev. */
+} fire_counter_handle_impl_t;
+
+static uint64_t counter_select_offsets[] = {
+	JBC_PERFORMANCE_COUNTER_SELECT,
+	IMU_PERFORMANCE_COUNTER_SELECT,
+	MMU_PERFORMANCE_COUNTER_SELECT,
+	TLU_PERFORMANCE_COUNTER_SELECT,
+	LPU_LINK_PERFORMANCE_COUNTER_SELECT
+};
+
+/*
+ * The following event and offset arrays is organized by grouping in major
+ * order the fire_perfcnt_t register types, and in minor order the register
+ * numbers within that type.
+ */
+
+static uint64_t counter_reg_offsets[] = {
+	JBC_PERFORMANCE_COUNTER_ZERO,
+	JBC_PERFORMANCE_COUNTER_ONE,
+	IMU_PERFORMANCE_COUNTER_ZERO,
+	IMU_PERFORMANCE_COUNTER_ONE,
+	MMU_PERFORMANCE_COUNTER_ZERO,
+	MMU_PERFORMANCE_COUNTER_ONE,
+	TLU_PERFORMANCE_COUNTER_ZERO,
+	TLU_PERFORMANCE_COUNTER_ONE,
+	TLU_PERFORMANCE_COUNTER_TWO,
+	LPU_LINK_PERFORMANCE_COUNTER1,
+	LPU_LINK_PERFORMANCE_COUNTER2
+};
+
+/*
+ * Add the following to one of the LPU_LINK_PERFORMANCE_COUNTERx offsets to
+ * write a value to that counter.
+ */
+#define	LPU_LINK_PERFCTR_WRITE_OFFSET	0x8
+
+/*
+ * Note that LPU_LINK_PERFORMANCE_COUNTER_CONTROL register is hard-reset to
+ * zeros and this is the value we want.  This register isn't touched by this
+ * module, and as long as it remains untouched by other modules we're OK.
+ */
+
+static ldi_ident_t ldi_identifier;
+static boolean_t ldi_identifier_valid = B_FALSE;
+static cred_t *credentials = NULL;
+
+/* Called by _init to determine if it is OK to install driver. */
+int
+fpc_platform_check()
+{
+	return (SUCCESS);
+}
+
+/* Called during attach to do module-wide initialization. */
+int
+fpc_platform_module_init(dev_info_t *dip)
+{
+	int status;
+
+	credentials = crget();
+	status = ldi_ident_from_dip(dip, &ldi_identifier);
+	if (status == 0)
+		ldi_identifier_valid = B_TRUE;
+	return ((status == 0) ? DDI_SUCCESS : DDI_FAILURE);
+}
+
+int
+fpc_platform_node_init(dev_info_t *dip, int *avail)
+{
+	int index;
+	char *name;
+	int nodename_size;
+	char *nodename = NULL;
+	fire4u_specific_t *platform_specific_data = NULL;
+	char *compatible = NULL;
+	px_regs_t *regs_p = NULL;
+	int regs_length = 0;
+
+	if (ddi_prop_lookup_string(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
+	    "compatible", &compatible) != DDI_PROP_SUCCESS)
+		return (DDI_SUCCESS);
+
+	if (strcmp(compatible, CHIP_COMPATIBLE_NAME) != 0) {
+		ddi_prop_free(compatible);
+		return (DDI_SUCCESS);
+	}
+	ddi_prop_free(compatible);
+
+	fpc_common_node_setup(dip, &index);
+
+	name = fpc_get_dev_name_by_number(index);
+	nodename_size = strlen(name) + strlen(PCI_MINOR_REG) + 2;
+	nodename = kmem_zalloc(nodename_size, KM_SLEEP);
+
+	platform_specific_data =
+		kmem_zalloc(sizeof (fire4u_specific_t), KM_SLEEP);
+
+	(void) strcpy(nodename, name);
+	(void) strcat(nodename, ":");
+	(void) strcat(nodename, PCI_MINOR_REG);
+	platform_specific_data->nodename = nodename;
+
+	/* Get register banks. */
+	if (ddi_getlongprop(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
+		"reg", (caddr_t)&regs_p, &regs_length) != DDI_SUCCESS) {
+		goto bad_regs_p;
+	}
+
+	if ((regs_length / sizeof (px_regs_t)) < 2) {
+		goto bad_regs_length;
+	}
+
+	platform_specific_data->jbus_bank_base =
+	    regs_p[JBUS_BANK].addr_lo & BANK_ADDR_MASK;
+
+	kmem_free(regs_p, regs_length);
+
+	if (index == 0)
+		*avail |= (PCIE_A_REGS_AVAIL | JBUS_REGS_AVAIL);
+	else
+		*avail |= PCIE_B_REGS_AVAIL;
+
+	(void) fpc_set_platform_data_by_number(index, platform_specific_data);
+
+	return (DDI_SUCCESS);
+
+bad_regs_length:
+	if (regs_p)
+		kmem_free(regs_p, regs_length);
+bad_regs_p:
+	if (platform_specific_data)
+		kmem_free(platform_specific_data, sizeof (fire4u_specific_t));
+	if (nodename)
+		kmem_free(nodename, nodename_size);
+
+	return (DDI_FAILURE);
+}
+
+void
+fpc_platform_node_fini(void *arg)
+{
+	fire4u_specific_t *plat_arg = (fire4u_specific_t *)arg;
+	if (plat_arg == NULL)
+		return;
+	if (plat_arg->nodename)
+		kmem_free(plat_arg->nodename, strlen(plat_arg->nodename)+1);
+	kmem_free(plat_arg, sizeof (fire4u_specific_t));
+}
+
+/*ARGSUSED*/
+void
+fpc_platform_module_fini(dev_info_t *dip)
+{
+	if (ldi_identifier_valid)
+		ldi_ident_release(ldi_identifier);
+	if (credentials)
+		crfree(credentials);
+}
+
+fire_perfreg_handle_t
+fpc_get_perfreg_handle(int devnum)
+{
+	int rval = EINVAL;
+
+	fire_counter_handle_impl_t *handle_impl =
+	    kmem_zalloc(sizeof (fire_counter_handle_impl_t), KM_SLEEP);
+
+	if ((handle_impl->devspec =
+	    fpc_get_platform_data_by_number(devnum)) != NULL) {
+		rval = ldi_open_by_name(handle_impl->devspec->nodename,
+		    OPEN_FLAGS, credentials, &handle_impl->devhandle,
+		    ldi_identifier);
+	}
+
+	if (rval != SUCCESS) {
+		kmem_free(handle_impl, sizeof (fire_counter_handle_impl_t));
+		return ((fire_perfreg_handle_t)-1);
+	} else {
+		return ((fire_perfreg_handle_t)handle_impl);
+	}
+}
+
+int
+fpc_free_counter_handle(fire_perfreg_handle_t handle)
+{
+	fire_counter_handle_impl_t *handle_impl =
+	    (fire_counter_handle_impl_t *)handle;
+	(void) ldi_close(handle_impl->devhandle, OPEN_FLAGS, credentials);
+	kmem_free(handle_impl, sizeof (fire_counter_handle_impl_t));
+	return (SUCCESS);
+}
+
+int
+fpc_event_io(fire_perfreg_handle_t handle, fire_perfcnt_t group,
+    uint64_t *reg_data, boolean_t is_write)
+{
+	int rval;
+	int ioctl_rval;
+	pcitool_reg_t prg;
+	fire_counter_handle_impl_t *handle_impl =
+	    (fire_counter_handle_impl_t *)handle;
+	int cmd = is_write ? PCITOOL_NEXUS_SET_REG : PCITOOL_NEXUS_GET_REG;
+
+	prg.user_version = PCITOOL_USER_VERSION;
+
+	if (group == jbc) {
+		prg.barnum = JBUS_BANK;
+		prg.offset = counter_select_offsets[group] -
+		    handle_impl->devspec->jbus_bank_base;
+	} else {
+		prg.barnum = PCIE_BANK;
+
+		/*
+		 * Note that a pcie_bank_base isn't needed.  Pcie register
+		 * offsets are already relative to the start of their bank.  No
+		 * base needs to be subtracted to get the relative offset that
+		 * pcitool ioctls want.
+		 */
+		prg.offset = counter_select_offsets[group];
+	}
+	prg.acc_attr = PCITOOL_ACC_ATTR_SIZE_8 | PCITOOL_ACC_ATTR_ENDN_BIG;
+	prg.data = *reg_data;
+
+	/* Read original value. */
+	if (((rval = ldi_ioctl(handle_impl->devhandle, cmd, (intptr_t)&prg,
+	    FKIOCTL, credentials, &ioctl_rval)) == SUCCESS) && (!is_write)) {
+		*reg_data = prg.data;
+	}
+
+	return (rval);
+}
+
+int
+fpc_counter_io(fire_perfreg_handle_t handle, fire_perfcnt_t group,
+    int counter_index, uint64_t *value, boolean_t is_write)
+{
+	int rval;
+	int ioctl_rval;
+	pcitool_reg_t prg;
+	fire_counter_handle_impl_t *handle_impl =
+	    (fire_counter_handle_impl_t *)handle;
+	int command =
+	    (is_write) ? PCITOOL_NEXUS_SET_REG : PCITOOL_NEXUS_GET_REG;
+
+	prg.user_version = PCITOOL_USER_VERSION;
+	/*
+	 * Note that stated PCIE offsets are relative to the beginning of their
+	 * register bank, while JBUS offsets are absolute.
+	 */
+	if (group == jbc) {
+		prg.barnum = JBUS_BANK;
+		prg.offset = counter_reg_offsets[counter_index] -
+		    handle_impl->devspec->jbus_bank_base;
+	} else {
+		prg.barnum = PCIE_BANK;
+		prg.offset = counter_reg_offsets[counter_index];
+	}
+
+	if ((group == lpu) && (is_write)) {
+		prg.offset += LPU_LINK_PERFCTR_WRITE_OFFSET;
+	}
+
+	prg.acc_attr = PCITOOL_ACC_ATTR_SIZE_8 | PCITOOL_ACC_ATTR_ENDN_BIG;
+	prg.data = *value;
+
+	if (((rval = ldi_ioctl(handle_impl->devhandle, command, (intptr_t)&prg,
+	    FKIOCTL, credentials, &ioctl_rval)) == SUCCESS) && (!is_write)) {
+		*value = prg.data;
+	}
+
+	return (rval);
+}

--- a/usr/src/uts/sun4u/fpc/Makefile	Tue May 15 15:37:17 2007 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-#
-# 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"
-#
-#	uts/sun4u/fpc/Makefile
-#
-#	This makefile drives the production of the sun4u
-#	fire performance counter kernel module
-#
-#	sun4u implementation architecture dependent
-#
-
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
-#
-UTSBASE	= ../..
-
-#
-#	Define the module and object file sets.
-#
-MODULE		= fpc
-OBJECTS		= $(FPC_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(FPC_OBJS:%.o=$(LINTS_DIR)/%.ln)
-ROOTMODULE	= $(ROOT_CHICAGO_DRV_DIR)/$(MODULE)
-CONF_SRCDIR	= $(UTSBASE)/sun4/io/fpc
-
-ROOT_BOSTON_DIR		= $(ROOT_PLAT_DIR)/SUNW,Sun-Fire-V445
-ROOT_BOSTON_MOD_DIR	= $(ROOT_BOSTON_DIR)/kernel
-ROOT_BOSTON_DRV_DIR_32	= $(ROOT_BOSTON_MOD_DIR)/drv
-ROOT_BOSTON_DRV_DIR_64	= $(ROOT_BOSTON_DRV_DIR_32)/$(SUBDIR64)
-
-ROOT_SEATTLE_DIR	= $(ROOT_PLAT_DIR)/SUNW,Sun-Fire-V215
-ROOT_SEATTLE_MOD_DIR	= $(ROOT_SEATTLE_DIR)/kernel
-ROOT_SEATTLE_DRV_DIR_32	= $(ROOT_SEATTLE_MOD_DIR)/drv
-ROOT_SEATTLE_DRV_DIR_64	= $(ROOT_SEATTLE_DRV_DIR_32)/$(SUBDIR64)
-
-ROOTMODULE_SOFTLINK	= $(ROOT_BOSTON_DRV_DIR_64:$(ROOT_BOSTON_DIR)%=../../../../SUNW,A70%/$(MODULE))
-
-CONFFILE_SOFTLINK	= $(ROOT_BOSTON_DRV_DIR_32:$(ROOT_BOSTON_DIR)%=../../../SUNW,A70%/$(CONFFILE))
-
-BOSTON_ROOTMODULE	= $(ROOT_BOSTON_DRV_DIR_64)/$(MODULE)
-BOSTON_CONFFILE		= $(ROOT_BOSTON_DRV_DIR_32)/$(CONFFILE)
-
-SEATTLE_ROOTMODULE	= $(ROOT_SEATTLE_DRV_DIR_64)/$(MODULE)
-SEATTLE_CONFFILE	= $(ROOT_SEATTLE_DRV_DIR_32)/$(CONFFILE)
-
-#
-#	Include common rules.
-#
-include $(UTSBASE)/sun4u/chicago/Makefile.chicago
-
-#
-#	Define targets
-#
-ALL_TARGET	= $(BINARY) $(SRC_CONFFILE)
-LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE) $(ROOT_CONFFILE) \
-			$(BOSTON_ROOTMODULE) $(BOSTON_CONFFILE) \
-			$(SEATTLE_ROOTMODULE) $(SEATTLE_CONFFILE)
-
-#
-#	Include SUN4 and SUN4U specific headers files
-#
-INC_PATH	+= -I$(UTSBASE)/sun4/io/fpc
-INC_PATH	+= -I$(UTSBASE)/sun4u/io/fpc
-
-#
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE)
-
-#
-# Turn on doubleword alignment for 64 bit registers
-#
-CFLAGS += -dalign
-
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-
-#
-#	Default build targets.
-#
-.KEEP_STATE:
-
-def:		$(DEF_DEPS)
-
-all:		$(ALL_DEPS)
-
-clean:		$(CLEAN_DEPS)
-
-clobber:	$(CLOBBER_DEPS)
-
-lint:		$(LINT_DEPS)
-
-modlintlib:	$(MODLINTLIB_DEPS)
-
-clean.lint:	$(CLEAN_LINT_DEPS)
-
-install:	$(INSTALL_DEPS)
-
-$(ROOT_BOSTON_DIR): $(ROOT_PLAT_DIR)
-	-$(INS.dir.root.sys)
-
-$(ROOT_BOSTON_MOD_DIR): $(ROOT_BOSTON_DIR)
-	-$(INS.dir.root.sys)
-
-$(ROOT_BOSTON_DRV_DIR_32): $(ROOT_BOSTON_MOD_DIR)
-	-$(INS.dir.root.sys)
-
-$(ROOT_BOSTON_DRV_DIR_64): $(ROOT_BOSTON_DRV_DIR_32)
-	-$(INS.dir.root.sys)
-
-$(ROOT_SEATTLE_DIR): $(ROOT_PLAT_DIR)
-	-$(INS.dir.root.sys)
-
-$(ROOT_SEATTLE_MOD_DIR): $(ROOT_SEATTLE_DIR)
-	-$(INS.dir.root.sys)
-
-$(ROOT_SEATTLE_DRV_DIR_32): $(ROOT_SEATTLE_MOD_DIR)
-	-$(INS.dir.root.sys)
-
-$(ROOT_SEATTLE_DRV_DIR_64): $(ROOT_SEATTLE_DRV_DIR_32)
-	-$(INS.dir.root.sys)
-
-$(BOSTON_ROOTMODULE): $(ROOTMODULE) $(ROOT_BOSTON_DRV_DIR_64)
-	$(RM) $@; $(SYMLINK) $(ROOTMODULE_SOFTLINK) $@
-
-$(BOSTON_CONFFILE): $(ROOT_CONFFILE) $(ROOT_BOSTON_DRV_DIR_32)
-	$(RM) $@; $(SYMLINK) $(CONFFILE_SOFTLINK) $@
-
-$(SEATTLE_ROOTMODULE): $(ROOTMODULE) $(ROOT_SEATTLE_DRV_DIR_64)
-	$(RM) $@; $(SYMLINK) $(ROOTMODULE_SOFTLINK) $@
-
-$(SEATTLE_CONFFILE): $(ROOT_CONFFILE) $(ROOT_SEATTLE_DRV_DIR_32)
-	$(RM) $@; $(SYMLINK) $(CONFFILE_SOFTLINK) $@
-
-
-#
-#	Include common targets.
-#
-include $(UTSBASE)/sun4u/chicago/Makefile.targ

--- a/usr/src/uts/sun4u/io/fpc/fpc-impl-4u.c	Tue May 15 15:37:17 2007 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,333 +0,0 @@
-/*
- * 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.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <sys/file.h>
-#include <sys/sunndi.h>
-#include <sys/sunddi.h>
-#include <sys/sunldi.h>
-#include <io/px/px_regs.h>
-#include <sys/pci_tools.h>
-#include <fpc.h>
-#include <fpc-impl.h>
-
-#define	CHIP_COMPATIBLE_NAME	"pciex108e,80f0"
-#define	BANK_ADDR_MASK		0x7FFFFF
-
-#define	OPEN_FLAGS (FREAD | FWRITE)
-
-#define	PCIE_BANK	0
-#define	JBUS_BANK	1
-
-typedef struct px_regs {
-	uint32_t addr_hi;
-	uint32_t addr_lo;
-	uint32_t size_hi;
-	uint32_t size_lo;
-} px_regs_t;
-
-/* There is one of these for every root nexus device found */
-typedef struct fire4u_specific {
-	char *nodename;
-	uintptr_t jbus_bank_base;
-} fire4u_specific_t;
-
-typedef struct fire_counter_handle_impl {
-	ldi_handle_t devhandle;
-	fire4u_specific_t *devspec; /* Points to proper one for specific dev. */
-} fire_counter_handle_impl_t;
-
-static uint64_t counter_select_offsets[] = {
-	JBC_PERFORMANCE_COUNTER_SELECT,
-	IMU_PERFORMANCE_COUNTER_SELECT,
-	MMU_PERFORMANCE_COUNTER_SELECT,
-	TLU_PERFORMANCE_COUNTER_SELECT,
-	LPU_LINK_PERFORMANCE_COUNTER_SELECT
-};
-
-/*
- * The following event and offset arrays is organized by grouping in major
- * order the fire_perfcnt_t register types, and in minor order the register
- * numbers within that type.
- */
-
-static uint64_t counter_reg_offsets[] = {
-	JBC_PERFORMANCE_COUNTER_ZERO,
-	JBC_PERFORMANCE_COUNTER_ONE,
-	IMU_PERFORMANCE_COUNTER_ZERO,
-	IMU_PERFORMANCE_COUNTER_ONE,
-	MMU_PERFORMANCE_COUNTER_ZERO,
-	MMU_PERFORMANCE_COUNTER_ONE,
-	TLU_PERFORMANCE_COUNTER_ZERO,
-	TLU_PERFORMANCE_COUNTER_ONE,
-	TLU_PERFORMANCE_COUNTER_TWO,
-	LPU_LINK_PERFORMANCE_COUNTER1,
-	LPU_LINK_PERFORMANCE_COUNTER2
-};
-
-/*
- * Add the following to one of the LPU_LINK_PERFORMANCE_COUNTERx offsets to
- * write a value to that counter.
- */
-#define	LPU_LINK_PERFCTR_WRITE_OFFSET	0x8
-
-/*
- * Note that LPU_LINK_PERFORMANCE_COUNTER_CONTROL register is hard-reset to
- * zeros and this is the value we want.  This register isn't touched by this
- * module, and as long as it remains untouched by other modules we're OK.
- */
-
-static ldi_ident_t ldi_identifier;
-static boolean_t ldi_identifier_valid = B_FALSE;
-static cred_t *credentials = NULL;
-
-/* Called by _init to determine if it is OK to install driver. */
-int
-fpc_platform_check()
-{
-	return (SUCCESS);
-}
-
-/* Called during attach to do module-wide initialization. */
-int
-fpc_platform_module_init(dev_info_t *dip)
-{
-	int status;
-
-	credentials = crget();
-	status = ldi_ident_from_dip(dip, &ldi_identifier);
-	if (status == 0)
-		ldi_identifier_valid = B_TRUE;
-	return ((status == 0) ? DDI_SUCCESS : DDI_FAILURE);
-}
-
-int
-fpc_platform_node_init(dev_info_t *dip, int *avail)
-{
-	int index;
-	char *name;
-	int nodename_size;
-	char *nodename = NULL;
-	fire4u_specific_t *platform_specific_data = NULL;
-	char *compatible = NULL;
-	px_regs_t *regs_p = NULL;
-	int regs_length = 0;
-
-	if (ddi_prop_lookup_string(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
-	    "compatible", &compatible) != DDI_PROP_SUCCESS)
-		return (DDI_SUCCESS);
-
-	if (strcmp(compatible, CHIP_COMPATIBLE_NAME) != 0) {
-		ddi_prop_free(compatible);
-		return (DDI_SUCCESS);
-	}
-	ddi_prop_free(compatible);
-
-	fpc_common_node_setup(dip, &index);
-
-	name = fpc_get_dev_name_by_number(index);
-	nodename_size = strlen(name) + strlen(PCI_MINOR_REG) + 2;
-	nodename = kmem_zalloc(nodename_size, KM_SLEEP);
-
-	platform_specific_data =
-		kmem_zalloc(sizeof (fire4u_specific_t), KM_SLEEP);
-
-	(void) strcpy(nodename, name);
-	(void) strcat(nodename, ":");
-	(void) strcat(nodename, PCI_MINOR_REG);
-	platform_specific_data->nodename = nodename;
-
-	/* Get register banks. */
-	if (ddi_getlongprop(DDI_DEV_T_ANY, dip, DDI_PROP_DONTPASS,
-		"reg", (caddr_t)&regs_p, &regs_length) != DDI_SUCCESS) {
-		goto bad_regs_p;
-	}
-
-	if ((regs_length / sizeof (px_regs_t)) < 2) {
-		goto bad_regs_length;
-	}
-
-	platform_specific_data->jbus_bank_base =
-	    regs_p[JBUS_BANK].addr_lo & BANK_ADDR_MASK;
-
-	kmem_free(regs_p, regs_length);
-
-	if (index == 0)
-		*avail |= (PCIE_A_REGS_AVAIL | JBUS_REGS_AVAIL);
-	else
-		*avail |= PCIE_B_REGS_AVAIL;
-
-	(void) fpc_set_platform_data_by_number(index, platform_specific_data);
-
-	return (DDI_SUCCESS);
-
-bad_regs_length:
-	if (regs_p)
-		kmem_free(regs_p, regs_length);
-bad_regs_p:
-	if (platform_specific_data)
-		kmem_free(platform_specific_data, sizeof (fire4u_specific_t));
-	if (nodename)
-		kmem_free(nodename, nodename_size);
-
-	return (DDI_FAILURE);
-}
-
-void
-fpc_platform_node_fini(void *arg)
-{
-	fire4u_specific_t *plat_arg = (fire4u_specific_t *)arg;
-	if (plat_arg == NULL)
-		return;
-	if (plat_arg->nodename)
-		kmem_free(plat_arg->nodename, strlen(plat_arg->nodename)+1);
-	kmem_free(plat_arg, sizeof (fire4u_specific_t));
-}
-
-/*ARGSUSED*/
-void
-fpc_platform_module_fini(dev_info_t *dip)
-{
-	if (ldi_identifier_valid)
-		ldi_ident_release(ldi_identifier);
-	if (credentials)
-		crfree(credentials);
-}
-
-fire_perfreg_handle_t
-fpc_get_perfreg_handle(int devnum)
-{
-	int rval = EINVAL;
-
-	fire_counter_handle_impl_t *handle_impl =
-	    kmem_zalloc(sizeof (fire_counter_handle_impl_t), KM_SLEEP);
-
-	if ((handle_impl->devspec =
-	    fpc_get_platform_data_by_number(devnum)) != NULL) {
-		rval = ldi_open_by_name(handle_impl->devspec->nodename,
-		    OPEN_FLAGS, credentials, &handle_impl->devhandle,
-		    ldi_identifier);
-	}
-
-	if (rval != SUCCESS) {
-		kmem_free(handle_impl, sizeof (fire_counter_handle_impl_t));
-		return ((fire_perfreg_handle_t)-1);
-	} else {
-		return ((fire_perfreg_handle_t)handle_impl);
-	}
-}
-
-int
-fpc_free_counter_handle(fire_perfreg_handle_t handle)
-{
-	fire_counter_handle_impl_t *handle_impl =
-	    (fire_counter_handle_impl_t *)handle;
-	(void) ldi_close(handle_impl->devhandle, OPEN_FLAGS, credentials);
-	kmem_free(handle_impl, sizeof (fire_counter_handle_impl_t));
-	return (SUCCESS);
-}
-
-int
-fpc_event_io(fire_perfreg_handle_t handle, fire_perfcnt_t group,
-    uint64_t *reg_data, boolean_t is_write)
-{
-	int rval;
-	int ioctl_rval;
-	pcitool_reg_t prg;
-	fire_counter_handle_impl_t *handle_impl =
-	    (fire_counter_handle_impl_t *)handle;
-	int cmd = is_write ? PCITOOL_NEXUS_SET_REG : PCITOOL_NEXUS_GET_REG;
-
-	prg.user_version = PCITOOL_USER_VERSION;
-
-	if (group == jbc) {
-		prg.barnum = JBUS_BANK;
-		prg.offset = counter_select_offsets[group] -
-		    handle_impl->devspec->jbus_bank_base;
-	} else {
-		prg.barnum = PCIE_BANK;
-
-		/*
-		 * Note that a pcie_bank_base isn't needed.  Pcie register
-		 * offsets are already relative to the start of their bank.  No
-		 * base needs to be subtracted to get the relative offset that
-		 * pcitool ioctls want.
-		 */
-		prg.offset = counter_select_offsets[group];
-	}
-	prg.acc_attr = PCITOOL_ACC_ATTR_SIZE_8 | PCITOOL_ACC_ATTR_ENDN_BIG;
-	prg.data = *reg_data;
-
-	/* Read original value. */
-	if (((rval = ldi_ioctl(handle_impl->devhandle, cmd, (intptr_t)&prg,
-	    FKIOCTL, credentials, &ioctl_rval)) == SUCCESS) && (!is_write)) {
-		*reg_data = prg.data;
-	}
-
-	return (rval);
-}
-
-int
-fpc_counter_io(fire_perfreg_handle_t handle, fire_perfcnt_t group,
-    int counter_index, uint64_t *value, boolean_t is_write)
-{
-	int rval;
-	int ioctl_rval;
-	pcitool_reg_t prg;
-	fire_counter_handle_impl_t *handle_impl =
-	    (fire_counter_handle_impl_t *)handle;
-	int command =
-	    (is_write) ? PCITOOL_NEXUS_SET_REG : PCITOOL_NEXUS_GET_REG;
-
-	prg.user_version = PCITOOL_USER_VERSION;
-	/*
-	 * Note that stated PCIE offsets are relative to the beginning of their
-	 * register bank, while JBUS offsets are absolute.
-	 */
-	if (group == jbc) {
-		prg.barnum = JBUS_BANK;
-		prg.offset = counter_reg_offsets[counter_index] -
-		    handle_impl->devspec->jbus_bank_base;
-	} else {
-		prg.barnum = PCIE_BANK;
-		prg.offset = counter_reg_offsets[counter_index];
-	}
-
-	if ((group == lpu) && (is_write)) {
-		prg.offset += LPU_LINK_PERFCTR_WRITE_OFFSET;
-	}
-
-	prg.acc_attr = PCITOOL_ACC_ATTR_SIZE_8 | PCITOOL_ACC_ATTR_ENDN_BIG;
-	prg.data = *value;
-
-	if (((rval = ldi_ioctl(handle_impl->devhandle, command, (intptr_t)&prg,
-	    FKIOCTL, credentials, &ioctl_rval)) == SUCCESS) && (!is_write)) {
-		*value = prg.data;
-	}
-
-	return (rval);
-}