Delete stale files post their move to "sys/dev/hwpmc/".

6 files changed, 0 insertions, 7077 deletions

diff --git a/sys/hwpmc/hwpmc_amd.c b/sys/hwpmc/hwpmc_amd.c
deleted file mode 100644
index a78943a..0000000
--- a/sys/hwpmc/hwpmc_amd.c
+++ /dev/null
@@ -1,995 +0,0 @@
-/*-
- * Copyright (c) 2003-2005 Joseph Koshy
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-/* Support for the AMD K7 and later processors */
-
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/pmc.h>
-#include <sys/smp.h>
-#include <sys/systm.h>
-
-#include <machine/md_var.h>
-
-/* AMD K7 and K8 PMCs */
-
-#define	AMD_PMC_EVSEL_0		0xC0010000
-#define	AMD_PMC_EVSEL_1		0xC0010001
-#define	AMD_PMC_EVSEL_2		0xC0010002
-#define	AMD_PMC_EVSEL_3		0xC0010003
-
-#define	AMD_PMC_PERFCTR_0	0xC0010004
-#define	AMD_PMC_PERFCTR_1	0xC0010005
-#define	AMD_PMC_PERFCTR_2	0xC0010006
-#define	AMD_PMC_PERFCTR_3	0xC0010007
-
-#define	K7_VALID_EVENT_CODE(c) (((c) >= 0x40 && (c) <= 0x47) ||		\
-	((c) >= 0x80 && (c) <= 0x85) || ((c) >= 0xC0 && (c) <= 0xC7) ||	\
-	((c) >= 0xCD && (c) <= 0xCF))
-
-#define AMD_PMC_CAPS (PMC_CAP_INTERRUPT | PMC_CAP_USER | \
-	PMC_CAP_SYSTEM | PMC_CAP_EDGE | PMC_CAP_THRESHOLD | \
-	PMC_CAP_READ | PMC_CAP_WRITE | PMC_CAP_INVERT | PMC_CAP_QUALIFIER)
-
-/* reserved bits include bit 21 and the top two bits of the unit mask */
-#define K7_PMC_RESERVED ((1 << 21) | (3 << 13))
-
-#define	K8_PMC_RESERVED (1 << 21)
-
-#define AMD_PMC_IS_STOPPED(evsel) ((rdmsr((evsel)) & AMD_PMC_ENABLE) == 0)
-#define AMD_PMC_HAS_OVERFLOWED(pmc) ((rdpmc(pmc) & (1ULL << 47)) == 0)
-
-#if	__i386__
-#define	AMD_NPMCS		K7_NPMCS
-#define	AMD_PMC_CLASS		PMC_CLASS_K7
-#define	AMD_PMC_COUNTERMASK	K7_PMC_COUNTERMASK
-#define	AMD_PMC_TO_COUNTER(x)	K7_PMC_TO_COUNTER(x)
-#define	AMD_PMC_INVERT		K7_PMC_INVERT
-#define	AMD_PMC_ENABLE		K7_PMC_ENABLE
-#define	AMD_PMC_INT		K7_PMC_INT
-#define	AMD_PMC_PC		K7_PMC_PC
-#define	AMD_PMC_EDGE		K7_PMC_EDGE
-#define	AMD_PMC_OS		K7_PMC_OS
-#define	AMD_PMC_USR		K7_PMC_USR
-
-#define	AMD_PMC_UNITMASK_M	K7_PMC_UNITMASK_M
-#define	AMD_PMC_UNITMASK_O	K7_PMC_UNITMASK_O
-#define	AMD_PMC_UNITMASK_E	K7_PMC_UNITMASK_E
-#define	AMD_PMC_UNITMASK_S	K7_PMC_UNITMASK_S
-#define	AMD_PMC_UNITMASK_I	K7_PMC_UNITMASK_I
-
-#define	AMD_PMC_UNITMASK	K7_PMC_UNITMASK
-#define	AMD_PMC_EVENTMASK	K7_PMC_EVENTMASK
-#define	AMD_PMC_TO_UNITMASK(x)	K7_PMC_TO_UNITMASK(x)
-#define	AMD_PMC_TO_EVENTMASK(x)	K7_PMC_TO_EVENTMASK(x)
-#define	AMD_VALID_BITS		K7_VALID_BITS
-
-#define	AMD_PMC_CLASS_NAME	"K7-"
-
-#elif	__amd64__
-
-#define	AMD_NPMCS		K8_NPMCS
-#define	AMD_PMC_CLASS		PMC_CLASS_K8
-#define	AMD_PMC_COUNTERMASK	K8_PMC_COUNTERMASK
-#define	AMD_PMC_TO_COUNTER(x)	K8_PMC_TO_COUNTER(x)
-#define	AMD_PMC_INVERT		K8_PMC_INVERT
-#define	AMD_PMC_ENABLE		K8_PMC_ENABLE
-#define	AMD_PMC_INT		K8_PMC_INT
-#define	AMD_PMC_PC		K8_PMC_PC
-#define	AMD_PMC_EDGE		K8_PMC_EDGE
-#define	AMD_PMC_OS		K8_PMC_OS
-#define	AMD_PMC_USR		K8_PMC_USR
-
-#define	AMD_PMC_UNITMASK_M	K8_PMC_UNITMASK_M
-#define	AMD_PMC_UNITMASK_O	K8_PMC_UNITMASK_O
-#define	AMD_PMC_UNITMASK_E	K8_PMC_UNITMASK_E
-#define	AMD_PMC_UNITMASK_S	K8_PMC_UNITMASK_S
-#define	AMD_PMC_UNITMASK_I	K8_PMC_UNITMASK_I
-
-#define	AMD_PMC_UNITMASK	K8_PMC_UNITMASK
-#define	AMD_PMC_EVENTMASK	K8_PMC_EVENTMASK
-#define	AMD_PMC_TO_UNITMASK(x)	K8_PMC_TO_UNITMASK(x)
-#define	AMD_PMC_TO_EVENTMASK(x)	K8_PMC_TO_EVENTMASK(x)
-#define	AMD_VALID_BITS		K8_VALID_BITS
-
-#define	AMD_PMC_CLASS_NAME	"K8-"
-
-#else
-#error	Unsupported architecture.
-#endif
-
-/* AMD K7 & K8 PMCs */
-struct amd_descr {
-	struct pmc_descr pm_descr;  /* "base class" */
-	uint32_t	pm_evsel;   /* address of EVSEL register */
-	uint32_t	pm_perfctr; /* address of PERFCTR register */
-};
-
-static const struct amd_descr amd_pmcdesc[AMD_NPMCS] =
-{
-    {
-	.pm_descr =
-	{
-		.pd_name  = "TSC",
-		.pd_class = PMC_CLASS_TSC,
-		.pd_caps  = PMC_CAP_READ,
-		.pd_width = 64
-	},
-	.pm_evsel   = MSR_TSC,
-	.pm_perfctr = 0	/* unused */
-    },
-
-    {
-	.pm_descr =
-	{
-		.pd_name  = AMD_PMC_CLASS_NAME "0",
-		.pd_class = AMD_PMC_CLASS,
-		.pd_caps  = AMD_PMC_CAPS,
-		.pd_width = 48
-	},
-	.pm_evsel   = AMD_PMC_EVSEL_0,
-	.pm_perfctr = AMD_PMC_PERFCTR_0
-    },
-    {
-	.pm_descr =
-	{
-		.pd_name  = AMD_PMC_CLASS_NAME "1",
-		.pd_class = AMD_PMC_CLASS,
-		.pd_caps  = AMD_PMC_CAPS,
-		.pd_width = 48
-	},
-	.pm_evsel   = AMD_PMC_EVSEL_1,
-	.pm_perfctr = AMD_PMC_PERFCTR_1
-    },
-    {
-	.pm_descr =
-	{
-		.pd_name  = AMD_PMC_CLASS_NAME "2",
-		.pd_class = AMD_PMC_CLASS,
-		.pd_caps  = AMD_PMC_CAPS,
-		.pd_width = 48
-	},
-	.pm_evsel   = AMD_PMC_EVSEL_2,
-	.pm_perfctr = AMD_PMC_PERFCTR_2
-    },
-    {
-	.pm_descr =
-	{
-		.pd_name  = AMD_PMC_CLASS_NAME "3",
-		.pd_class = AMD_PMC_CLASS,
-		.pd_caps  = AMD_PMC_CAPS,
-		.pd_width = 48
-	},
-	.pm_evsel   = AMD_PMC_EVSEL_3,
-	.pm_perfctr = AMD_PMC_PERFCTR_3
-    }
-};
-
-struct amd_event_code_map {
-	enum pmc_event	pe_ev;	 /* enum value */
-	uint8_t		pe_code; /* encoded event mask */
-	uint8_t		pe_mask; /* bits allowed in unit mask */
-};
-
-const struct amd_event_code_map amd_event_codes[] = {
-#if	__i386__
-	{ PMC_EV_K7_DC_ACCESSES, 		0x40, 0 },
-	{ PMC_EV_K7_DC_MISSES,			0x41, 0 },
-	{ PMC_EV_K7_DC_REFILLS_FROM_L2,		0x42, K7_PMC_UNITMASK_MOESI },
-	{ PMC_EV_K7_DC_REFILLS_FROM_SYSTEM,	0x43, K7_PMC_UNITMASK_MOESI },
-	{ PMC_EV_K7_DC_WRITEBACKS,		0x44, K7_PMC_UNITMASK_MOESI },
-	{ PMC_EV_K7_L1_DTLB_MISS_AND_L2_DTLB_HITS, 0x45, 0 },
-	{ PMC_EV_K7_L1_AND_L2_DTLB_MISSES,	0x46, 0 },
-	{ PMC_EV_K7_MISALIGNED_REFERENCES,	0x47, 0 },
-
-	{ PMC_EV_K7_IC_FETCHES,			0x80, 0 },
-	{ PMC_EV_K7_IC_MISSES,			0x81, 0 },
-
-	{ PMC_EV_K7_L1_ITLB_MISSES,		0x84, 0 },
-	{ PMC_EV_K7_L1_L2_ITLB_MISSES,		0x85, 0 },
-
-	{ PMC_EV_K7_RETIRED_INSTRUCTIONS,	0xC0, 0 },
-	{ PMC_EV_K7_RETIRED_OPS,		0xC1, 0 },
-	{ PMC_EV_K7_RETIRED_BRANCHES,		0xC2, 0 },
-	{ PMC_EV_K7_RETIRED_BRANCHES_MISPREDICTED, 0xC3, 0 },
-	{ PMC_EV_K7_RETIRED_TAKEN_BRANCHES, 	0xC4, 0 },
-	{ PMC_EV_K7_RETIRED_TAKEN_BRANCHES_MISPREDICTED, 0xC5, 0 },
-	{ PMC_EV_K7_RETIRED_FAR_CONTROL_TRANSFERS, 0xC6, 0 },
-	{ PMC_EV_K7_RETIRED_RESYNC_BRANCHES,	0xC7, 0 },
-	{ PMC_EV_K7_INTERRUPTS_MASKED_CYCLES,	0xCD, 0 },
-	{ PMC_EV_K7_INTERRUPTS_MASKED_WHILE_PENDING_CYCLES, 0xCE, 0 },
-	{ PMC_EV_K7_HARDWARE_INTERRUPTS,	0xCF, 0 }
-#endif
-
-#if	__amd64__
-	{ PMC_EV_K8_FP_DISPATCHED_FPU_OPS,		0x00, 0x3F },
-	{ PMC_EV_K8_FP_CYCLES_WITH_NO_FPU_OPS_RETIRED,	0x01, 0x00 },
-	{ PMC_EV_K8_FP_DISPATCHED_FPU_FAST_FLAG_OPS,	0x02, 0x00 },
-
-	{ PMC_EV_K8_LS_SEGMENT_REGISTER_LOAD, 		0x20, 0x7F },
-	{ PMC_EV_K8_LS_MICROARCHITECTURAL_RESYNC_BY_SELF_MODIFYING_CODE,
-	  						0x21, 0x00 },
-	{ PMC_EV_K8_LS_MICROARCHITECTURAL_RESYNC_BY_SNOOP, 0x22, 0x00 },
-	{ PMC_EV_K8_LS_BUFFER2_FULL,			0x23, 0x00 },
-	{ PMC_EV_K8_LS_LOCKED_OPERATION,		0x24, 0x07 },
-	{ PMC_EV_K8_LS_MICROARCHITECTURAL_LATE_CANCEL,	0x25, 0x00 },
-	{ PMC_EV_K8_LS_RETIRED_CFLUSH_INSTRUCTIONS,	0x26, 0x00 },
-	{ PMC_EV_K8_LS_RETIRED_CPUID_INSTRUCTIONS,	0x27, 0x00 },
-
-	{ PMC_EV_K8_DC_ACCESS,				0x40, 0x00 },
-	{ PMC_EV_K8_DC_MISS,				0x41, 0x00 },
-	{ PMC_EV_K8_DC_REFILL_FROM_L2,			0x42, 0x1F },
-	{ PMC_EV_K8_DC_REFILL_FROM_SYSTEM,		0x43, 0x1F },
-	{ PMC_EV_K8_DC_COPYBACK,			0x44, 0x1F },
-	{ PMC_EV_K8_DC_L1_DTLB_MISS_AND_L2_DTLB_HIT,	0x45, 0x00 },
-	{ PMC_EV_K8_DC_L1_DTLB_MISS_AND_L2_DTLB_MISS,	0x46, 0x00 },
-	{ PMC_EV_K8_DC_MISALIGNED_DATA_REFERENCE,	0x47, 0x00 },
-	{ PMC_EV_K8_DC_MICROARCHITECTURAL_LATE_CANCEL,	0x48, 0x00 },
-	{ PMC_EV_K8_DC_MICROARCHITECTURAL_EARLY_CANCEL, 0x49, 0x00 },
-	{ PMC_EV_K8_DC_ONE_BIT_ECC_ERROR,		0x4A, 0x03 },
-	{ PMC_EV_K8_DC_DISPATCHED_PREFETCH_INSTRUCTIONS, 0x4B, 0x07 },
-	{ PMC_EV_K8_DC_DCACHE_ACCESSES_BY_LOCKS,	0x4C, 0x03 },
-
-	{ PMC_EV_K8_BU_CPU_CLK_UNHALTED,		0x76, 0x00 },
-	{ PMC_EV_K8_BU_INTERNAL_L2_REQUEST,		0x7D, 0x1F },
-	{ PMC_EV_K8_BU_FILL_REQUEST_L2_MISS,		0x7E, 0x07 },
-	{ PMC_EV_K8_BU_FILL_INTO_L2,			0x7F, 0x03 },
-
-	{ PMC_EV_K8_IC_FETCH,				0x80, 0x00 },
-	{ PMC_EV_K8_IC_MISS,				0x81, 0x00 },
-	{ PMC_EV_K8_IC_REFILL_FROM_L2,			0x82, 0x00 },
-	{ PMC_EV_K8_IC_REFILL_FROM_SYSTEM,		0x83, 0x00 },
-	{ PMC_EV_K8_IC_L1_ITLB_MISS_AND_L2_ITLB_HIT,	0x84, 0x00 },
-	{ PMC_EV_K8_IC_L1_ITLB_MISS_AND_L2_ITLB_MISS,	0x85, 0x00 },
-	{ PMC_EV_K8_IC_MICROARCHITECTURAL_RESYNC_BY_SNOOP, 0x86, 0x00 },
-	{ PMC_EV_K8_IC_INSTRUCTION_FETCH_STALL,		0x87, 0x00 },
-	{ PMC_EV_K8_IC_RETURN_STACK_HIT,		0x88, 0x00 },
-	{ PMC_EV_K8_IC_RETURN_STACK_OVERFLOW,		0x89, 0x00 },
-
-	{ PMC_EV_K8_FR_RETIRED_X86_INSTRUCTIONS,	0xC0, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_UOPS,			0xC1, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_BRANCHES,		0xC2, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_BRANCHES_MISPREDICTED,	0xC3, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_TAKEN_BRANCHES,		0xC4, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_TAKEN_BRANCHES_MISPREDICTED, 0xC5, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_FAR_CONTROL_TRANSFERS,	0xC6, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_RESYNCS,			0xC7, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_NEAR_RETURNS,		0xC8, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_NEAR_RETURNS_MISPREDICTED, 0xC9, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_TAKEN_BRANCHES_MISPREDICTED_BY_ADDR_MISCOMPARE,
-							0xCA, 0x00 },
-	{ PMC_EV_K8_FR_RETIRED_FPU_INSTRUCTIONS,	0xCB, 0x0F },
-	{ PMC_EV_K8_FR_RETIRED_FASTPATH_DOUBLE_OP_INSTRUCTIONS,
-							0xCC, 0x07 },
-	{ PMC_EV_K8_FR_INTERRUPTS_MASKED_CYCLES,	0xCD, 0x00 },
-	{ PMC_EV_K8_FR_INTERRUPTS_MASKED_WHILE_PENDING_CYCLES, 0xCE, 0x00 },
-	{ PMC_EV_K8_FR_TAKEN_HARDWARE_INTERRUPTS,	0xCF, 0x00 },
-
-	{ PMC_EV_K8_FR_DECODER_EMPTY,			0xD0, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALLS,			0xD1, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_FROM_BRANCH_ABORT_TO_RETIRE,
-							0xD2, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_FOR_SERIALIZATION, 0xD3, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_FOR_SEGMENT_LOAD,	0xD4, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_WHEN_REORDER_BUFFER_IS_FULL,
-							0xD5, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_WHEN_RESERVATION_STATIONS_ARE_FULL,
-							0xD6, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_WHEN_FPU_IS_FULL,	0xD7, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_WHEN_LS_IS_FULL,	0xD8, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_WHEN_WAITING_FOR_ALL_TO_BE_QUIET,
-							0xD9, 0x00 },
-	{ PMC_EV_K8_FR_DISPATCH_STALL_WHEN_FAR_XFER_OR_RESYNC_BRANCH_PENDING,
-							0xDA, 0x00 },
-	{ PMC_EV_K8_FR_FPU_EXCEPTIONS,			0xDB, 0x0F },
-	{ PMC_EV_K8_FR_NUMBER_OF_BREAKPOINTS_FOR_DR0,	0xDC, 0x00 },
-	{ PMC_EV_K8_FR_NUMBER_OF_BREAKPOINTS_FOR_DR1,	0xDD, 0x00 },
-	{ PMC_EV_K8_FR_NUMBER_OF_BREAKPOINTS_FOR_DR2,	0xDE, 0x00 },
-	{ PMC_EV_K8_FR_NUMBER_OF_BREAKPOINTS_FOR_DR3,	0xDF, 0x00 },
-
-	{ PMC_EV_K8_NB_MEMORY_CONTROLLER_PAGE_ACCESS_EVENT, 0xE0, 0x7 },
-	{ PMC_EV_K8_NB_MEMORY_CONTROLLER_PAGE_TABLE_OVERFLOW, 0xE1, 0x00 },
-	{ PMC_EV_K8_NB_MEMORY_CONTROLLER_DRAM_COMMAND_SLOTS_MISSED,
-							0xE2, 0x00 },
-	{ PMC_EV_K8_NB_MEMORY_CONTROLLER_TURNAROUND,	0xE3, 0x07 },
-	{ PMC_EV_K8_NB_MEMORY_CONTROLLER_BYPASS_SATURATION, 0xE4, 0x0F },
-	{ PMC_EV_K8_NB_SIZED_COMMANDS,			0xEB, 0x7F },
-	{ PMC_EV_K8_NB_PROBE_RESULT,			0xEC, 0x0F },
-	{ PMC_EV_K8_NB_HT_BUS0_BANDWIDTH,		0xF6, 0x0F },
-	{ PMC_EV_K8_NB_HT_BUS1_BANDWIDTH,		0xF7, 0x0F },
-	{ PMC_EV_K8_NB_HT_BUS2_BANDWIDTH,		0xF8, 0x0F }
-#endif
-
-};
-
-const int amd_event_codes_size =
-	sizeof(amd_event_codes) / sizeof(amd_event_codes[0]);
-
-/*
- * read a pmc register
- */
-
-static int
-amd_read_pmc(int cpu, int ri, pmc_value_t *v)
-{
-	enum pmc_mode mode;
-	const struct amd_descr *pd;
-	struct pmc *pm;
-	const struct pmc_hw *phw;
-	pmc_value_t tmp;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] illegal row-index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pd  = &amd_pmcdesc[ri];
-	pm  = phw->phw_pmc;
-
-	KASSERT(pm != NULL,
-	    ("[amd,%d] No owner for HWPMC [cpu%d,pmc%d]", __LINE__,
-		cpu, ri));
-
-	mode = pm->pm_mode;
-
-	PMCDBG(MDP,REA,1,"amd-read id=%d class=%d", ri, pd->pm_descr.pd_class);
-
-	/* Reading the TSC is a special case */
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC) {
-		KASSERT(PMC_IS_COUNTING_MODE(mode),
-		    ("[amd,%d] TSC counter in non-counting mode", __LINE__));
-		*v = rdtsc();
-		PMCDBG(MDP,REA,2,"amd-read id=%d -> %jd", ri, *v);
-		return 0;
-	}
-
-	KASSERT(pd->pm_descr.pd_class == AMD_PMC_CLASS,
-	    ("[amd,%d] unknown PMC class (%d)", __LINE__,
-		pd->pm_descr.pd_class));
-
-	tmp = rdmsr(pd->pm_perfctr); /* RDMSR serializes */
-	if (PMC_IS_SAMPLING_MODE(mode))
-		*v = -tmp;
-	else
-		*v = tmp;
-
-	PMCDBG(MDP,REA,2,"amd-read id=%d -> %jd", ri, *v);
-
-	return 0;
-}
-
-/*
- * Write a PMC MSR.
- */
-
-static int
-amd_write_pmc(int cpu, int ri, pmc_value_t v)
-{
-	const struct amd_descr *pd;
-	struct pmc *pm;
-	const struct pmc_hw *phw;
-	enum pmc_mode mode;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] illegal row-index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pd  = &amd_pmcdesc[ri];
-	pm  = phw->phw_pmc;
-
-	KASSERT(pm != NULL,
-	    ("[amd,%d] PMC not owned (cpu%d,pmc%d)", __LINE__,
-		cpu, ri));
-
-	mode = pm->pm_mode;
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;
-
-	KASSERT(pd->pm_descr.pd_class == AMD_PMC_CLASS,
-	    ("[amd,%d] unknown PMC class (%d)", __LINE__,
-		pd->pm_descr.pd_class));
-
-	/* use 2's complement of the count for sampling mode PMCs */
-	if (PMC_IS_SAMPLING_MODE(mode))
-		v = -v;
-
-	PMCDBG(MDP,WRI,1,"amd-write cpu=%d ri=%d v=%jx", cpu, ri, v);
-
-	/* write the PMC value */
-	wrmsr(pd->pm_perfctr, v);
-	return 0;
-}
-
-/*
- * configure hardware pmc according to the configuration recorded in
- * pmc 'pm'.
- */
-
-static int
-amd_config_pmc(int cpu, int ri, struct pmc *pm)
-{
-	struct pmc_hw *phw;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] illegal row-index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-
-	KASSERT(pm == NULL || phw->phw_pmc == NULL,
-	    ("[amd,%d] hwpmc not unconfigured before re-config", __LINE__));
-
-	phw->phw_pmc = pm;
-	return 0;
-}
-
-/*
- * Machine dependent actions taken during the context switch in of a
- * thread.
- */
-
-static int
-amd_switch_in(struct pmc_cpu *pc)
-{
-	(void) pc;
-
-	/* enable the RDPMC instruction */
-	load_cr4(rcr4() | CR4_PCE);
-	return 0;
-}
-
-/*
- * Machine dependent actions taken during the context switch out of a
- * thread.
- */
-
-static int
-amd_switch_out(struct pmc_cpu *pc)
-{
-	(void) pc;
-
-	/* disallow RDPMC instruction */
-	load_cr4(rcr4() & ~CR4_PCE);
-	return 0;
-}
-
-/*
- * Check if a given allocation is feasible.
- */
-
-static int
-amd_allocate_pmc(int cpu, int ri, struct pmc *pm,
-    const struct pmc_op_pmcallocate *a)
-{
-	int i;
-	uint32_t allowed_unitmask, caps, config, unitmask;
-	enum pmc_event pe;
-	const struct pmc_descr *pd;
-
-	(void) cpu;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] illegal row index %d", __LINE__, ri));
-
-	pd = &amd_pmcdesc[ri].pm_descr;
-
-	/* check class match */
-	if (pd->pd_class != pm->pm_class)
-		return EINVAL;
-
-	caps = pm->pm_caps;
-
-	PMCDBG(MDP,ALL,1,"amd-allocate ri=%d caps=0x%x", ri, caps);
-
-	if ((pd->pd_caps & caps) != caps)
-		return EPERM;
-	if (pd->pd_class == PMC_CLASS_TSC) {
-		/* TSC's are always allocated in system-wide counting mode */
-		if (a->pm_ev != PMC_EV_TSC_TSC ||
-		    a->pm_mode != PMC_MODE_SC)
-			return EINVAL;
-		return 0;
-	}
-
-	KASSERT(pd->pd_class == AMD_PMC_CLASS,
-	    ("[amd,%d] Unknown PMC class (%d)", __LINE__, pd->pd_class));
-
-	pe = a->pm_ev;
-
-	/* map ev to the correct event mask code */
-	config = allowed_unitmask = 0;
-	for (i = 0; i < amd_event_codes_size; i++)
-		if (amd_event_codes[i].pe_ev == pe) {
-			config =
-			    AMD_PMC_TO_EVENTMASK(amd_event_codes[i].pe_code);
-			allowed_unitmask =
-			    AMD_PMC_TO_UNITMASK(amd_event_codes[i].pe_mask);
-			break;
-		}
-	if (i == amd_event_codes_size)
-		return EINVAL;
-
-	unitmask = a->pm_amd_config & AMD_PMC_UNITMASK;
-	if (unitmask & ~allowed_unitmask) /* disallow reserved bits */
-		return EINVAL;
-
-	if (unitmask && (caps & PMC_CAP_QUALIFIER))
-		config |= unitmask;
-
-	if (caps & PMC_CAP_THRESHOLD)
-		config |= a->pm_amd_config & AMD_PMC_COUNTERMASK;
-
-	/* set at least one of the 'usr' or 'os' caps */
-	if (caps & PMC_CAP_USER)
-		config |= AMD_PMC_USR;
-	if (caps & PMC_CAP_SYSTEM)
-		config |= AMD_PMC_OS;
-	if ((caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0)
-		config |= (AMD_PMC_USR|AMD_PMC_OS);
-
-	if (caps & PMC_CAP_EDGE)
-		config |= AMD_PMC_EDGE;
-	if (caps & PMC_CAP_INVERT)
-		config |= AMD_PMC_INVERT;
-	if (caps & PMC_CAP_INTERRUPT)
-		config |= AMD_PMC_INT;
-
-	pm->pm_md.pm_amd.pm_amd_evsel = config; /* save config value */
-
-	PMCDBG(MDP,ALL,2,"amd-allocate ri=%d -> config=0x%x", ri, config);
-
-	return 0;
-}
-
-/*
- * Release machine dependent state associated with a PMC.  This is a
- * no-op on this architecture.
- *
- */
-
-/* ARGSUSED0 */
-static int
-amd_release_pmc(int cpu, int ri, struct pmc *pmc)
-{
-#if	DEBUG
-	const struct amd_descr *pd;
-#endif
-	struct pmc_hw *phw;
-
-	(void) pmc;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] illegal row-index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-
-	KASSERT(phw->phw_pmc == NULL,
-	    ("[amd,%d] PHW pmc %p non-NULL", __LINE__, phw->phw_pmc));
-
-#if 	DEBUG
-	pd = &amd_pmcdesc[ri];
-	if (pd->pm_descr.pd_class == AMD_PMC_CLASS)
-		KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel),
-		    ("[amd,%d] PMC %d released while active", __LINE__, ri));
-#endif
-
-	return 0;
-}
-
-/*
- * start a PMC.
- */
-
-static int
-amd_start_pmc(int cpu, int ri)
-{
-	uint32_t config;
-	struct pmc *pm;
-	struct pmc_hw *phw;
-	const struct amd_descr *pd;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] illegal row-index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pm  = phw->phw_pmc;
-	pd = &amd_pmcdesc[ri];
-
-	KASSERT(pm != NULL,
-	    ("[amd,%d] starting cpu%d,pmc%d with null pmc record", __LINE__,
-		cpu, ri));
-
-	PMCDBG(MDP,STA,1,"amd-start cpu=%d ri=%d", cpu, ri);
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;	/* TSCs are always running */
-
-	KASSERT(pd->pm_descr.pd_class == AMD_PMC_CLASS,
-	    ("[amd,%d] unknown PMC class (%d)", __LINE__,
-		pd->pm_descr.pd_class));
-
-	KASSERT(AMD_PMC_IS_STOPPED(pd->pm_evsel),
-	    ("[amd,%d] pmc%d,cpu%d: Starting active PMC \"%s\"", __LINE__,
-	    ri, cpu, pd->pm_descr.pd_name));
-
-	/* turn on the PMC ENABLE bit */
-	config = pm->pm_md.pm_amd.pm_amd_evsel | AMD_PMC_ENABLE;
-
-	PMCDBG(MDP,STA,2,"amd-start config=0x%x", config);
-
-	wrmsr(pd->pm_evsel, config);
-	return 0;
-}
-
-/*
- * Stop a PMC.
- */
-
-static int
-amd_stop_pmc(int cpu, int ri)
-{
-	struct pmc *pm;
-	struct pmc_hw *phw;
-	const struct amd_descr *pd;
-	uint64_t config;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] illegal row-index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pm  = phw->phw_pmc;
-	pd  = &amd_pmcdesc[ri];
-
-	KASSERT(pm != NULL,
-	    ("[amd,%d] cpu%d,pmc%d no PMC to stop", __LINE__,
-		cpu, ri));
-
-	/* can't stop a TSC */
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;
-
-	KASSERT(pd->pm_descr.pd_class == AMD_PMC_CLASS,
-	    ("[amd,%d] unknown PMC class (%d)", __LINE__,
-		pd->pm_descr.pd_class));
-
-	KASSERT(!AMD_PMC_IS_STOPPED(pd->pm_evsel),
-	    ("[amd,%d] PMC%d, CPU%d \"%s\" already stopped",
-		__LINE__, ri, cpu, pd->pm_descr.pd_name));
-
-	PMCDBG(MDP,STO,1,"amd-stop ri=%d", ri);
-
-	/* turn off the PMC ENABLE bit */
-	config = pm->pm_md.pm_amd.pm_amd_evsel & ~AMD_PMC_ENABLE;
-	wrmsr(pd->pm_evsel, config);
-	return 0;
-}
-
-/*
- * Interrupt handler.  This function needs to return '1' if the
- * interrupt was this CPU's PMCs or '0' otherwise.  It is not allowed
- * to sleep or do anything a 'fast' interrupt handler is not allowed
- * to do.
- */
-
-static int
-amd_intr(int cpu, uintptr_t eip)
-{
-	int i, retval;
-	enum pmc_mode mode;
-	uint32_t perfctr;
-	struct pmc *pm;
-	struct pmc_cpu *pc;
-	struct pmc_hw *phw;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] out of range CPU %d", __LINE__, cpu));
-
-	retval = 0;
-
-	pc = pmc_pcpu[cpu];
-
-	/*
-	 * look for all PMCs that have interrupted:
-	 * - skip over the TSC [PMC#0]
-	 * - look for a PMC with a valid 'struct pmc' association
-	 * - look for a PMC in (a) sampling mode and (b) which has
-	 *   overflowed.  If found, we update the process's
-	 *   histogram or send it a profiling signal by calling
-	 *   the appropriate helper function.
-	 */
-
-	for (i = 1; i < AMD_NPMCS; i++) {
-
-		phw = pc->pc_hwpmcs[i];
-		perfctr = amd_pmcdesc[i].pm_perfctr;
-		KASSERT(phw != NULL, ("[amd,%d] null PHW pointer", __LINE__));
-
-		if ((pm = phw->phw_pmc) == NULL ||
-		    pm->pm_state != PMC_STATE_RUNNING) {
-			atomic_add_int(&pmc_stats.pm_intr_ignored, 1);
-			continue;
-		}
-
-		mode = pm->pm_mode;
-		if (PMC_IS_SAMPLING_MODE(mode) &&
-		    AMD_PMC_HAS_OVERFLOWED(perfctr)) {
-			atomic_add_int(&pmc_stats.pm_intr_processed, 1);
-			if (PMC_IS_SYSTEM_MODE(mode))
-				pmc_update_histogram(phw, eip);
-			else if (PMC_IS_VIRTUAL_MODE(mode))
-				pmc_send_signal(pm);
-			retval = 1;
-		}
-	}
-	return retval;
-}
-
-/*
- * describe a PMC
- */
-static int
-amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
-{
-	int error;
-	size_t copied;
-	const struct amd_descr *pd;
-	struct pmc_hw *phw;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] row-index %d out of range", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pd  = &amd_pmcdesc[ri];
-
-	if ((error = copystr(pd->pm_descr.pd_name, pi->pm_name,
-		 PMC_NAME_MAX, &copied)) != 0)
-		return error;
-
-	pi->pm_class = pd->pm_descr.pd_class;
-	pi->pm_caps  = pd->pm_descr.pd_caps;
-	pi->pm_width = pd->pm_descr.pd_width;
-
-	if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
-		pi->pm_enabled = TRUE;
-		*ppmc          = phw->phw_pmc;
-	} else {
-		pi->pm_enabled = FALSE;
-		*ppmc          = NULL;
-	}
-
-	return 0;
-}
-
-/*
- * i386 specific entry points
- */
-
-/*
- * return the MSR address of the given PMC.
- */
-
-static int
-amd_get_msr(int ri, uint32_t *msr)
-{
-	KASSERT(ri >= 0 && ri < AMD_NPMCS,
-	    ("[amd,%d] ri %d out of range", __LINE__, ri));
-
-	*msr = amd_pmcdesc[ri].pm_perfctr;
-	return 0;
-}
-
-/*
- * processor dependent initialization.
- */
-
-/*
- * Per-processor data structure
- *
- * [common stuff]
- * [5 struct pmc_hw pointers]
- * [5 struct pmc_hw structures]
- */
-
-struct amd_cpu {
-	struct pmc_cpu	pc_common;
-	struct pmc_hw	*pc_hwpmcs[AMD_NPMCS];
-	struct pmc_hw	pc_amdpmcs[AMD_NPMCS];
-};
-
-
-static int
-amd_init(int cpu)
-{
-	int n;
-	struct amd_cpu *pcs;
-	struct pmc_hw  *phw;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] insane cpu number %d", __LINE__, cpu));
-
-	PMCDBG(MDP,INI,1,"amd-init cpu=%d", cpu);
-
-	MALLOC(pcs, struct amd_cpu *, sizeof(struct amd_cpu), M_PMC,
-	    M_WAITOK|M_ZERO);
-
-	if (pcs == NULL)
-		return ENOMEM;
-
-	phw = &pcs->pc_amdpmcs[0];
-
-	/*
-	 * Initialize the per-cpu mutex and set the content of the
-	 * hardware descriptors to a known state.
-	 */
-
-	for (n = 0; n < AMD_NPMCS; n++, phw++) {
-		phw->phw_state 	  = PMC_PHW_FLAG_IS_ENABLED |
-		    PMC_PHW_CPU_TO_STATE(cpu) | PMC_PHW_INDEX_TO_STATE(n);
-		phw->phw_pmc	  = NULL;
-		pcs->pc_hwpmcs[n] = phw;
-	}
-
-	/* Mark the TSC as shareable */
-	pcs->pc_hwpmcs[0]->phw_state |= PMC_PHW_FLAG_IS_SHAREABLE;
-
-	pmc_pcpu[cpu] = (struct pmc_cpu *) pcs;
-
-	return 0;
-}
-
-
-/*
- * processor dependent cleanup prior to the KLD
- * being unloaded
- */
-
-static int
-amd_cleanup(int cpu)
-{
-	int i;
-	uint32_t evsel;
-	struct pmc_cpu *pcs;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] insane cpu number (%d)", __LINE__, cpu));
-
-	PMCDBG(MDP,INI,1,"amd-cleanup cpu=%d", cpu);
-
-	/*
-	 * First, turn off all PMCs on this CPU.
-	 */
-
-	for (i = 0; i < 4; i++) { /* XXX this loop is now not needed */
-		evsel = rdmsr(AMD_PMC_EVSEL_0 + i);
-		evsel &= ~AMD_PMC_ENABLE;
-		wrmsr(AMD_PMC_EVSEL_0 + i, evsel);
-	}
-
-	/*
-	 * Next, free up allocated space.
-	 */
-
-	pcs = pmc_pcpu[cpu];
-
-#if	DEBUG
-	/* check the TSC */
-	KASSERT(pcs->pc_hwpmcs[0]->phw_pmc == NULL,
-	    ("[amd,%d] CPU%d,PMC0 still in use", __LINE__, cpu));
-	for (i = 1; i < AMD_NPMCS; i++) {
-		KASSERT(pcs->pc_hwpmcs[i]->phw_pmc == NULL,
-		    ("[amd,%d] CPU%d/PMC%d in use", __LINE__, cpu, i));
-		KASSERT(AMD_PMC_IS_STOPPED(AMD_PMC_EVSEL_0 + (i-1)),
-		    ("[amd,%d] CPU%d/PMC%d not stopped", __LINE__, cpu, i));
-	}
-#endif
-	KASSERT(pcs != NULL,
-	    ("[amd,%d] null per-cpu state pointer (cpu%d)", __LINE__, cpu));
-
-	pmc_pcpu[cpu] = NULL;
-	FREE(pcs, M_PMC);
-	return 0;
-}
-
-/*
- * Initialize ourselves.
- */
-
-struct pmc_mdep *
-pmc_amd_initialize(void)
-{
-
-	struct pmc_mdep *pmc_mdep;
-
-	/* The presence of hardware performance counters on the AMD
-	   Athlon, Duron or later processors, is _not_ indicated by
-	   any of the processor feature flags set by the 'CPUID'
-	   instruction, so we only check the 'instruction family'
-	   field returned by CPUID for instruction family >= 6. This
-	   test needs to be be refined. */
-
-	if ((cpu_id & 0xF00) < 0x600)
-		return NULL;
-
-	MALLOC(pmc_mdep, struct pmc_mdep *, sizeof(struct pmc_mdep),
-	    M_PMC, M_WAITOK|M_ZERO);
-
-#if	__i386__
-	pmc_mdep->pmd_cputype	   = PMC_CPU_AMD_K7;
-#elif	__amd64__
-	pmc_mdep->pmd_cputype	   = PMC_CPU_AMD_K8;
-#else
-#error	Unknown AMD CPU type.
-#endif
-
-	pmc_mdep->pmd_npmc 	   = AMD_NPMCS;
-
-	/* this processor has two classes of usable PMCs */
-	pmc_mdep->pmd_nclass       = 2;
-	pmc_mdep->pmd_classes[0]   = PMC_CLASS_TSC;
-	pmc_mdep->pmd_classes[1]   = AMD_PMC_CLASS;
-	pmc_mdep->pmd_nclasspmcs[0] = 1;
-	pmc_mdep->pmd_nclasspmcs[1] = (AMD_NPMCS-1);
-
-	pmc_mdep->pmd_init    	   = amd_init;
-	pmc_mdep->pmd_cleanup 	   = amd_cleanup;
-	pmc_mdep->pmd_switch_in    = amd_switch_in;
-	pmc_mdep->pmd_switch_out   = amd_switch_out;
-	pmc_mdep->pmd_read_pmc 	   = amd_read_pmc;
-	pmc_mdep->pmd_write_pmc    = amd_write_pmc;
-	pmc_mdep->pmd_config_pmc   = amd_config_pmc;
-	pmc_mdep->pmd_allocate_pmc = amd_allocate_pmc;
-	pmc_mdep->pmd_release_pmc  = amd_release_pmc;
-	pmc_mdep->pmd_start_pmc    = amd_start_pmc;
-	pmc_mdep->pmd_stop_pmc     = amd_stop_pmc;
-	pmc_mdep->pmd_intr	   = amd_intr;
-	pmc_mdep->pmd_describe     = amd_describe;
-	pmc_mdep->pmd_get_msr  	   = amd_get_msr; /* i386 */
-
-	PMCDBG(MDP,INI,0,"%s","amd-initialize");
-
-	return pmc_mdep;
-}
diff --git a/sys/hwpmc/hwpmc_intel.c b/sys/hwpmc/hwpmc_intel.c
deleted file mode 100644
index 3f6f330..0000000
--- a/sys/hwpmc/hwpmc_intel.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 2003-2005 Joseph Koshy
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/pmc.h>
-#include <sys/pmckern.h>
-#include <sys/smp.h>
-#include <sys/systm.h>
-
-#include <machine/cputypes.h>
-#include <machine/md_var.h>
-
-struct pmc_mdep *
-pmc_intel_initialize(void)
-{
-	struct pmc_mdep *pmc_mdep;
-	enum pmc_cputype cputype;
-	int error, model;
-
-	KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0,
-	    ("[intel,%d] Initializing non-intel processor", __LINE__));
-
-	PMCDBG(MDP,INI,0, "intel-initialize cpuid=0x%x", cpu_id);
-
-	cputype = -1;
-
-	switch (cpu_id & 0xF00) {
-	case 0x500:		/* Pentium family processors */
-		cputype = PMC_CPU_INTEL_P5;
-		break;
-	case 0x600:		/* Pentium Pro, Celeron, Pentium II & III */
-		switch ((cpu_id & 0xF0) >> 4) { /* model number field */
-		case 0x1:
-			cputype = PMC_CPU_INTEL_P6;
-			break;
-		case 0x3: case 0x5:
-			cputype = PMC_CPU_INTEL_PII;
-			break;
-		case 0x6:
-			cputype = PMC_CPU_INTEL_CL;
-			break;
-		case 0x7: case 0x8: case 0xA: case 0xB:
-			cputype = PMC_CPU_INTEL_PIII;
-			break;
-		case 0x9: case 0xD:
-			cputype = PMC_CPU_INTEL_PM;
-			break;
-		}
-		break;
-	case 0xF00:		/* P4 */
-		model = ((cpu_id & 0xF0000) >> 12) | ((cpu_id & 0xF0) >> 4);
-		if (model >= 0 && model <= 3) /* known models */
-			cputype = PMC_CPU_INTEL_PIV;
-		break;
-	}
-
-	if ((int) cputype == -1) {
-		printf("pmc: Unknown Intel CPU.\n");
-		return NULL;
-	}
-
-	MALLOC(pmc_mdep, struct pmc_mdep *, sizeof(struct pmc_mdep),
-	    M_PMC, M_WAITOK|M_ZERO);
-
-	pmc_mdep->pmd_cputype 	    = cputype;
-	pmc_mdep->pmd_nclass	    = 2;
-	pmc_mdep->pmd_classes[0]    = PMC_CLASS_TSC;
-	pmc_mdep->pmd_nclasspmcs[0] = 1;
-
-	error = 0;
-
-	switch (cputype) {
-
-		/*
-		 * Intel Pentium 4 Processors
-		 */
-
-	case PMC_CPU_INTEL_PIV:
-		error = pmc_initialize_p4(pmc_mdep);
-		break;
-
-		/*
-		 * P6 Family Processors
-		 */
-
-	case PMC_CPU_INTEL_P6:
-	case PMC_CPU_INTEL_CL:
-	case PMC_CPU_INTEL_PII:
-	case PMC_CPU_INTEL_PIII:
-	case PMC_CPU_INTEL_PM:
-
-		error = pmc_initialize_p6(pmc_mdep);
-		break;
-
-		/*
-		 * Intel Pentium PMCs.
-		 */
-
-	case PMC_CPU_INTEL_P5:
-		error = pmc_initialize_p5(pmc_mdep);
-		break;
-
-	default:
-		KASSERT(0,("[intel,%d] Unknown CPU type", __LINE__));
-	}
-
-	if (error) {
-		FREE(pmc_mdep, M_PMC);
-		pmc_mdep = NULL;
-	}
-
-	return pmc_mdep;
-}
diff --git a/sys/hwpmc/hwpmc_mod.c b/sys/hwpmc/hwpmc_mod.c
deleted file mode 100644
index 3f5cbd7..0000000
--- a/sys/hwpmc/hwpmc_mod.c
+++ /dev/null
@@ -1,3670 +0,0 @@
-/*-
- * Copyright (c) 2003-2005 Joseph Koshy
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/eventhandler.h>
-#include <sys/jail.h>
-#include <sys/kernel.h>
-#include <sys/limits.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/pmc.h>
-#include <sys/pmckern.h>
-#include <sys/proc.h>
-#include <sys/queue.h>
-#include <sys/sched.h>
-#include <sys/signalvar.h>
-#include <sys/smp.h>
-#include <sys/sx.h>
-#include <sys/sysctl.h>
-#include <sys/sysent.h>
-#include <sys/systm.h>
-
-#include <machine/md_var.h>
-
-/*
- * Types
- */
-
-enum pmc_flags {
-	PMC_FLAG_NONE	  = 0x00, /* do nothing */
-	PMC_FLAG_REMOVE   = 0x01, /* atomically remove entry from hash */
-	PMC_FLAG_ALLOCATE = 0x02, /* add entry to hash if not found */
-};
-
-/*
- * The offset in sysent where the syscall is allocated.
- */
-
-static int pmc_syscall_num = NO_SYSCALL;
-struct pmc_cpu		**pmc_pcpu;	 /* per-cpu state */
-pmc_value_t		*pmc_pcpu_saved; /* saved PMC values: CSW handling */
-
-#define	PMC_PCPU_SAVED(C,R)	pmc_pcpu_saved[(R) + md->pmd_npmc*(C)]
-
-struct mtx_pool		*pmc_mtxpool;
-static int		*pmc_pmcdisp;	 /* PMC row dispositions */
-
-#define	PMC_ROW_DISP_IS_FREE(R)		(pmc_pmcdisp[(R)] == 0)
-#define	PMC_ROW_DISP_IS_THREAD(R)	(pmc_pmcdisp[(R)] > 0)
-#define	PMC_ROW_DISP_IS_STANDALONE(R)	(pmc_pmcdisp[(R)] < 0)
-
-#define	PMC_MARK_ROW_FREE(R) do {					  \
-	pmc_pmcdisp[(R)] = 0;						  \
-} while (0)
-
-#define	PMC_MARK_ROW_STANDALONE(R) do {					  \
-	KASSERT(pmc_pmcdisp[(R)] <= 0, ("[pmc,%d] row disposition error", \
-		    __LINE__));						  \
-	atomic_add_int(&pmc_pmcdisp[(R)], -1);				  \
-	KASSERT(pmc_pmcdisp[(R)] >= (-mp_ncpus), ("[pmc,%d] row "	  \
-		"disposition error", __LINE__));			  \
-} while (0)
-
-#define	PMC_UNMARK_ROW_STANDALONE(R) do { 				  \
-	atomic_add_int(&pmc_pmcdisp[(R)], 1);				  \
-	KASSERT(pmc_pmcdisp[(R)] <= 0, ("[pmc,%d] row disposition error", \
-		    __LINE__));						  \
-} while (0)
-
-#define	PMC_MARK_ROW_THREAD(R) do {					  \
-	KASSERT(pmc_pmcdisp[(R)] >= 0, ("[pmc,%d] row disposition error", \
-		    __LINE__));						  \
-	atomic_add_int(&pmc_pmcdisp[(R)], 1);				  \
-} while (0)
-
-#define	PMC_UNMARK_ROW_THREAD(R) do {					  \
-	atomic_add_int(&pmc_pmcdisp[(R)], -1);				  \
-	KASSERT(pmc_pmcdisp[(R)] >= 0, ("[pmc,%d] row disposition error", \
-		    __LINE__));						  \
-} while (0)
-
-
-/* various event handlers */
-static eventhandler_tag	pmc_exit_tag, pmc_fork_tag;
-
-/* Module statistics */
-struct pmc_op_getdriverstats pmc_stats;
-
-/* Machine/processor dependent operations */
-struct pmc_mdep  *md;
-
-/*
- * Hash tables mapping owner processes and target threads to PMCs.
- */
-
-struct mtx pmc_processhash_mtx;		/* spin mutex */
-static u_long pmc_processhashmask;
-static LIST_HEAD(pmc_processhash, pmc_process)	*pmc_processhash;
-
-/*
- * Hash table of PMC owner descriptors.  This table is protected by
- * the shared PMC "sx" lock.
- */
-
-static u_long pmc_ownerhashmask;
-static LIST_HEAD(pmc_ownerhash, pmc_owner)	*pmc_ownerhash;
-
-/*
- * Prototypes
- */
-
-#if	DEBUG
-static int	pmc_debugflags_sysctl_handler(SYSCTL_HANDLER_ARGS);
-static int	pmc_debugflags_parse(char *newstr, char *fence);
-#endif
-
-static int	load(struct module *module, int cmd, void *arg);
-static int	pmc_syscall_handler(struct thread *td, void *syscall_args);
-static int	pmc_configure_log(struct pmc_owner *po, int logfd);
-static void	pmc_log_process_exit(struct pmc *pm, struct pmc_process *pp);
-static struct pmc *pmc_allocate_pmc_descriptor(void);
-static struct pmc *pmc_find_pmc_descriptor_in_process(struct pmc_owner *po,
-    pmc_id_t pmc);
-static void	pmc_release_pmc_descriptor(struct pmc *pmc);
-static int	pmc_can_allocate_rowindex(struct proc *p, unsigned int ri);
-static struct pmc_process *pmc_find_process_descriptor(struct proc *p,
-    uint32_t mode);
-static void	pmc_remove_process_descriptor(struct pmc_process *pp);
-static struct pmc_owner *pmc_find_owner_descriptor(struct proc *p);
-static int	pmc_find_pmc(pmc_id_t pmcid, struct pmc **pm);
-static void	pmc_remove_owner(struct pmc_owner *po);
-static void	pmc_maybe_remove_owner(struct pmc_owner *po);
-static void	pmc_unlink_target_process(struct pmc *pmc,
-    struct pmc_process *pp);
-static void	pmc_link_target_process(struct pmc *pm,
-    struct pmc_process *pp);
-static void	pmc_unlink_owner(struct pmc *pmc);
-static void	pmc_cleanup(void);
-static void	pmc_save_cpu_binding(struct pmc_binding *pb);
-static void	pmc_restore_cpu_binding(struct pmc_binding *pb);
-static void	pmc_select_cpu(int cpu);
-static void	pmc_process_exit(void *arg, struct proc *p);
-static void	pmc_process_fork(void *arg, struct proc *p1,
-    struct proc *p2, int n);
-static int	pmc_attach_one_process(struct proc *p, struct pmc *pm);
-static int	pmc_attach_process(struct proc *p, struct pmc *pm);
-static int	pmc_detach_one_process(struct proc *p, struct pmc *pm,
-    int flags);
-static int	pmc_detach_process(struct proc *p, struct pmc *pm);
-static int	pmc_start(struct pmc *pm);
-static int	pmc_stop(struct pmc *pm);
-static int	pmc_can_attach(struct pmc *pm, struct proc *p);
-
-/*
- * Kernel tunables and sysctl(8) interface.
- */
-
-#define PMC_SYSCTL_NAME_PREFIX "kern." PMC_MODULE_NAME "."
-
-SYSCTL_NODE(_kern, OID_AUTO, hwpmc, CTLFLAG_RW, 0, "HWPMC parameters");
-
-#if	DEBUG
-unsigned int pmc_debugflags = PMC_DEBUG_DEFAULT_FLAGS;
-char	pmc_debugstr[PMC_DEBUG_STRSIZE];
-TUNABLE_STR(PMC_SYSCTL_NAME_PREFIX "debugflags", pmc_debugstr,
-    sizeof(pmc_debugstr));
-SYSCTL_PROC(_kern_hwpmc, OID_AUTO, debugflags,
-    CTLTYPE_STRING|CTLFLAG_RW|CTLFLAG_TUN,
-    0, 0, pmc_debugflags_sysctl_handler, "A", "debug flags");
-#endif
-
-/*
- * kern.pmc.hashrows -- determines the number of rows in the
- * of the hash table used to look up threads
- */
-
-static int pmc_hashsize = PMC_HASH_SIZE;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "hashsize", &pmc_hashsize);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, hashsize, CTLFLAG_TUN|CTLFLAG_RD,
-    &pmc_hashsize, 0, "rows in hash tables");
-
-/*
- * kern.pmc.pcpusize -- the size of each per-cpu
- * area for collection PC samples.
- */
-
-static int pmc_pcpu_buffer_size = PMC_PCPU_BUFFER_SIZE;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "pcpubuffersize", &pmc_pcpu_buffer_size);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, pcpubuffersize, CTLFLAG_TUN|CTLFLAG_RD,
-    &pmc_pcpu_buffer_size, 0, "size of per-cpu buffer in 4K pages");
-
-/*
- * kern.pmc.mtxpoolsize -- number of mutexes in the mutex pool.
- */
-
-static int pmc_mtxpool_size = PMC_MTXPOOL_SIZE;
-TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "mtxpoolsize", &pmc_mtxpool_size);
-SYSCTL_INT(_kern_hwpmc, OID_AUTO, mtxpoolsize, CTLFLAG_TUN|CTLFLAG_RD,
-    &pmc_mtxpool_size, 0, "size of spin mutex pool");
-
-
-
-/*
- * security.bsd.unprivileged_syspmcs -- allow non-root processes to
- * allocate system-wide PMCs.
- *
- * Allowing unprivileged processes to allocate system PMCs is convenient
- * if system-wide measurements need to be taken concurrently with other
- * per-process measurements.  This feature is turned off by default.
- */
-
-SYSCTL_DECL(_security_bsd);
-
-static int pmc_unprivileged_syspmcs = 0;
-TUNABLE_INT("security.bsd.unprivileged_syspmcs", &pmc_unprivileged_syspmcs);
-SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_syspmcs, CTLFLAG_RW,
-    &pmc_unprivileged_syspmcs, 0,
-    "allow unprivileged process to allocate system PMCs");
-
-#if	PMC_HASH_USE_CRC32
-
-#define	PMC_HASH_PTR(P,M)	(crc32(&(P), sizeof((P))) & (M))
-
-#else 	/* integer multiplication */
-
-#if	LONG_BIT == 64
-#define	_PMC_HM		11400714819323198486u
-#elif	LONG_BIT == 32
-#define	_PMC_HM		2654435769u
-#else
-#error 	Must know the size of 'long' to compile
-#endif
-
-/*
- * Hash function.  Discard the lower 2 bits of the pointer since
- * these are always zero for our uses.  The hash multiplier is
- * round((2^LONG_BIT) * ((sqrt(5)-1)/2)).
- */
-
-#define	PMC_HASH_PTR(P,M)	((((unsigned long) (P) >> 2) * _PMC_HM) & (M))
-
-#endif
-
-/*
- * Syscall structures
- */
-
-/* The `sysent' for the new syscall */
-static struct sysent pmc_sysent = {
-	2,			/* sy_narg */
-	pmc_syscall_handler	/* sy_call */
-};
-
-static struct syscall_module_data pmc_syscall_mod = {
-	load,
-	NULL,
-	&pmc_syscall_num,
-	&pmc_sysent,
-	{ 0, NULL }
-};
-
-static moduledata_t pmc_mod = {
-	PMC_MODULE_NAME,
-	syscall_module_handler,
-	&pmc_syscall_mod
-};
-
-DECLARE_MODULE(pmc, pmc_mod, SI_SUB_SMP, SI_ORDER_ANY);
-MODULE_VERSION(pmc, PMC_VERSION);
-
-#if	DEBUG
-static int
-pmc_debugflags_parse(char *newstr, char *fence)
-{
-	char c, *p, *q;
-	unsigned int tmpflags;
-	int level;
-	char tmpbuf[4];		/* 3 character keyword + '\0' */
-
-	tmpflags = 0;
-	level = 0xF;	/* max verbosity */
-
-	p = newstr;
-
-	for (; p < fence && (c = *p);) {
-
-		/* skip separators */
-		if (c == ' ' || c == '\t' || c == ',') {
-			p++; continue;
-		}
-
-		(void) strlcpy(tmpbuf, p, sizeof(tmpbuf));
-
-#define	CMP_SET_FLAG_MAJ(S,F)					\
-		else if (strncmp(tmpbuf, S, 3) == 0)		\
-			tmpflags |= __PMCDFMAJ(F)
-
-#define	CMP_SET_FLAG_MIN(S,F)					\
-		else if (strncmp(tmpbuf, S, 3) == 0)		\
-			tmpflags |= __PMCDFMIN(F)
-
-		if (fence - p > 6 && strncmp(p, "level=", 6) == 0) {
-			p += 6;	/* skip over keyword */
-			level = strtoul(p, &q, 16);
-		}
-		CMP_SET_FLAG_MAJ("mod", MOD);
-		CMP_SET_FLAG_MAJ("pmc", PMC);
-		CMP_SET_FLAG_MAJ("ctx", CTX);
-		CMP_SET_FLAG_MAJ("own", OWN);
-		CMP_SET_FLAG_MAJ("prc", PRC);
-		CMP_SET_FLAG_MAJ("mdp", MDP);
-		CMP_SET_FLAG_MAJ("cpu", CPU);
-
-		CMP_SET_FLAG_MIN("all", ALL);
-		CMP_SET_FLAG_MIN("rel", REL);
-		CMP_SET_FLAG_MIN("ops", OPS);
-		CMP_SET_FLAG_MIN("ini", INI);
-		CMP_SET_FLAG_MIN("fnd", FND);
-		CMP_SET_FLAG_MIN("pmh", PMH);
-		CMP_SET_FLAG_MIN("pms", PMS);
-		CMP_SET_FLAG_MIN("orm", ORM);
-		CMP_SET_FLAG_MIN("omr", OMR);
-		CMP_SET_FLAG_MIN("tlk", TLK);
-		CMP_SET_FLAG_MIN("tul", TUL);
-		CMP_SET_FLAG_MIN("ext", EXT);
-		CMP_SET_FLAG_MIN("exc", EXC);
-		CMP_SET_FLAG_MIN("frk", FRK);
-		CMP_SET_FLAG_MIN("att", ATT);
-		CMP_SET_FLAG_MIN("swi", SWI);
-		CMP_SET_FLAG_MIN("swo", SWO);
-		CMP_SET_FLAG_MIN("reg", REG);
-		CMP_SET_FLAG_MIN("alr", ALR);
-		CMP_SET_FLAG_MIN("rea", REA);
-		CMP_SET_FLAG_MIN("wri", WRI);
-		CMP_SET_FLAG_MIN("cfg", CFG);
-		CMP_SET_FLAG_MIN("sta", STA);
-		CMP_SET_FLAG_MIN("sto", STO);
-		CMP_SET_FLAG_MIN("bnd", BND);
-		CMP_SET_FLAG_MIN("sel", SEL);
-		else	/* unrecognized keyword */
-			return EINVAL;
-
-		p += 4;	/* skip keyword and separator */
-	}
-
-	pmc_debugflags = (tmpflags|level);
-
-	return 0;
-}
-
-static int
-pmc_debugflags_sysctl_handler(SYSCTL_HANDLER_ARGS)
-{
-	char *fence, *newstr;
-	int error;
-	unsigned int n;
-
-	(void) arg1; (void) arg2; /* unused parameters */
-
-	n = sizeof(pmc_debugstr);
-	MALLOC(newstr, char *, n, M_PMC, M_ZERO|M_WAITOK);
-	(void) strlcpy(newstr, pmc_debugstr, sizeof(pmc_debugstr));
-
-	error = sysctl_handle_string(oidp, newstr, n, req);
-
-	/* if there is a new string, parse and copy it */
-	if (error == 0 && req->newptr != NULL) {
-		fence = newstr + (n < req->newlen ? n : req->newlen);
-		if ((error = pmc_debugflags_parse(newstr, fence)) == 0)
-			(void) strlcpy(pmc_debugstr, newstr,
-			    sizeof(pmc_debugstr));
-	}
-
-	FREE(newstr, M_PMC);
-
-	return error;
-}
-#endif
-
-/*
- * Concurrency Control
- *
- * The driver manages the following data structures:
- *
- *   - target process descriptors, one per target process
- *   - owner process descriptors (and attached lists), one per owner process
- *   - lookup hash tables for owner and target processes
- *   - PMC descriptors (and attached lists)
- *   - per-cpu hardware state
- *   - the 'hook' variable through which the kernel calls into
- *     this module
- *   - the machine hardware state (managed by the MD layer)
- *
- * These data structures are accessed from:
- *
- * - thread context-switch code
- * - interrupt handlers (possibly on multiple cpus)
- * - kernel threads on multiple cpus running on behalf of user
- *   processes doing system calls
- * - this driver's private kernel threads
- *
- * = Locks and Locking strategy =
- *
- * The driver uses four locking strategies for its operation:
- *
- * - There is a 'global' SX lock "pmc_sx" that is used to protect
- *   the its 'meta-data'.
- *
- *   Calls into the module (via syscall() or by the kernel) start with
- *   this lock being held in exclusive mode.  Depending on the requested
- *   operation, the lock may be downgraded to 'shared' mode to allow
- *   more concurrent readers into the module.
- *
- *   This SX lock is held in exclusive mode for any operations that
- *   modify the linkages between the driver's internal data structures.
- *
- *   The 'pmc_hook' function pointer is also protected by this lock.
- *   It is only examined with the sx lock held in exclusive mode.  The
- *   kernel module is allowed to be unloaded only with the sx lock
- *   held in exclusive mode.  In normal syscall handling, after
- *   acquiring the pmc_sx lock we first check that 'pmc_hook' is
- *   non-null before proceeding.  This prevents races between the
- *   thread unloading the module and other threads seeking to use the
- *   module.
- *
- * - Lookups of target process structures and owner process structures
- *   cannot use the global "pmc_sx" SX lock because these lookups need
- *   to happen during context switches and in other critical sections
- *   where sleeping is not allowed.  We protect these lookup tables
- *   with their own private spin-mutexes, "pmc_processhash_mtx" and
- *   "pmc_ownerhash_mtx".  These are 'leaf' mutexes, in that no other
- *   lock is acquired with these locks held.
- *
- * - Interrupt handlers work in a lock free manner.  At interrupt
- *   time, handlers look at the PMC pointer (phw->phw_pmc) configured
- *   when the PMC was started.  If this pointer is NULL, the interrupt
- *   is ignored after updating driver statistics.  We ensure that this
- *   pointer is set (using an atomic operation if necessary) before the
- *   PMC hardware is started.  Conversely, this pointer is unset atomically
- *   only after the PMC hardware is stopped.
- *
- *   We ensure that everything needed for the operation of an
- *   interrupt handler is available without it needing to acquire any
- *   locks.  We also ensure that a PMC's software state is destroyed only
- *   after the PMC is taken off hardware (on all CPUs).
- *
- * - Context-switch handling with process-private PMCs needs more
- *   care.
- *
- *   A given process may be the target of multiple PMCs.  For example,
- *   PMCATTACH and PMCDETACH may be requested by a process on one CPU
- *   while the target process is running on another.  A PMC could also
- *   be getting released because its owner is exiting.  We tackle
- *   these situations in the following manner:
- *
- *   - each target process structure 'pmc_process' has an array
- *     of 'struct pmc *' pointers, one for each hardware PMC.
- *
- *   - At context switch IN time, each "target" PMC in RUNNING state
- *     gets started on hardware and a pointer to each PMC is copied into
- *     the per-cpu phw array.  The 'runcount' for the PMC is
- *     incremented.
- *
- *   - At context switch OUT time, all process-virtual PMCs are stopped
- *     on hardware.  The saved value is added to the PMCs value field
- *     only if the PMC is in a non-deleted state (the PMCs state could
- *     have changed during the current time slice).
- *
- *     Note that since in-between a switch IN on a processor and a switch
- *     OUT, the PMC could have been released on another CPU.  Therefore
- *     context switch OUT always looks at the hardware state to turn
- *     OFF PMCs and will update a PMC's saved value only if reachable
- *     from the target process record.
- *
- *   - OP PMCRELEASE could be called on a PMC at any time (the PMC could
- *     be attached to many processes at the time of the call and could
- *     be active on multiple CPUs).
- *
- *     We prevent further scheduling of the PMC by marking it as in
- *     state 'DELETED'.  If the runcount of the PMC is non-zero then
- *     this PMC is currently running on a CPU somewhere.  The thread
- *     doing the PMCRELEASE operation waits by repeatedly doing an
- *     tsleep() till the runcount comes to zero.
- *
- */
-
-/*
- * save the cpu binding of the current kthread
- */
-
-static void
-pmc_save_cpu_binding(struct pmc_binding *pb)
-{
-	PMCDBG(CPU,BND,2, "%s", "save-cpu");
-	mtx_lock_spin(&sched_lock);
-	pb->pb_bound = sched_is_bound(curthread);
-	pb->pb_cpu   = curthread->td_oncpu;
-	mtx_unlock_spin(&sched_lock);
-	PMCDBG(CPU,BND,2, "save-cpu cpu=%d", pb->pb_cpu);
-}
-
-/*
- * restore the cpu binding of the current thread
- */
-
-static void
-pmc_restore_cpu_binding(struct pmc_binding *pb)
-{
-	PMCDBG(CPU,BND,2, "restore-cpu curcpu=%d restore=%d",
-	    curthread->td_oncpu, pb->pb_cpu);
-	mtx_lock_spin(&sched_lock);
-	if (pb->pb_bound)
-		sched_bind(curthread, pb->pb_cpu);
-	else
-		sched_unbind(curthread);
-	mtx_unlock_spin(&sched_lock);
-	PMCDBG(CPU,BND,2, "%s", "restore-cpu done");
-}
-
-/*
- * move execution over the specified cpu and bind it there.
- */
-
-static void
-pmc_select_cpu(int cpu)
-{
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[pmc,%d] bad cpu number %d", __LINE__, cpu));
-
-	/* never move to a disabled CPU */
-	KASSERT(pmc_cpu_is_disabled(cpu) == 0, ("[pmc,%d] selecting "
-	    "disabled CPU %d", __LINE__, cpu));
-
-	PMCDBG(CPU,SEL,2, "select-cpu cpu=%d", cpu);
-	mtx_lock_spin(&sched_lock);
-	sched_bind(curthread, cpu);
-	mtx_unlock_spin(&sched_lock);
-
-	KASSERT(curthread->td_oncpu == cpu,
-	    ("[pmc,%d] CPU not bound [cpu=%d, curr=%d]", __LINE__,
-		cpu, curthread->td_oncpu));
-
-	PMCDBG(CPU,SEL,2, "select-cpu cpu=%d ok", cpu);
-}
-
-/*
- * Update the per-pmc histogram
- */
-
-void
-pmc_update_histogram(struct pmc_hw *phw, uintptr_t pc)
-{
-	(void) phw;
-	(void) pc;
-}
-
-/*
- * Send a signal to a process.  This is meant to be invoked from an
- * interrupt handler.
- */
-
-void
-pmc_send_signal(struct pmc *pmc)
-{
-	(void) pmc;	/* shutup gcc */
-
-#if	0
-	struct proc   *proc;
-	struct thread *td;
-
-	KASSERT(pmc->pm_owner != NULL,
-	    ("[pmc,%d] No owner for PMC", __LINE__));
-
-	KASSERT((pmc->pm_owner->po_flags & PMC_FLAG_IS_OWNER) &&
-	    (pmc->pm_owner->po_flags & PMC_FLAG_HAS_TS_PMC),
-	    ("[pmc,%d] interrupting PMC owner has wrong flags 0x%x",
-		__LINE__, pmc->pm_owner->po_flags));
-
-	proc = pmc->pm_owner->po_owner;
-
-	KASSERT(curthread->td_proc == proc,
-	    ("[pmc,%d] interruping the wrong thread (owner %p, "
-		"cur %p)", __LINE__, (void *) proc, curthread->td_proc));
-
-	mtx_lock_spin(&sched_lock);
-	td = TAILQ_FIRST(&proc->p_threads);
-	mtx_unlock_spin(&sched_lock);
-	/* XXX RACE HERE: can 'td' disappear now? */
-	trapsignal(td, SIGPROF, 0);
-	/* XXX rework this to use the regular 'psignal' interface from a
-	   helper thread */
-#endif
-
-}
-
-/*
- * remove an process owning PMCs
- */
-
-void
-pmc_remove_owner(struct pmc_owner *po)
-{
-	struct pmc_list *pl, *tmp;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	PMCDBG(OWN,ORM,1, "remove-owner po=%p", po);
-
-	/* Remove descriptor from the owner hash table */
-	LIST_REMOVE(po, po_next);
-
-	/* pass 1: release all owned PMC descriptors */
-	LIST_FOREACH_SAFE(pl, &po->po_pmcs, pl_next, tmp) {
-
-		PMCDBG(OWN,ORM,2, "pl=%p pmc=%p", pl, pl->pl_pmc);
-
-		/* remove the associated PMC descriptor, if present */
-		if (pl->pl_pmc)
-			pmc_release_pmc_descriptor(pl->pl_pmc);
-
-		/* remove the linked list entry */
-		LIST_REMOVE(pl, pl_next);
-		FREE(pl, M_PMC);
-	}
-
-	/* pass 2: delete the pmc_list chain */
-	LIST_FOREACH_SAFE(pl, &po->po_pmcs, pl_next, tmp) {
-		KASSERT(pl->pl_pmc == NULL,
-		    ("[pmc,%d] non-null pmc pointer", __LINE__));
-		LIST_REMOVE(pl, pl_next);
-		FREE(pl, M_PMC);
-	}
-
-	KASSERT(LIST_EMPTY(&po->po_pmcs),
-		("[pmc,%d] PMC list not empty", __LINE__));
-
-
-	/*
-	 * If this process owns a log file used for system wide logging,
-	 * remove the log file.
-	 *
-	 * XXX rework needed.
-	 */
-
-	if (po->po_flags & PMC_FLAG_OWNS_LOGFILE)
-		pmc_configure_log(po, -1);
-
-}
-
-/*
- * remove an owner process record if all conditions are met.
- */
-
-static void
-pmc_maybe_remove_owner(struct pmc_owner *po)
-{
-
-	PMCDBG(OWN,OMR,1, "maybe-remove-owner po=%p", po);
-
-	/*
-	 * Remove owner record if
-	 * - this process does not own any PMCs
-	 * - this process has not allocated a system-wide sampling buffer
-	 */
-
-	if (LIST_EMPTY(&po->po_pmcs) &&
-	    ((po->po_flags & PMC_FLAG_OWNS_LOGFILE) == 0)) {
-		pmc_remove_owner(po);
-		FREE(po, M_PMC);
-	}
-}
-
-/*
- * Add an association between a target process and a PMC.
- */
-
-static void
-pmc_link_target_process(struct pmc *pm, struct pmc_process *pp)
-{
-	int ri;
-	struct pmc_target *pt;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	KASSERT(pm != NULL && pp != NULL,
-	    ("[pmc,%d] Null pm %p or pp %p", __LINE__, pm, pp));
-
-	KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt < ((int) md->pmd_npmc - 1),
-	    ("[pmc,%d] Illegal reference count %d for process record %p",
-		__LINE__, pp->pp_refcnt, (void *) pp));
-
-	ri = pm->pm_rowindex;
-
-	PMCDBG(PRC,TLK,1, "link-target pmc=%p ri=%d pmc-process=%p",
-	    pm, ri, pp);
-
-#if	DEBUG
-	LIST_FOREACH(pt, &pm->pm_targets, pt_next)
-	    if (pt->pt_process == pp)
-		    KASSERT(0, ("[pmc,%d] pp %p already in pmc %p targets",
-				__LINE__, pp, pm));
-#endif
-
-	MALLOC(pt, struct pmc_target *, sizeof(struct pmc_target),
-	    M_PMC, M_ZERO|M_WAITOK);
-
-	pt->pt_process = pp;
-
-	LIST_INSERT_HEAD(&pm->pm_targets, pt, pt_next);
-
-	atomic_store_rel_ptr(&pp->pp_pmcs[ri].pp_pmc, pm);
-
-	pp->pp_refcnt++;
-
-}
-
-/*
- * Removes the association between a target process and a PMC.
- */
-
-static void
-pmc_unlink_target_process(struct pmc *pm, struct pmc_process *pp)
-{
-	int ri;
-	struct pmc_target *ptgt;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	KASSERT(pm != NULL && pp != NULL,
-	    ("[pmc,%d] Null pm %p or pp %p", __LINE__, pm, pp));
-
-	KASSERT(pp->pp_refcnt >= 1 && pp->pp_refcnt < (int) md->pmd_npmc,
-	    ("[pmc,%d] Illegal ref count %d on process record %p",
-		__LINE__, pp->pp_refcnt, (void *) pp));
-
-	ri = pm->pm_rowindex;
-
-	PMCDBG(PRC,TUL,1, "unlink-target pmc=%p ri=%d pmc-process=%p",
-	    pm, ri, pp);
-
-	KASSERT(pp->pp_pmcs[ri].pp_pmc == pm,
-	    ("[pmc,%d] PMC ri %d mismatch pmc %p pp->[ri] %p", __LINE__,
-		ri, pm, pp->pp_pmcs[ri].pp_pmc));
-
-	pp->pp_pmcs[ri].pp_pmc = NULL;
-	pp->pp_pmcs[ri].pp_pmcval = (pmc_value_t) 0;
-
-	pp->pp_refcnt--;
-
-	/* Remove the target process from the PMC structure */
-	LIST_FOREACH(ptgt, &pm->pm_targets, pt_next)
-		if (ptgt->pt_process == pp)
-			break;
-
-	KASSERT(ptgt != NULL, ("[pmc,%d] process %p (pp: %p) not found "
-		    "in pmc %p", __LINE__, pp->pp_proc, pp, pm));
-
-	PMCDBG(PRC,TUL,4, "unlink ptgt=%p", ptgt);
-
-	LIST_REMOVE(ptgt, pt_next);
-	FREE(ptgt, M_PMC);
-}
-
-/*
- * Remove PMC descriptor 'pmc' from the owner descriptor.
- */
-
-void
-pmc_unlink_owner(struct pmc *pm)
-{
-	struct pmc_list	*pl, *tmp;
-	struct pmc_owner *po;
-
-#if	DEBUG
-	KASSERT(LIST_EMPTY(&pm->pm_targets),
-	    ("[pmc,%d] unlinking PMC with targets", __LINE__));
-#endif
-
-	po = pm->pm_owner;
-
-	KASSERT(po != NULL, ("[pmc,%d] No owner for PMC", __LINE__));
-
-	LIST_FOREACH_SAFE(pl, &po->po_pmcs, pl_next, tmp) {
-		if (pl->pl_pmc == pm) {
-			pl->pl_pmc    = NULL;
-			pm->pm_owner = NULL;
-			return;
-		}
-	}
-
-	KASSERT(0, ("[pmc,%d] couldn't find pmc in owner list", __LINE__));
-}
-
-/*
- * Check if PMC 'pm' may be attached to target process 't'.
- */
-
-static int
-pmc_can_attach(struct pmc *pm, struct proc *t)
-{
-	struct proc *o;		/* pmc owner */
-	struct ucred *oc, *tc;	/* owner, target credentials */
-	int decline_attach, i;
-
-	/*
-	 * A PMC's owner can always attach that PMC to itself.
-	 */
-
-	if ((o = pm->pm_owner->po_owner) == t)
-		return 0;
-
-	PROC_LOCK(o);
-	oc = o->p_ucred;
-	crhold(oc);
-	PROC_UNLOCK(o);
-
-	PROC_LOCK(t);
-	tc = t->p_ucred;
-	crhold(tc);
-	PROC_UNLOCK(t);
-
-	/*
-	 * The effective uid of the PMC owner should match at least one
-	 * of the {effective,real,saved} uids of the target process.
-	 */
-
-	decline_attach = oc->cr_uid != tc->cr_uid &&
-	    oc->cr_uid != tc->cr_svuid &&
-	    oc->cr_uid != tc->cr_ruid;
-
-	/*
-	 * Every one of the target's group ids, must be in the owner's
-	 * group list.
-	 */
-	for (i = 0; !decline_attach && i < tc->cr_ngroups; i++)
-		decline_attach = !groupmember(tc->cr_groups[i], oc);
-
-	/* check the read and saved gids too */
-	if (decline_attach == 0)
-		decline_attach = !groupmember(tc->cr_rgid, oc) ||
-		    !groupmember(tc->cr_svgid, oc);
-
-	crfree(tc);
-	crfree(oc);
-
-	return !decline_attach;
-}
-
-/*
- * Attach a process to a PMC.
- */
-
-static int
-pmc_attach_one_process(struct proc *p, struct pmc *pm)
-{
-	int ri;
-	struct pmc_process	*pp;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	PMCDBG(PRC,ATT,2, "attach-one pm=%p ri=%d proc=%p (%d, %s)", pm,
-	    pm->pm_rowindex, p, p->p_pid, p->p_comm);
-
-	/*
-	 * Locate the process descriptor corresponding to process 'p',
-	 * allocating space as needed.
-	 *
-	 * Verify that rowindex 'pm_rowindex' is free in the process
-	 * descriptor.
-	 *
-	 * If not, allocate space for a descriptor and link the
-	 * process descriptor and PMC.
-	 */
-
-	ri = pm->pm_rowindex;
-
-	if ((pp = pmc_find_process_descriptor(p, PMC_FLAG_ALLOCATE)) == NULL)
-		return ENOMEM;
-
-	if (pp->pp_pmcs[ri].pp_pmc == pm) /* already present at slot [ri] */
-		return EEXIST;
-
-	if (pp->pp_pmcs[ri].pp_pmc != NULL)
-		return EBUSY;
-
-	pmc_link_target_process(pm, pp);
-
-	/* mark process as using HWPMCs */
-	PROC_LOCK(p);
-	p->p_flag |= P_HWPMC;
-	PROC_UNLOCK(p);
-
-	return 0;
-}
-
-/*
- * Attach a process and optionally its children
- */
-
-static int
-pmc_attach_process(struct proc *p, struct pmc *pm)
-{
-	int error;
-	struct proc *top;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	PMCDBG(PRC,ATT,1, "attach pm=%p ri=%d proc=%p (%d, %s)", pm,
-	    pm->pm_rowindex, p, p->p_pid, p->p_comm);
-
-	if ((pm->pm_flags & PMC_F_DESCENDANTS) == 0)
-		return pmc_attach_one_process(p, pm);
-
-	/*
-	 * Traverse all child processes, attaching them to
-	 * this PMC.
-	 */
-
-	sx_slock(&proctree_lock);
-
-	top = p;
-
-	for (;;) {
-		if ((error = pmc_attach_one_process(p, pm)) != 0)
-			break;
-		if (!LIST_EMPTY(&p->p_children))
-			p = LIST_FIRST(&p->p_children);
-		else for (;;) {
-			if (p == top)
-				goto done;
-			if (LIST_NEXT(p, p_sibling)) {
-				p = LIST_NEXT(p, p_sibling);
-				break;
-			}
-			p = p->p_pptr;
-		}
-	}
-
-	if (error)
-		(void) pmc_detach_process(top, pm);
-
- done:
-	sx_sunlock(&proctree_lock);
-	return error;
-}
-
-/*
- * Detach a process from a PMC.  If there are no other PMCs tracking
- * this process, remove the process structure from its hash table.  If
- * 'flags' contains PMC_FLAG_REMOVE, then free the process structure.
- */
-
-static int
-pmc_detach_one_process(struct proc *p, struct pmc *pm, int flags)
-{
-	int ri;
-	struct pmc_process *pp;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	KASSERT(pm != NULL,
-	    ("[pmc,%d] null pm pointer", __LINE__));
-
-	PMCDBG(PRC,ATT,2, "detach-one pm=%p ri=%d proc=%p (%d, %s) flags=0x%x",
-	    pm, pm->pm_rowindex, p, p->p_pid, p->p_comm, flags);
-
-	ri = pm->pm_rowindex;
-
-	if ((pp = pmc_find_process_descriptor(p, 0)) == NULL)
-		return ESRCH;
-
-	if (pp->pp_pmcs[ri].pp_pmc != pm)
-		return EINVAL;
-
-	pmc_unlink_target_process(pm, pp);
-
-	/*
-	 * If there are no PMCs targetting this process, we remove its
-	 * descriptor from the target hash table and unset the P_HWPMC
-	 * flag in the struct proc.
-	 */
-
-	KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt < (int) md->pmd_npmc,
-	    ("[pmc,%d] Illegal refcnt %d for process struct %p",
-		__LINE__, pp->pp_refcnt, pp));
-
-	if (pp->pp_refcnt != 0)	/* still a target of some PMC */
-		return 0;
-
-	pmc_remove_process_descriptor(pp);
-
-	if (flags & PMC_FLAG_REMOVE)
-		FREE(pp, M_PMC);
-
-	PROC_LOCK(p);
-	p->p_flag &= ~P_HWPMC;
-	PROC_UNLOCK(p);
-
-	return 0;
-}
-
-/*
- * Detach a process and optionally its descendants from a PMC.
- */
-
-static int
-pmc_detach_process(struct proc *p, struct pmc *pm)
-{
-	struct proc *top;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	PMCDBG(PRC,ATT,1, "detach pm=%p ri=%d proc=%p (%d, %s)", pm,
-	    pm->pm_rowindex, p, p->p_pid, p->p_comm);
-
-	if ((pm->pm_flags & PMC_F_DESCENDANTS) == 0)
-		return pmc_detach_one_process(p, pm, PMC_FLAG_REMOVE);
-
-	/*
-	 * Traverse all children, detaching them from this PMC.  We
-	 * ignore errors since we could be detaching a PMC from a
-	 * partially attached proc tree.
-	 */
-
-	sx_slock(&proctree_lock);
-
-	top = p;
-
-	for (;;) {
-		(void) pmc_detach_one_process(p, pm, PMC_FLAG_REMOVE);
-
-		if (!LIST_EMPTY(&p->p_children))
-			p = LIST_FIRST(&p->p_children);
-		else for (;;) {
-			if (p == top)
-				goto done;
-			if (LIST_NEXT(p, p_sibling)) {
-				p = LIST_NEXT(p, p_sibling);
-				break;
-			}
-			p = p->p_pptr;
-		}
-	}
-
- done:
-	sx_sunlock(&proctree_lock);
-	return 0;
-}
-
-/*
- * The 'hook' invoked from the kernel proper
- */
-
-
-#if	DEBUG
-const char *pmc_hooknames[] = {
-	"",
-	"EXIT",
-	"EXEC",
-	"FORK",
-	"CSW-IN",
-	"CSW-OUT"
-};
-#endif
-
-static int
-pmc_hook_handler(struct thread *td, int function, void *arg)
-{
-
-	KASSERT(td->td_proc->p_flag & P_HWPMC,
-	    ("[pmc,%d] unregistered thread called pmc_hook()", __LINE__));
-
-	PMCDBG(MOD,PMH,1, "hook td=%p func=%d \"%s\" arg=%p", td, function,
-	    pmc_hooknames[function], arg);
-
-	switch (function)
-	{
-
-	/*
-	 * Process exit.
-	 *
-	 * Remove this process from all hash tables.  If this process
-	 * owned any PMCs, turn off those PMCs and deallocate them,
-	 * removing any associations with target processes.
-	 *
-	 * This function will be called by the last 'thread' of a
-	 * process.
-	 *
-	 */
-
-	case PMC_FN_PROCESS_EXIT: /* release PMCs */
-	{
-		int cpu;
-		unsigned int ri;
-		struct pmc *pm;
-		struct pmc_hw *phw;
-		struct pmc_process *pp;
-		struct pmc_owner *po;
-		struct proc *p;
-		pmc_value_t newvalue, tmp;
-
-		sx_assert(&pmc_sx, SX_XLOCKED);
-
-		p = (struct proc *) arg;
-
-		/*
-		 * Since this code is invoked by the last thread in an
-		 * exiting process, we would have context switched IN
-		 * at some prior point.  Kernel mode context switches
-		 * may happen any time, so we want to disable a context
-		 * switch OUT till we get any PMCs targetting this
-		 * process off the hardware.
-		 *
-		 * We also need to atomically remove this process'
-		 * entry from our target process hash table, using
-		 * PMC_FLAG_REMOVE.
-		 */
-
-		PMCDBG(PRC,EXT,1, "process-exit proc=%p (%d, %s)", p, p->p_pid,
-		    p->p_comm);
-
-		critical_enter(); /* no preemption */
-
-		cpu = curthread->td_oncpu;
-
-		if ((pp = pmc_find_process_descriptor(p,
-			 PMC_FLAG_REMOVE)) != NULL) {
-
-			PMCDBG(PRC,EXT,2,
-			    "process-exit proc=%p pmc-process=%p", p, pp);
-
-			/*
-			 * This process could the target of some PMCs.
-			 * Such PMCs will thus be running on currently
-			 * executing CPU at this point in the code
-			 * since we've disallowed context switches.
-			 * We need to turn these PMCs off like we
-			 * would do at context switch OUT time.
-			 */
-
-			for (ri = 0; ri < md->pmd_npmc; ri++) {
-
-				/*
-				 * Pick up the pmc pointer from hardware
-				 * state similar to the CSW_OUT code.
-				 */
-
-				phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-				pm  = phw->phw_pmc;
-
-				PMCDBG(PRC,EXT,2, "ri=%d pm=%p", ri, pm);
-
-				if (pm == NULL ||
-				    !PMC_IS_VIRTUAL_MODE(pm->pm_mode))
-					continue;
-
-				PMCDBG(PRC,EXT,2, "ppmcs[%d]=%p pm=%p "
-				    "state=%d", ri, pp->pp_pmcs[ri].pp_pmc,
-				    pm, pm->pm_state);
-
-				KASSERT(pm->pm_rowindex == ri,
-				    ("[pmc,%d] ri mismatch pmc(%d) ri(%d)",
-					__LINE__, pm->pm_rowindex, ri));
-
-				KASSERT(pm == pp->pp_pmcs[ri].pp_pmc,
-				    ("[pmc,%d] pm %p != pp_pmcs[%d] %p",
-					__LINE__, pm, ri,
-					pp->pp_pmcs[ri].pp_pmc));
-
-				(void) md->pmd_stop_pmc(cpu, ri);
-
-				KASSERT(pm->pm_runcount > 0,
-				    ("[pmc,%d] bad runcount ri %d rc %d",
-					__LINE__, ri, pm->pm_runcount));
-
-				if (pm->pm_state == PMC_STATE_RUNNING) {
-					md->pmd_read_pmc(cpu, ri, &newvalue);
-					tmp = newvalue -
-					    PMC_PCPU_SAVED(cpu,ri);
-
-					mtx_pool_lock_spin(pmc_mtxpool, pm);
-					pm->pm_gv.pm_savedvalue += tmp;
-					pp->pp_pmcs[ri].pp_pmcval += tmp;
-					mtx_pool_unlock_spin(pmc_mtxpool, pm);
-				}
-
-				KASSERT((int) pm->pm_runcount >= 0,
-				    ("[pmc,%d] runcount is %d", __LINE__, ri));
-
-				atomic_subtract_rel_32(&pm->pm_runcount,1);
-				(void) md->pmd_config_pmc(cpu, ri, NULL);
-			}
-			critical_exit(); /* ok to be pre-empted now */
-
-			/*
-			 * Unlink this process from the PMCs that are
-			 * targetting it.  Log value at exit() time if
-			 * requested.
-			 */
-
-			for (ri = 0; ri < md->pmd_npmc; ri++)
-				if ((pm = pp->pp_pmcs[ri].pp_pmc) != NULL) {
-					if (pm->pm_flags &
-					    PMC_F_LOG_TC_PROCEXIT)
-						pmc_log_process_exit(pm, pp);
-					pmc_unlink_target_process(pm, pp);
-				}
-
-			FREE(pp, M_PMC);
-
-		} else
-			critical_exit(); /* pp == NULL */
-
-		/*
-		 * If the process owned PMCs, free them up and free up
-		 * memory.
-		 */
-
-		if ((po = pmc_find_owner_descriptor(p)) != NULL) {
-			pmc_remove_owner(po);
-			FREE(po, M_PMC);
-		}
-
-	}
-	break;
-
-	/*
-	 * Process exec()
-	 */
-
-	case PMC_FN_PROCESS_EXEC:
-	{
-		int *credentials_changed;
-		unsigned int ri;
-		struct pmc *pm;
-		struct proc *p;
-		struct pmc_owner *po;
-		struct pmc_process *pp;
-
-		sx_assert(&pmc_sx, SX_XLOCKED);
-
-		/*
-		 * PMCs are not inherited across an exec():  remove any
-		 * PMCs that this process is the owner of.
-		 */
-
-		p = td->td_proc;
-
-		if ((po = pmc_find_owner_descriptor(p)) != NULL) {
-			pmc_remove_owner(po);
-			FREE(po, M_PMC);
-		}
-
-		/*
-		 * If this process is the target of a PMC, check if the new
-		 * credentials are compatible with the owner's permissions.
-		 */
-
-		if ((pp = pmc_find_process_descriptor(p, 0)) == NULL)
-			break;
-
-		credentials_changed = arg;
-
-		PMCDBG(PRC,EXC,1, "exec proc=%p (%d, %s) cred-changed=%d",
-		    p, p->p_pid, p->p_comm, *credentials_changed);
-
-		if (*credentials_changed == 0) /* credentials didn't change */
-			break;
-
-		/*
-		 * If the newly exec()'ed process has a different credential
-		 * than before, allow it to be the target of a PMC only if
-		 * the PMC's owner has sufficient priviledge.
-		 */
-
-		for (ri = 0; ri < md->pmd_npmc; ri++)
-			if ((pm = pp->pp_pmcs[ri].pp_pmc) != NULL)
-				if (pmc_can_attach(pm, td->td_proc) != 0)
-					pmc_detach_one_process(td->td_proc,
-					    pm, PMC_FLAG_NONE);
-
-		KASSERT(pp->pp_refcnt >= 0 && pp->pp_refcnt < (int) md->pmd_npmc,
-		    ("[pmc,%d] Illegal ref count %d on pp %p", __LINE__,
-			pp->pp_refcnt, pp));
-
-		/*
-		 * If this process is no longer the target of any
-		 * PMCs, we can remove the process entry and free
-		 * up space.
-		 */
-
-		if (pp->pp_refcnt == 0) {
-			pmc_remove_process_descriptor(pp);
-			FREE(pp, M_PMC);
-		}
-	}
-	break;
-
-	/*
-	 * Process fork()
-	 */
-
-	case PMC_FN_PROCESS_FORK:
-	{
-		unsigned int ri;
-		uint32_t do_descendants;
-		struct pmc *pm;
-		struct pmc_process *ppnew, *ppold;
-		struct proc *newproc;
-
-		sx_assert(&pmc_sx, SX_XLOCKED);
-
-		newproc = (struct proc *) arg;
-
-		PMCDBG(PMC,FRK,2, "process-fork p1=%p p2=%p",
-		    curthread->td_proc, newproc);
-		/*
-		 * If the parent process (curthread->td_proc) is a
-		 * target of any PMCs, look for PMCs that are to be
-		 * inherited, and link these into the new process
-		 * descriptor.
-		 */
-
-		if ((ppold = pmc_find_process_descriptor(
-		    curthread->td_proc, PMC_FLAG_NONE)) == NULL)
-			break;
-
-		do_descendants = 0;
-		for (ri = 0; ri < md->pmd_npmc; ri++)
-			if ((pm = ppold->pp_pmcs[ri].pp_pmc) != NULL)
-				do_descendants |=
-				    pm->pm_flags & PMC_F_DESCENDANTS;
-		if (do_descendants == 0) /* nothing to do */
-			break;
-
-		if ((ppnew = pmc_find_process_descriptor(newproc,
-		    PMC_FLAG_ALLOCATE)) == NULL)
-			return ENOMEM;
-
-		/*
-		 * Run through all PMCs targeting the old process and
-		 * attach them to the new process.
-		 */
-
-		for (ri = 0; ri < md->pmd_npmc; ri++)
-			if ((pm = ppold->pp_pmcs[ri].pp_pmc) != NULL &&
-			    pm->pm_flags & PMC_F_DESCENDANTS)
-				pmc_link_target_process(pm, ppnew);
-
-		/*
-		 * Now mark the new process as being tracked by this
-		 * driver.
-		 */
-
-		PROC_LOCK(newproc);
-		newproc->p_flag |= P_HWPMC;
-		PROC_UNLOCK(newproc);
-
-	}
-	break;
-
-	/*
-	 * Thread context switch IN
-	 */
-
-	case PMC_FN_CSW_IN:
-	{
-		int cpu;
-		unsigned int ri;
-		struct pmc *pm;
-		struct proc *p;
-		struct pmc_cpu *pc;
-		struct pmc_hw *phw;
-		struct pmc_process *pp;
-		pmc_value_t newvalue;
-
-		p = td->td_proc;
-
-		if ((pp = pmc_find_process_descriptor(p, PMC_FLAG_NONE)) == NULL)
-			break;
-
-		KASSERT(pp->pp_proc == td->td_proc,
-		    ("[pmc,%d] not my thread state", __LINE__));
-
-		critical_enter(); /* no preemption on this CPU */
-
-		cpu = PCPU_GET(cpuid); /* td->td_oncpu is invalid */
-
-		PMCDBG(CTX,SWI,1, "cpu=%d proc=%p (%d, %s) pp=%p", cpu, p,
-		    p->p_pid, p->p_comm, pp);
-
-		KASSERT(cpu >= 0 && cpu < mp_ncpus,
-		    ("[pmc,%d] wierd CPU id %d", __LINE__, cpu));
-
-		pc = pmc_pcpu[cpu];
-
-		for (ri = 0; ri < md->pmd_npmc; ri++) {
-
-			if ((pm = pp->pp_pmcs[ri].pp_pmc) == NULL)
-				continue;
-
-			KASSERT(PMC_IS_VIRTUAL_MODE(pm->pm_mode),
-			    ("[pmc,%d] Target PMC in non-virtual mode (%d)",
-				__LINE__, pm->pm_mode));
-
-			KASSERT(pm->pm_rowindex == ri,
-			    ("[pmc,%d] Row index mismatch pmc %d != ri %d",
-				__LINE__, pm->pm_rowindex, ri));
-
-			/*
-			 * Only PMCs that are marked as 'RUNNING' need
-			 * be placed on hardware.
-			 */
-
-			if (pm->pm_state != PMC_STATE_RUNNING)
-				continue;
-
-			/* increment PMC runcount */
-			atomic_add_rel_32(&pm->pm_runcount, 1);
-
-			/* configure the HWPMC we are going to use. */
-			md->pmd_config_pmc(cpu, ri, pm);
-
-			phw = pc->pc_hwpmcs[ri];
-
-			KASSERT(phw != NULL,
-			    ("[pmc,%d] null hw pointer", __LINE__));
-
-			KASSERT(phw->phw_pmc == pm,
-			    ("[pmc,%d] hw->pmc %p != pmc %p", __LINE__,
-				phw->phw_pmc, pm));
-
-			/* write out saved value and start the PMC */
-			mtx_pool_lock_spin(pmc_mtxpool, pm);
-			newvalue = PMC_PCPU_SAVED(cpu, ri) =
-			    pm->pm_gv.pm_savedvalue;
-			mtx_pool_unlock_spin(pmc_mtxpool, pm);
-
-			md->pmd_write_pmc(cpu, ri, newvalue);
-			md->pmd_start_pmc(cpu, ri);
-
-		}
-
-		/*
-		 * perform any other architecture/cpu dependent thread
-		 * switch-in actions.
-		 */
-
-		(void) (*md->pmd_switch_in)(pc);
-
-		critical_exit();
-
-	}
-	break;
-
-	/*
-	 * Thread context switch OUT.
-	 */
-
-	case PMC_FN_CSW_OUT:
-	{
-		int cpu;
-		unsigned int ri;
-		struct pmc *pm;
-		struct proc *p;
-		struct pmc_cpu *pc;
-		struct pmc_hw *phw;
-		struct pmc_process *pp;
-		pmc_value_t newvalue, tmp;
-
-		/*
-		 * Locate our process descriptor; this may be NULL if
-		 * this process is exiting and we have already removed
-		 * the process from the target process table.
-		 *
-		 * Note that due to kernel preemption, multiple
-		 * context switches may happen while the process is
-		 * exiting.
-		 *
-		 * Note also that if the target process cannot be
-		 * found we still need to deconfigure any PMCs that
-		 * are currently running on hardware.
-		 */
-
-		p = td->td_proc;
-		pp = pmc_find_process_descriptor(p, PMC_FLAG_NONE);
-
-		/*
-		 * save PMCs
-		 */
-
-		critical_enter();
-
-		cpu = PCPU_GET(cpuid); /* td->td_oncpu is invalid */
-
-		PMCDBG(CTX,SWO,1, "cpu=%d proc=%p (%d, %s) pp=%p", cpu, p,
-		    p->p_pid, p->p_comm, pp);
-
-		KASSERT(cpu >= 0 && cpu < mp_ncpus,
-		    ("[pmc,%d wierd CPU id %d", __LINE__, cpu));
-
-		pc = pmc_pcpu[cpu];
-
-		/*
-		 * When a PMC gets unlinked from a target PMC, it will
-		 * be removed from the target's pp_pmc[] array.
-		 *
-		 * However, on a MP system, the target could have been
-		 * executing on another CPU at the time of the unlink.
-		 * So, at context switch OUT time, we need to look at
-		 * the hardware to determine if a PMC is scheduled on
-		 * it.
-		 */
-
-		for (ri = 0; ri < md->pmd_npmc; ri++) {
-
-			phw = pc->pc_hwpmcs[ri];
-			pm  = phw->phw_pmc;
-
-			if (pm == NULL)	/* nothing at this row index */
-				continue;
-
-			if (!PMC_IS_VIRTUAL_MODE(pm->pm_mode))
-				continue; /* not a process virtual PMC */
-
-			KASSERT(pm->pm_rowindex == ri,
-			    ("[pmc,%d] ri mismatch pmc(%d) ri(%d)",
-				__LINE__, pm->pm_rowindex, ri));
-
-			/* Stop hardware */
-			md->pmd_stop_pmc(cpu, ri);
-
-			/* reduce this PMC's runcount */
-			atomic_subtract_rel_32(&pm->pm_runcount, 1);
-
-			/*
-			 * If this PMC is associated with this process,
-			 * save the reading.
-			 */
-
-			if (pp != NULL && pp->pp_pmcs[ri].pp_pmc != NULL) {
-
-				KASSERT(pm == pp->pp_pmcs[ri].pp_pmc,
-				    ("[pmc,%d] pm %p != pp_pmcs[%d] %p",
-					__LINE__, pm, ri,
-					pp->pp_pmcs[ri].pp_pmc));
-
-				KASSERT(pp->pp_refcnt > 0,
-				    ("[pmc,%d] pp refcnt = %d", __LINE__,
-					pp->pp_refcnt));
-
-				md->pmd_read_pmc(cpu, ri, &newvalue);
-
-				tmp = newvalue - PMC_PCPU_SAVED(cpu,ri);
-
-				KASSERT((int64_t) tmp >= 0,
-				    ("[pmc,%d] negative increment cpu=%d "
-					"ri=%d newvalue=%jx saved=%jx "
-					"incr=%jx", __LINE__, cpu, ri,
-					newvalue, PMC_PCPU_SAVED(cpu,ri),
-					tmp));
-
-				/*
-				 * Increment the PMC's count and this
-				 * target process's count by the difference
-				 * between the current reading and the
-				 * saved value at context switch in time.
-				 */
-
-				mtx_pool_lock_spin(pmc_mtxpool, pm);
-
-				pm->pm_gv.pm_savedvalue += tmp;
-				pp->pp_pmcs[ri].pp_pmcval += tmp;
-
-				mtx_pool_unlock_spin(pmc_mtxpool, pm);
-
-			}
-
-			/* mark hardware as free */
-			md->pmd_config_pmc(cpu, ri, NULL);
-		}
-
-		/*
-		 * perform any other architecture/cpu dependent thread
-		 * switch out functions.
-		 */
-
-		(void) (*md->pmd_switch_out)(pc);
-
-		critical_exit();
-
-	}
-	break;
-
-	default:
-#if DEBUG
-		KASSERT(0, ("[pmc,%d] unknown hook %d\n", __LINE__, function));
-#endif
-		break;
-
-	}
-
-	return 0;
-}
-
-/*
- * allocate a 'struct pmc_owner' descriptor in the owner hash table.
- */
-
-static struct pmc_owner *
-pmc_allocate_owner_descriptor(struct proc *p)
-{
-	uint32_t hindex;
-	struct pmc_owner *po;
-	struct pmc_ownerhash *poh;
-
-	hindex = PMC_HASH_PTR(p, pmc_ownerhashmask);
-	poh = &pmc_ownerhash[hindex];
-
-	/* allocate space for N pointers and one descriptor struct */
-	MALLOC(po, struct pmc_owner *, sizeof(struct pmc_owner),
-	    M_PMC, M_WAITOK);
-
-	po->po_flags = 0;
-	po->po_owner = p;
-	LIST_INIT(&po->po_pmcs);
-	LIST_INSERT_HEAD(poh, po, po_next); /* insert into hash table */
-
-	PMCDBG(OWN,ALL,1, "allocate-owner proc=%p (%d, %s) pmc-owner=%p",
-	    p, p->p_pid, p->p_comm, po);
-
-	return po;
-}
-
-/*
- * find the descriptor corresponding to process 'p', adding or removing it
- * as specified by 'mode'.
- */
-
-static struct pmc_process *
-pmc_find_process_descriptor(struct proc *p, uint32_t mode)
-{
-	uint32_t hindex;
-	struct pmc_process *pp, *ppnew;
-	struct pmc_processhash *pph;
-
-	hindex = PMC_HASH_PTR(p, pmc_processhashmask);
-	pph = &pmc_processhash[hindex];
-
-	ppnew = NULL;
-
-	/*
-	 * Pre-allocate memory in the FIND_ALLOCATE case since we
-	 * cannot call malloc(9) once we hold a spin lock.
-	 */
-
-	if (mode & PMC_FLAG_ALLOCATE) {
-		/* allocate additional space for 'n' pmc pointers */
-		MALLOC(ppnew, struct pmc_process *,
-		    sizeof(struct pmc_process) + md->pmd_npmc *
-		    sizeof(struct pmc_targetstate), M_PMC, M_ZERO|M_WAITOK);
-	}
-
-	mtx_lock_spin(&pmc_processhash_mtx);
-	LIST_FOREACH(pp, pph, pp_next)
-	    if (pp->pp_proc == p)
-		    break;
-
-	if ((mode & PMC_FLAG_REMOVE) && pp != NULL)
-		LIST_REMOVE(pp, pp_next);
-
-	if ((mode & PMC_FLAG_ALLOCATE) && pp == NULL &&
-	    ppnew != NULL) {
-		ppnew->pp_proc = p;
-		LIST_INSERT_HEAD(pph, ppnew, pp_next);
-		pp = ppnew;
-		ppnew = NULL;
-	}
-	mtx_unlock_spin(&pmc_processhash_mtx);
-
-	if (pp != NULL && ppnew != NULL)
-		FREE(ppnew, M_PMC);
-
-	return pp;
-}
-
-/*
- * remove a process descriptor from the process hash table.
- */
-
-static void
-pmc_remove_process_descriptor(struct pmc_process *pp)
-{
-	KASSERT(pp->pp_refcnt == 0,
-	    ("[pmc,%d] Removing process descriptor %p with count %d",
-		__LINE__, pp, pp->pp_refcnt));
-
-	mtx_lock_spin(&pmc_processhash_mtx);
-	LIST_REMOVE(pp, pp_next);
-	mtx_unlock_spin(&pmc_processhash_mtx);
-}
-
-
-/*
- * find an owner descriptor corresponding to proc 'p'
- */
-
-static struct pmc_owner *
-pmc_find_owner_descriptor(struct proc *p)
-{
-	uint32_t hindex;
-	struct pmc_owner *po;
-	struct pmc_ownerhash *poh;
-
-	hindex = PMC_HASH_PTR(p, pmc_ownerhashmask);
-	poh = &pmc_ownerhash[hindex];
-
-	po = NULL;
-	LIST_FOREACH(po, poh, po_next)
-	    if (po->po_owner == p)
-		    break;
-
-	PMCDBG(OWN,FND,1, "find-owner proc=%p (%d, %s) hindex=0x%x -> "
-	    "pmc-owner=%p", p, p->p_pid, p->p_comm, hindex, po);
-
-	return po;
-}
-
-/*
- * pmc_allocate_pmc_descriptor
- *
- * Allocate a pmc descriptor and initialize its
- * fields.
- */
-
-static struct pmc *
-pmc_allocate_pmc_descriptor(void)
-{
-	struct pmc *pmc;
-
-	MALLOC(pmc, struct pmc *, sizeof(struct pmc), M_PMC, M_ZERO|M_WAITOK);
-
-	if (pmc != NULL) {
-		pmc->pm_owner = NULL;
-		LIST_INIT(&pmc->pm_targets);
-	}
-
-	PMCDBG(PMC,ALL,1, "allocate-pmc -> pmc=%p", pmc);
-
-	return pmc;
-}
-
-/*
- * Destroy a pmc descriptor.
- */
-
-static void
-pmc_destroy_pmc_descriptor(struct pmc *pm)
-{
-	(void) pm;
-
-#if	DEBUG
-	KASSERT(pm->pm_state == PMC_STATE_DELETED ||
-	    pm->pm_state == PMC_STATE_FREE,
-	    ("[pmc,%d] destroying non-deleted PMC", __LINE__));
-	KASSERT(LIST_EMPTY(&pm->pm_targets),
-	    ("[pmc,%d] destroying pmc with targets", __LINE__));
-	KASSERT(pm->pm_owner == NULL,
-	    ("[pmc,%d] destroying pmc attached to an owner", __LINE__));
-	KASSERT(pm->pm_runcount == 0,
-	    ("[pmc,%d] pmc has non-zero run count %d", __LINE__,
-		pm->pm_runcount));
-#endif
-}
-
-/*
- * This function does the following things:
- *
- *  - detaches the PMC from hardware
- *  - unlinks all target threads that were attached to it
- *  - removes the PMC from its owner's list
- *  - destroy's the PMC private mutex
- *
- * Once this function completes, the given pmc pointer can be safely
- * FREE'd by the caller.
- */
-
-static void
-pmc_release_pmc_descriptor(struct pmc *pm)
-{
-#if	DEBUG
-	volatile int maxloop;
-#endif
-	u_int ri, cpu;
-	u_char curpri;
-	struct pmc_hw *phw;
-	struct pmc_process *pp;
-	struct pmc_target *ptgt, *tmp;
-	struct pmc_binding pb;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	KASSERT(pm, ("[pmc,%d] null pmc", __LINE__));
-
-	ri = pm->pm_rowindex;
-
-	PMCDBG(PMC,REL,1, "release-pmc pmc=%p ri=%d mode=%d", pm, ri,
-	    pm->pm_mode);
-
-	/*
-	 * First, we take the PMC off hardware.
-	 */
-	cpu = 0;
-	if (PMC_IS_SYSTEM_MODE(pm->pm_mode)) {
-
-		/*
-		 * A system mode PMC runs on a specific CPU.  Switch
-		 * to this CPU and turn hardware off.
-		 */
-
-		pmc_save_cpu_binding(&pb);
-
-		cpu = pm->pm_gv.pm_cpu;
-
-		if (pm->pm_state == PMC_STATE_RUNNING) {
-
-			pmc_select_cpu(cpu);
-
-			phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-
-			KASSERT(phw->phw_pmc == pm,
-			    ("[pmc, %d] pmc ptr ri(%d) hw(%p) pm(%p)",
-				__LINE__, ri, phw->phw_pmc, pm));
-
-			PMCDBG(PMC,REL,2, "stopping cpu=%d ri=%d", cpu, ri);
-
-			critical_enter();
-			md->pmd_stop_pmc(cpu, ri);
-			critical_exit();
-		}
-
-		PMCDBG(PMC,REL,2, "decfg cpu=%d ri=%d", cpu, ri);
-
-		critical_enter();
-		md->pmd_config_pmc(cpu, ri, NULL);
-		critical_exit();
-
-		pm->pm_state = PMC_STATE_DELETED;
-
-		pmc_restore_cpu_binding(&pb);
-
-	} else if (PMC_IS_VIRTUAL_MODE(pm->pm_mode)) {
-
-		/*
-		 * A virtual PMC could be running on multiple CPUs at
-		 * a given instant.
-		 *
-		 * By marking its state as DELETED, we ensure that
-		 * this PMC is never further scheduled on hardware.
-		 *
-		 * Then we wait till all CPUs are done with this PMC.
-		 */
-
-		pm->pm_state = PMC_STATE_DELETED;
-
-
-		/*
-		 * Wait for the PMCs runcount to come to zero.
-		 */
-
-#if	DEBUG
-		maxloop = 100 * mp_ncpus;
-#endif
-
-		while (atomic_load_acq_32(&pm->pm_runcount) > 0) {
-
-#if	DEBUG
-			maxloop--;
-			KASSERT(maxloop > 0,
-			    ("[pmc,%d] (ri%d, rc%d) waiting too long for "
-				"pmc to be free", __LINE__, pm->pm_rowindex,
-				pm->pm_runcount));
-#endif
-
-			mtx_lock_spin(&sched_lock);
-			curpri = curthread->td_priority;
-			mtx_unlock_spin(&sched_lock);
-
-			(void) tsleep((void *) pmc_release_pmc_descriptor,
-			    curpri, "pmcrel", 1);
-
-		}
-
-		/*
-		 * At this point the PMC is off all CPUs and cannot be
-		 * freshly scheduled onto a CPU.  It is now safe to
-		 * unlink all targets from this PMC.  If a
-		 * process-record's refcount falls to zero, we remove
-		 * it from the hash table.  The module-wide SX lock
-		 * protects us from races.
-		 */
-
-		LIST_FOREACH_SAFE(ptgt, &pm->pm_targets, pt_next, tmp) {
-			pp = ptgt->pt_process;
-			pmc_unlink_target_process(pm, pp); /* frees 'ptgt' */
-
-			PMCDBG(PMC,REL,3, "pp->refcnt=%d", pp->pp_refcnt);
-
-			/*
-			 * If the target process record shows that no
-			 * PMCs are attached to it, reclaim its space.
-			 */
-
-			if (pp->pp_refcnt == 0) {
-				pmc_remove_process_descriptor(pp);
-				FREE(pp, M_PMC);
-			}
-		}
-
-		cpu = curthread->td_oncpu; /* setup cpu for pmd_release() */
-
-	}
-
-	/*
-	 * Release any MD resources
-	 */
-
-	(void) md->pmd_release_pmc(cpu, ri, pm);
-
-	/*
-	 * Update row disposition
-	 */
-
-	if (PMC_IS_SYSTEM_MODE(pm->pm_mode))
-		PMC_UNMARK_ROW_STANDALONE(ri);
-	else
-		PMC_UNMARK_ROW_THREAD(ri);
-
-	/* unlink from the owner's list */
-	if (pm->pm_owner)
-		pmc_unlink_owner(pm);
-
-	pmc_destroy_pmc_descriptor(pm);
-}
-
-/*
- * Register an owner and a pmc.
- */
-
-static int
-pmc_register_owner(struct proc *p, struct pmc *pmc)
-{
-	struct pmc_list	*pl;
-	struct pmc_owner *po;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	MALLOC(pl, struct pmc_list *, sizeof(struct pmc_list), M_PMC,
-	    M_WAITOK);
-
-	if (pl == NULL)
-		return ENOMEM;
-
-	if ((po = pmc_find_owner_descriptor(p)) == NULL) {
-		if ((po = pmc_allocate_owner_descriptor(p)) == NULL) {
-			FREE(pl, M_PMC);
-			return ENOMEM;
-		}
-		po->po_flags |= PMC_FLAG_IS_OWNER; /* real owner */
-	}
-
-	if (pmc->pm_mode == PMC_MODE_TS) {
-		/* can have only one TS mode PMC per process */
-		if (po->po_flags & PMC_FLAG_HAS_TS_PMC) {
-			FREE(pl, M_PMC);
-			return EINVAL;
-		}
-		po->po_flags |= PMC_FLAG_HAS_TS_PMC;
-	}
-
-	KASSERT(pmc->pm_owner == NULL,
-	    ("[pmc,%d] attempting to own an initialized PMC", __LINE__));
-	pmc->pm_owner  = po;
-
-	pl->pl_pmc = pmc;
-
-	LIST_INSERT_HEAD(&po->po_pmcs, pl, pl_next);
-
-	PROC_LOCK(p);
-	p->p_flag |= P_HWPMC;
-	PROC_UNLOCK(p);
-
-	PMCDBG(PMC,REG,1, "register-owner pmc-owner=%p pl=%p pmc=%p",
-	    po, pl, pmc);
-
-	return 0;
-}
-
-/*
- * Return the current row disposition:
- * == 0 => FREE
- *  > 0 => PROCESS MODE
- *  < 0 => SYSTEM MODE
- */
-
-int
-pmc_getrowdisp(int ri)
-{
-	return pmc_pmcdisp[ri];
-}
-
-/*
- * Check if a PMC at row index 'ri' can be allocated to the current
- * process.
- *
- * Allocation can fail if:
- *   - the current process is already being profiled by a PMC at index 'ri',
- *     attached to it via OP_PMCATTACH.
- *   - the current process has already allocated a PMC at index 'ri'
- *     via OP_ALLOCATE.
- */
-
-static int
-pmc_can_allocate_rowindex(struct proc *p, unsigned int ri)
-{
-	struct pmc_list *pl;
-	struct pmc_owner *po;
-	struct pmc_process *pp;
-
-	PMCDBG(PMC,ALR,1, "can-allocate-rowindex proc=%p (%d, %s) ri=%d",
-	    p, p->p_pid, p->p_comm, ri);
-
-	/* we shouldn't have allocated a PMC at row index 'ri' */
-	if ((po = pmc_find_owner_descriptor(p)) != NULL)
-		LIST_FOREACH(pl, &po->po_pmcs, pl_next)
-		    if (pl->pl_pmc->pm_rowindex == ri)
-			    return EEXIST;
-
-	/* we shouldn't be the target of any PMC ourselves at this index */
-	if ((pp = pmc_find_process_descriptor(p, 0)) != NULL)
-		if (pp->pp_pmcs[ri].pp_pmc)
-			return EEXIST;
-
-	PMCDBG(PMC,ALR,2, "can-allocate-rowindex proc=%p (%d, %s) ri=%d ok",
-	    p, p->p_pid, p->p_comm, ri);
-
-	return 0;
-}
-
-/*
- * Check if a given PMC at row index 'ri' can be currently used in
- * mode 'mode'.
- */
-
-static int
-pmc_can_allocate_row(int ri, enum pmc_mode mode)
-{
-	enum pmc_disp	disp;
-
-	sx_assert(&pmc_sx, SX_XLOCKED);
-
-	PMCDBG(PMC,ALR,1, "can-allocate-row ri=%d mode=%d", ri, mode);
-
-	if (PMC_IS_SYSTEM_MODE(mode))
-		disp = PMC_DISP_STANDALONE;
-	else
-		disp = PMC_DISP_THREAD;
-
-	/*
-	 * check disposition for PMC row 'ri':
-	 *
-	 * Expected disposition		Row-disposition		Result
-	 *
-	 * STANDALONE			STANDALONE or FREE	proceed
-	 * STANDALONE			THREAD			fail
-	 * THREAD			THREAD or FREE		proceed
-	 * THREAD			STANDALONE		fail
-	 */
-
-	if (!PMC_ROW_DISP_IS_FREE(ri) &&
-	    !(disp == PMC_DISP_THREAD && PMC_ROW_DISP_IS_THREAD(ri)) &&
-	    !(disp == PMC_DISP_STANDALONE && PMC_ROW_DISP_IS_STANDALONE(ri)))
-		return EBUSY;
-
-	/*
-	 * All OK
-	 */
-
-	PMCDBG(PMC,ALR,2, "can-allocate-row ri=%d mode=%d ok", ri, mode);
-
-	return 0;
-
-}
-
-/*
- * Find a PMC descriptor with user handle 'pmc' for thread 'td'.
- */
-
-static struct pmc *
-pmc_find_pmc_descriptor_in_process(struct pmc_owner *po, pmc_id_t pmcid)
-{
-	struct pmc_list	*pl;
-
-	KASSERT(pmcid < md->pmd_npmc,
-	    ("[pmc,%d] Illegal pmc index %d (max %d)", __LINE__, pmcid,
-		md->pmd_npmc));
-
-	LIST_FOREACH(pl, &po->po_pmcs, pl_next)
-	    if (pl->pl_pmc->pm_rowindex == pmcid)
-		    return pl->pl_pmc;
-
-	return NULL;
-}
-
-static int
-pmc_find_pmc(pmc_id_t pmcid, struct pmc **pmc)
-{
-
-	struct pmc *pm;
-	struct pmc_owner *po;
-
-	PMCDBG(PMC,FND,1, "find-pmc id=%d", pmcid);
-
-	if ((po = pmc_find_owner_descriptor(curthread->td_proc)) == NULL)
-		return ESRCH;
-
-	if ((pm = pmc_find_pmc_descriptor_in_process(po, pmcid)) == NULL)
-		return EINVAL;
-
-	PMCDBG(PMC,FND,2, "find-pmc id=%d -> pmc=%p", pmcid, pm);
-
-	*pmc = pm;
-	return 0;
-}
-
-/*
- * Start a PMC.
- */
-
-static int
-pmc_start(struct pmc *pm)
-{
-	int error, cpu, ri;
-	struct pmc_binding pb;
-
-	KASSERT(pm != NULL,
-	    ("[pmc,%d] null pm", __LINE__));
-
-	PMCDBG(PMC,OPS,1, "start pmc=%p mode=%d ri=%d", pm, pm->pm_mode,
-	    pm->pm_rowindex);
-
-	pm->pm_state = PMC_STATE_RUNNING;
-
-	if (PMC_IS_VIRTUAL_MODE(pm->pm_mode)) {
-
-		/*
-		 * If a PMCATTACH hadn't been done on this
-		 * PMC, attach this PMC to its owner process.
-		 */
-
-		if (LIST_EMPTY(&pm->pm_targets))
-			return pmc_attach_process(pm->pm_owner->po_owner, pm);
-
-
-		/*
-		 * Nothing further to be done; thread context switch code
-		 * will start/stop the PMC as appropriate.
-		 */
-
-		return 0;
-
-	}
-
-	/*
-	 * A system-mode PMC.  Move to the CPU associated with this
-	 * PMC, and start the hardware.
-	 */
-
-	pmc_save_cpu_binding(&pb);
-
-	cpu = pm->pm_gv.pm_cpu;
-
-	if (pmc_cpu_is_disabled(cpu))
-		return ENXIO;
-
-	ri  = pm->pm_rowindex;
-
-	pmc_select_cpu(cpu);
-
-	/*
-	 * global PMCs are configured at allocation time
-	 * so write out the initial value and start the PMC.
-	 */
-
-	if ((error = md->pmd_write_pmc(cpu, ri,
-		 PMC_IS_SAMPLING_MODE(pm->pm_mode) ?
-		 pm->pm_sc.pm_reloadcount :
-		 pm->pm_sc.pm_initial)) == 0)
-		error = md->pmd_start_pmc(cpu, ri);
-
-	pmc_restore_cpu_binding(&pb);
-
-	return error;
-}
-
-/*
- * Stop a PMC.
- */
-
-static int
-pmc_stop(struct pmc *pm)
-{
-	int error, cpu;
-	struct pmc_binding pb;
-
-	KASSERT(pm != NULL, ("[pmc,%d] null pmc", __LINE__));
-
-	PMCDBG(PMC,OPS,1, "stop pmc=%p mode=%d ri=%d", pm, pm->pm_mode,
-	    pm->pm_rowindex);
-
-	pm->pm_state = PMC_STATE_STOPPED;
-
-	/*
-	 * If the PMC is a virtual mode one, changing the state to
-	 * non-RUNNING is enough to ensure that the PMC never gets
-	 * scheduled.
-	 *
-	 * If this PMC is current running on a CPU, then it will
-	 * handled correctly at the time its target process is context
-	 * switched out.
-	 */
-
-	if (PMC_IS_VIRTUAL_MODE(pm->pm_mode))
-		return 0;
-
-	/*
-	 * A system-mode PMC.  Move to the CPU associated with
-	 * this PMC, and stop the hardware.  We update the
-	 * 'initial count' so that a subsequent PMCSTART will
-	 * resume counting from the current hardware count.
-	 */
-
-	pmc_save_cpu_binding(&pb);
-
-	cpu = pm->pm_gv.pm_cpu;
-
-	if (pmc_cpu_is_disabled(cpu))
-		return ENXIO;
-
-	pmc_select_cpu(cpu);
-
-	if ((error = md->pmd_stop_pmc(cpu, pm->pm_rowindex)) == 0)
-		error = md->pmd_read_pmc(cpu, pm->pm_rowindex,
-		    &pm->pm_sc.pm_initial);
-
-	pmc_restore_cpu_binding(&pb);
-
-	return error;
-}
-
-
-#if	DEBUG
-static const char *pmc_op_to_name[] = {
-#undef	__PMC_OP
-#define	__PMC_OP(N, D)	#N ,
-	__PMC_OPS()
-	NULL
-};
-#endif
-
-/*
- * The syscall interface
- */
-
-#define	PMC_GET_SX_XLOCK(...) do {		\
-	sx_xlock(&pmc_sx);			\
-	if (pmc_hook == NULL) {			\
-		sx_xunlock(&pmc_sx);		\
-		return __VA_ARGS__;		\
-	}					\
-} while (0)
-
-#define	PMC_DOWNGRADE_SX() do {			\
-	sx_downgrade(&pmc_sx);			\
-	is_sx_downgraded = 1;			\
-} while (0)
-
-static int
-pmc_syscall_handler(struct thread *td, void *syscall_args)
-{
-	int error, is_sx_downgraded, op;
-	struct pmc_syscall_args *c;
-	void *arg;
-
-	PMC_GET_SX_XLOCK(ENOSYS);
-
-	is_sx_downgraded = 0;
-
-	c = (struct pmc_syscall_args *) syscall_args;
-
-	op = c->pmop_code;
-	arg = c->pmop_data;
-
-	PMCDBG(MOD,PMS,1, "syscall op=%d \"%s\" arg=%p", op,
-	    pmc_op_to_name[op], arg);
-
-	error = 0;
-	atomic_add_int(&pmc_stats.pm_syscalls, 1);
-
-	switch(op)
-	{
-
-
-	/*
-	 * Configure a log file.
-	 *
-	 * XXX This OP will be reworked.
-	 */
-
-	case PMC_OP_CONFIGURELOG:
-	{
-		struct pmc_owner *po;
-		struct pmc_op_configurelog cl;
-		struct proc *p;
-
-		sx_assert(&pmc_sx, SX_XLOCKED);
-
-		if ((error = copyin(arg, &cl, sizeof(cl))) != 0)
-			break;
-
-		/* mark this process as owning a log file */
-		p = td->td_proc;
-		if ((po = pmc_find_owner_descriptor(p)) == NULL)
-			if ((po = pmc_allocate_owner_descriptor(p)) == NULL)
-				return ENOMEM;
-
-		if ((error = pmc_configure_log(po, cl.pm_logfd)) != 0)
-			break;
-
-	}
-	break;
-
-
-	/*
-	 * Retrieve hardware configuration.
-	 */
-
-	case PMC_OP_GETCPUINFO:	/* CPU information */
-	{
-		struct pmc_op_getcpuinfo gci;
-
-		gci.pm_cputype = md->pmd_cputype;
-		gci.pm_npmc    = md->pmd_npmc;
-		gci.pm_nclass  = md->pmd_nclass;
-		bcopy(md->pmd_classes, &gci.pm_classes,
-		    sizeof(gci.pm_classes));
-		gci.pm_ncpu    = mp_ncpus;
-		error = copyout(&gci, arg, sizeof(gci));
-	}
-	break;
-
-
-	/*
-	 * Get module statistics
-	 */
-
-	case PMC_OP_GETDRIVERSTATS:
-	{
-		struct pmc_op_getdriverstats gms;
-
-		bcopy(&pmc_stats, &gms, sizeof(gms));
-		error = copyout(&gms, arg, sizeof(gms));
-	}
-	break;
-
-
-	/*
-	 * Retrieve module version number
-	 */
-
-	case PMC_OP_GETMODULEVERSION:
-	{
-		error = copyout(&_pmc_version.mv_version, arg, sizeof(int));
-	}
-	break;
-
-
-	/*
-	 * Retrieve the state of all the PMCs on a given
-	 * CPU.
-	 */
-
-	case PMC_OP_GETPMCINFO:
-	{
-		uint32_t cpu, n, npmc;
-		size_t pmcinfo_size;
-		struct pmc *pm;
-		struct pmc_info *p, *pmcinfo;
-		struct pmc_op_getpmcinfo *gpi;
-		struct pmc_owner *po;
-		struct pmc_binding pb;
-
-		PMC_DOWNGRADE_SX();
-
-		gpi = (struct pmc_op_getpmcinfo *) arg;
-
-		if ((error = copyin(&gpi->pm_cpu, &cpu, sizeof(cpu))) != 0)
-			break;
-
-		if (cpu >= (unsigned int) mp_ncpus) {
-			error = EINVAL;
-			break;
-		}
-
-		if (pmc_cpu_is_disabled(cpu)) {
-			error = ENXIO;
-			break;
-		}
-
-		/* switch to CPU 'cpu' */
-		pmc_save_cpu_binding(&pb);
-		pmc_select_cpu(cpu);
-
-		npmc = md->pmd_npmc;
-
-		pmcinfo_size = npmc * sizeof(struct pmc_info);
-		MALLOC(pmcinfo, struct pmc_info *, pmcinfo_size, M_PMC,
-		    M_WAITOK);
-
-		p = pmcinfo;
-
-		for (n = 0; n < md->pmd_npmc; n++, p++) {
-
-			if ((error = md->pmd_describe(cpu, n, p, &pm)) != 0)
-				break;
-
-			if (PMC_ROW_DISP_IS_STANDALONE(n))
-				p->pm_rowdisp = PMC_DISP_STANDALONE;
-			else if (PMC_ROW_DISP_IS_THREAD(n))
-				p->pm_rowdisp = PMC_DISP_THREAD;
-			else
-				p->pm_rowdisp = PMC_DISP_FREE;
-
-			p->pm_ownerpid = -1;
-
-			if (pm == NULL)	/* no PMC associated */
-				continue;
-
-			po = pm->pm_owner;
-
-			KASSERT(po->po_owner != NULL,
-			    ("[pmc,%d] pmc_owner had a null proc pointer",
-				__LINE__));
-
-			p->pm_ownerpid = po->po_owner->p_pid;
-			p->pm_mode     = pm->pm_mode;
-			p->pm_event    = pm->pm_event;
-			p->pm_flags    = pm->pm_flags;
-
-			if (PMC_IS_SAMPLING_MODE(pm->pm_mode))
-				p->pm_reloadcount =
-				    pm->pm_sc.pm_reloadcount;
-		}
-
-		pmc_restore_cpu_binding(&pb);
-
-		/* now copy out the PMC info collected */
-		if (error == 0)
-			error = copyout(pmcinfo, &gpi->pm_pmcs, pmcinfo_size);
-
-		FREE(pmcinfo, M_PMC);
-	}
-	break;
-
-
-	/*
-	 * Set the administrative state of a PMC.  I.e. whether
-	 * the PMC is to be used or not.
-	 */
-
-	case PMC_OP_PMCADMIN:
-	{
-		int cpu, ri;
-		enum pmc_state request;
-		struct pmc_cpu *pc;
-		struct pmc_hw *phw;
-		struct pmc_op_pmcadmin pma;
-		struct pmc_binding pb;
-
-		sx_assert(&pmc_sx, SX_XLOCKED);
-
-		KASSERT(td == curthread,
-		    ("[pmc,%d] td != curthread", __LINE__));
-
-		if (suser(td) || jailed(td->td_ucred)) {
-			error =  EPERM;
-			break;
-		}
-
-		if ((error = copyin(arg, &pma, sizeof(pma))) != 0)
-			break;
-
-		cpu = pma.pm_cpu;
-
-		if (cpu < 0 || cpu >= mp_ncpus) {
-			error = EINVAL;
-			break;
-		}
-
-		if (pmc_cpu_is_disabled(cpu)) {
-			error = ENXIO;
-			break;
-		}
-
-		request = pma.pm_state;
-
-		if (request != PMC_STATE_DISABLED &&
-		    request != PMC_STATE_FREE) {
-			error = EINVAL;
-			break;
-		}
-
-		ri = pma.pm_pmc; /* pmc id == row index */
-		if (ri < 0 || ri >= (int) md->pmd_npmc) {
-			error = EINVAL;
-			break;
-		}
-
-		/*
-		 * We can't disable a PMC with a row-index allocated
-		 * for process virtual PMCs.
-		 */
-
-		if (PMC_ROW_DISP_IS_THREAD(ri) &&
-		    request == PMC_STATE_DISABLED) {
-			error = EBUSY;
-			break;
-		}
-
-		/*
-		 * otherwise, this PMC on this CPU is either free or
-		 * in system-wide mode.
-		 */
-
-		pmc_save_cpu_binding(&pb);
-		pmc_select_cpu(cpu);
-
-		pc  = pmc_pcpu[cpu];
-		phw = pc->pc_hwpmcs[ri];
-
-		/*
-		 * XXX do we need some kind of 'forced' disable?
-		 */
-
-		if (phw->phw_pmc == NULL) {
-			if (request == PMC_STATE_DISABLED &&
-			    (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED)) {
-				phw->phw_state &= ~PMC_PHW_FLAG_IS_ENABLED;
-				PMC_MARK_ROW_STANDALONE(ri);
-			} else if (request == PMC_STATE_FREE &&
-			    (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) == 0) {
-				phw->phw_state |=  PMC_PHW_FLAG_IS_ENABLED;
-				PMC_UNMARK_ROW_STANDALONE(ri);
-			}
-			/* other cases are a no-op */
-		} else
-			error = EBUSY;
-
-		pmc_restore_cpu_binding(&pb);
-	}
-	break;
-
-
-	/*
-	 * Allocate a PMC.
-	 */
-
-	case PMC_OP_PMCALLOCATE:
-	{
-		uint32_t caps;
-		u_int cpu;
-		int n;
-		enum pmc_mode mode;
-		struct pmc *pmc;
-		struct pmc_op_pmcallocate pa;
-		struct pmc_binding pb;
-
-		if ((error = copyin(arg, &pa, sizeof(pa))) != 0)
-			break;
-
-		caps = pa.pm_caps;
-		mode = pa.pm_mode;
-		cpu  = pa.pm_cpu;
-
-		if ((mode != PMC_MODE_SS  &&  mode != PMC_MODE_SC  &&
-		     mode != PMC_MODE_TS  &&  mode != PMC_MODE_TC) ||
-		    (cpu != (u_int) PMC_CPU_ANY && cpu >= (u_int) mp_ncpus)) {
-			error = EINVAL;
-			break;
-		}
-
-		/*
-		 * Virtual PMCs should only ask for a default CPU.
-		 * System mode PMCs need to specify a non-default CPU.
-		 */
-
-		if ((PMC_IS_VIRTUAL_MODE(mode) && cpu != (u_int) PMC_CPU_ANY) ||
-		    (PMC_IS_SYSTEM_MODE(mode) && cpu == (u_int) PMC_CPU_ANY)) {
-			error = EINVAL;
-			break;
-		}
-
-		/*
-		 * Check that a disabled CPU is not being asked for.
-		 */
-
-		if (PMC_IS_SYSTEM_MODE(mode) && pmc_cpu_is_disabled(cpu)) {
-			error = ENXIO;
-			break;
-		}
-
-		/*
-		 * Refuse an allocation for a system-wide PMC if this
-		 * process has been jailed, or if this process lacks
-		 * super-user credentials and the sysctl tunable
-		 * 'security.bsd.unprivileged_syspmcs' is zero.
-		 */
-
-		if (PMC_IS_SYSTEM_MODE(mode)) {
-			if (jailed(curthread->td_ucred))
-				error = EPERM;
-			else if (suser(curthread) &&
-			    (pmc_unprivileged_syspmcs == 0))
-				error = EPERM;
-		}
-
-		if (error)
-			break;
-
-		/*
-		 * Look for valid values for 'pm_flags'
-		 */
-
-		if ((pa.pm_flags & ~(PMC_F_DESCENDANTS|PMC_F_LOG_TC_CSW))
-		    != 0) {
-			error = EINVAL;
-			break;
-		}
-
-		/*
-		 * All sampling mode PMCs need to be able to interrupt the
-		 * CPU.
-		 */
-
-		if (PMC_IS_SAMPLING_MODE(mode)) {
-			caps |= PMC_CAP_INTERRUPT;
-			error = ENOSYS; /* for snapshot 6 */
-			break;
-		}
-
-		PMCDBG(PMC,ALL,2, "event=%d caps=0x%x mode=%d cpu=%d",
-		    pa.pm_ev, caps, mode, cpu);
-
-		pmc = pmc_allocate_pmc_descriptor();
-		pmc->pm_event = pa.pm_ev;
-		pmc->pm_class = pa.pm_class;
-		pmc->pm_state = PMC_STATE_FREE;
-		pmc->pm_mode  = mode;
-		pmc->pm_caps  = caps;
-		pmc->pm_flags = pa.pm_flags;
-
-		/* switch thread to CPU 'cpu' */
-		pmc_save_cpu_binding(&pb);
-
-#define	PMC_IS_SHAREABLE_PMC(cpu, n)				\
-	(pmc_pcpu[(cpu)]->pc_hwpmcs[(n)]->phw_state &		\
-	 PMC_PHW_FLAG_IS_SHAREABLE)
-#define	PMC_IS_UNALLOCATED(cpu, n)				\
-	(pmc_pcpu[(cpu)]->pc_hwpmcs[(n)]->phw_pmc == NULL)
-
-		if (PMC_IS_SYSTEM_MODE(mode)) {
-			pmc_select_cpu(cpu);
-			for (n = 0; n < (int) md->pmd_npmc; n++)
-				if (pmc_can_allocate_row(n, mode) == 0 &&
-				    pmc_can_allocate_rowindex(
-					    curthread->td_proc, n) == 0 &&
-				    (PMC_IS_UNALLOCATED(cpu, n) ||
-				     PMC_IS_SHAREABLE_PMC(cpu, n)) &&
-				    md->pmd_allocate_pmc(cpu, n, pmc,
-					&pa) == 0)
-					break;
-		} else {
-			/* Process virtual mode */
-			for (n = 0; n < (int) md->pmd_npmc; n++) {
-				if (pmc_can_allocate_row(n, mode) == 0 &&
-				    pmc_can_allocate_rowindex(
-					    curthread->td_proc, n) == 0 &&
-				    md->pmd_allocate_pmc(curthread->td_oncpu,
-					n, pmc, &pa) == 0)
-					break;
-			}
-		}
-
-#undef	PMC_IS_UNALLOCATED
-#undef	PMC_IS_SHAREABLE_PMC
-
-		pmc_restore_cpu_binding(&pb);
-
-		if (n == (int) md->pmd_npmc) {
-			pmc_destroy_pmc_descriptor(pmc);
-			FREE(pmc, M_PMC);
-			pmc = NULL;
-			error = EINVAL;
-			break;
-		}
-
-		PMCDBG(PMC,ALL,2, "ev=%d class=%d mode=%d -> n=%d",
-		    pmc->pm_event, pmc->pm_class, pmc->pm_mode, n);
-
-		/*
-		 * Configure global pmc's immediately
-		 */
-
-		if (PMC_IS_SYSTEM_MODE(pmc->pm_mode))
-			if ((error = md->pmd_config_pmc(cpu, n, pmc)) != 0) {
-				(void) md->pmd_release_pmc(cpu, n, pmc);
-				pmc_destroy_pmc_descriptor(pmc);
-				FREE(pmc, M_PMC);
-				pmc = NULL;
-				break;
-			}
-
-		/*
-		 * Mark the row index allocated.
-		 */
-
-		pmc->pm_rowindex = n;
-		pmc->pm_state    = PMC_STATE_ALLOCATED;
-
-		/*
-		 * mark row disposition
-		 */
-
-		if (PMC_IS_SYSTEM_MODE(mode))
-			PMC_MARK_ROW_STANDALONE(n);
-		else
-			PMC_MARK_ROW_THREAD(n);
-
-		/*
-		 * If this is a system-wide CPU, mark the CPU it
-		 * was allocated on.
-		 */
-
-		if (PMC_IS_SYSTEM_MODE(mode))
-			pmc->pm_gv.pm_cpu = cpu;
-
-		/*
-		 * Register this PMC with the current thread as its owner.
-		 */
-
-		if ((error =
-		    pmc_register_owner(curthread->td_proc, pmc)) != 0) {
-			pmc_release_pmc_descriptor(pmc);
-			FREE(pmc, M_PMC);
-			pmc = NULL;
-			break;
-		}
-
-		/*
-		 * Return the allocated index.
-		 */
-
-		pa.pm_pmcid = n;
-
-		error = copyout(&pa, arg, sizeof(pa));
-	}
-	break;
-
-
-	/*
-	 * Attach a PMC to a process.
-	 */
-
-	case PMC_OP_PMCATTACH:
-	{
-		struct pmc *pm;
-		struct proc *p;
-		struct pmc_op_pmcattach a;
-
-		sx_assert(&pmc_sx, SX_XLOCKED);
-
-		if ((error = copyin(arg, &a, sizeof(a))) != 0)
-			break;
-
-		if (a.pm_pid < 0) {
-			error = EINVAL;
-			break;
-		} else if (a.pm_pid == 0)
-			a.pm_pid = td->td_proc->p_pid;
-
-		if ((error = pmc_find_pmc(a.pm_pmc, &pm)) != 0)
-			break;
-
-		if (PMC_IS_SYSTEM_MODE(pm->pm_mode)) {
-			error = EINVAL;
-			break;
-		}
-
-		/* PMCs may be (re)attached only when allocated or stopped */
-		if (pm->pm_state == PMC_STATE_RUNNING) {
-			error = EBUSY;
-			break;
-		} else if (pm->pm_state != PMC_STATE_ALLOCATED &&
-		    pm->pm_state != PMC_STATE_STOPPED) {
-			error = EINVAL;
-			break;
-		}
-
-		/* lookup pid */
-		if ((p = pfind(a.pm_pid)) == NULL) {
-			error = ESRCH;
-			break;
-		}
-
-		/*
-		 * Ignore processes that are working on exiting.
-		 */
-		if (p->p_flag & P_WEXIT) {
-			error = ESRCH;
-			PROC_UNLOCK(p);	/* pfind() returns a locked process */
-			break;
-		}
-
-		/*
-		 * we are allowed to attach a PMC to a process if
-		 * we can debug it.
-		 */
-		error = p_candebug(curthread, p);
-
-		PROC_UNLOCK(p);
-
-		if (error == 0)
-			error = pmc_attach_process(p, pm);
-	}
-	break;
-
-
-	/*
-	 * Detach an attached PMC from a process.
-	 */
-
-	case PMC_OP_PMCDETACH:
-	{
-		struct pmc *pm;
-		struct proc *p;
-		struct pmc_op_pmcattach a;
-
-		if ((error = copyin(arg, &a, sizeof(a))) != 0)
-			break;
-
-		if (a.pm_pid < 0) {
-			error = EINVAL;
-			break;
-		} else if (a.pm_pid == 0)
-			a.pm_pid = td->td_proc->p_pid;
-
-		if ((error = pmc_find_pmc(a.pm_pmc, &pm)) != 0)
-			break;
-
-		if ((p = pfind(a.pm_pid)) == NULL) {
-			error = ESRCH;
-			break;
-		}
-
-		/*
-		 * Treat processes that are in the process of exiting
-		 * as if they were not present.
-		 */
-
-		if (p->p_flag & P_WEXIT)
-			error = ESRCH;
-
-		PROC_UNLOCK(p);	/* pfind() returns a locked process */
-
-		if (error == 0)
-			error = pmc_detach_process(p, pm);
-	}
-	break;
-
-
-	/*
-	 * Release an allocated PMC
-	 */
-
-	case PMC_OP_PMCRELEASE:
-	{
-		pmc_id_t pmcid;
-		struct pmc *pm;
-		struct pmc_owner *po;
-		struct pmc_op_simple sp;
-
-		/*
-		 * Find PMC pointer for the named PMC.
-		 *
-		 * Use pmc_release_pmc_descriptor() to switch off the
-		 * PMC, remove all its target threads, and remove the
-		 * PMC from its owner's list.
-		 *
-		 * Remove the owner record if this is the last PMC
-		 * owned.
-		 *
-		 * Free up space.
-		 */
-
-		if ((error = copyin(arg, &sp, sizeof(sp))) != 0)
-			break;
-
-		pmcid = sp.pm_pmcid;
-
-		if ((error = pmc_find_pmc(pmcid, &pm)) != 0)
-			break;
-
-		po = pm->pm_owner;
-		pmc_release_pmc_descriptor(pm);
-		pmc_maybe_remove_owner(po);
-
-		FREE(pm, M_PMC);
-	}
-	break;
-
-
-	/*
-	 * Read and/or write a PMC.
-	 */
-
-	case PMC_OP_PMCRW:
-	{
-		uint32_t cpu, ri;
-		struct pmc *pm;
-		struct pmc_op_pmcrw *pprw;
-		struct pmc_op_pmcrw prw;
-		struct pmc_binding pb;
-		pmc_value_t oldvalue;
-
-		PMC_DOWNGRADE_SX();
-
-		if ((error = copyin(arg, &prw, sizeof(prw))) != 0)
-			break;
-
-		ri = 0;
-		PMCDBG(PMC,OPS,1, "rw id=%d flags=0x%x", prw.pm_pmcid,
-		    prw.pm_flags);
-
-		/* must have at least one flag set */
-		if ((prw.pm_flags & (PMC_F_OLDVALUE|PMC_F_NEWVALUE)) == 0) {
-			error = EINVAL;
-			break;
-		}
-
-		/* locate pmc descriptor */
-		if ((error = pmc_find_pmc(prw.pm_pmcid, &pm)) != 0)
-			break;
-
-		/* Can't read a PMC that hasn't been started. */
-		if (pm->pm_state != PMC_STATE_ALLOCATED &&
-		    pm->pm_state != PMC_STATE_STOPPED &&
-		    pm->pm_state != PMC_STATE_RUNNING) {
-			error = EINVAL;
-			break;
-		}
-
-		/* writing a new value is allowed only for 'STOPPED' pmcs */
-		if (pm->pm_state == PMC_STATE_RUNNING &&
-		    (prw.pm_flags & PMC_F_NEWVALUE)) {
-			error = EBUSY;
-			break;
-		}
-
-		if (PMC_IS_VIRTUAL_MODE(pm->pm_mode)) {
-
-			/* read/write the saved value in the PMC record */
-			mtx_pool_lock_spin(pmc_mtxpool, pm);
-			if (prw.pm_flags & PMC_F_OLDVALUE)
-				oldvalue = pm->pm_gv.pm_savedvalue;
-			if (prw.pm_flags & PMC_F_NEWVALUE)
-				pm->pm_gv.pm_savedvalue = prw.pm_value;
-			mtx_pool_unlock_spin(pmc_mtxpool, pm);
-
-		} else { /* System mode PMCs */
-			cpu = pm->pm_gv.pm_cpu;
-			ri  = pm->pm_rowindex;
-
-			if (pmc_cpu_is_disabled(cpu)) {
-				error = ENXIO;
-				break;
-			}
-
-			/* move this thread to CPU 'cpu' */
-			pmc_save_cpu_binding(&pb);
-			pmc_select_cpu(cpu);
-
-			/* save old value */
-			if (prw.pm_flags & PMC_F_OLDVALUE)
-				if ((error = (*md->pmd_read_pmc)(cpu, ri,
-					 &oldvalue)))
-					goto error;
-			/* write out new value */
-			if (prw.pm_flags & PMC_F_NEWVALUE)
-				error = (*md->pmd_write_pmc)(cpu, ri,
-				    prw.pm_value);
-		error:
-			pmc_restore_cpu_binding(&pb);
-			if (error)
-				break;
-		}
-
-		pprw = (struct pmc_op_pmcrw *) arg;
-
-#if	DEBUG
-		if (prw.pm_flags & PMC_F_NEWVALUE)
-			PMCDBG(PMC,OPS,2, "rw id=%d new %jx -> old %jx",
-			    ri, prw.pm_value, oldvalue);
-		else
-			PMCDBG(PMC,OPS,2, "rw id=%d -> old %jx", ri, oldvalue);
-#endif
-
-		/* return old value if requested */
-		if (prw.pm_flags & PMC_F_OLDVALUE)
-			if ((error = copyout(&oldvalue, &pprw->pm_value,
-				 sizeof(prw.pm_value))))
-				break;
-
-		/*
-		 * send a signal (SIGIO) to the owner if it is trying to read
-		 * a PMC with no target processes attached.
-		 */
-
-		if (LIST_EMPTY(&pm->pm_targets) &&
-		    (prw.pm_flags & PMC_F_OLDVALUE)) {
-			PROC_LOCK(curthread->td_proc);
-			psignal(curthread->td_proc, SIGIO);
-			PROC_UNLOCK(curthread->td_proc);
-		}
-	}
-	break;
-
-
-	/*
-	 * Set the sampling rate for a sampling mode PMC and the
-	 * initial count for a counting mode PMC.
-	 */
-
-	case PMC_OP_PMCSETCOUNT:
-	{
-		struct pmc *pm;
-		struct pmc_op_pmcsetcount sc;
-
-		PMC_DOWNGRADE_SX();
-
-		if ((error = copyin(arg, &sc, sizeof(sc))) != 0)
-			break;
-
-		if ((error = pmc_find_pmc(sc.pm_pmcid, &pm)) != 0)
-			break;
-
-		if (pm->pm_state == PMC_STATE_RUNNING) {
-			error = EBUSY;
-			break;
-		}
-
-		if (PMC_IS_SAMPLING_MODE(pm->pm_mode))
-			pm->pm_sc.pm_reloadcount = sc.pm_count;
-		else
-			pm->pm_sc.pm_initial = sc.pm_count;
-	}
-	break;
-
-
-	/*
-	 * Start a PMC.
-	 */
-
-	case PMC_OP_PMCSTART:
-	{
-		pmc_id_t pmcid;
-		struct pmc *pm;
-		struct pmc_op_simple sp;
-
-		sx_assert(&pmc_sx, SX_XLOCKED);
-
-		if ((error = copyin(arg, &sp, sizeof(sp))) != 0)
-			break;
-
-		pmcid = sp.pm_pmcid;
-
-		if ((error = pmc_find_pmc(pmcid, &pm)) != 0)
-			break;
-
-		KASSERT(pmcid == pm->pm_rowindex,
-		    ("[pmc,%d] row index %d != id %d", __LINE__,
-			pm->pm_rowindex, pmcid));
-
-		if (pm->pm_state == PMC_STATE_RUNNING) /* already running */
-			break;
-		else if (pm->pm_state != PMC_STATE_STOPPED &&
-		    pm->pm_state != PMC_STATE_ALLOCATED) {
-			error = EINVAL;
-			break;
-		}
-
-		error = pmc_start(pm);
-	}
-	break;
-
-
-	/*
-	 * Stop a PMC.
-	 */
-
-	case PMC_OP_PMCSTOP:
-	{
-		pmc_id_t pmcid;
-		struct pmc *pm;
-		struct pmc_op_simple sp;
-
-		PMC_DOWNGRADE_SX();
-
-		if ((error = copyin(arg, &sp, sizeof(sp))) != 0)
-			break;
-
-		pmcid = sp.pm_pmcid;
-
-		/*
-		 * Mark the PMC as inactive and invoke the MD stop
-		 * routines if needed.
-		 */
-
-		if ((error = pmc_find_pmc(pmcid, &pm)) != 0)
-			break;
-
-		KASSERT(pmcid == pm->pm_rowindex,
-		    ("[pmc,%d] row index %d != pmcid %d", __LINE__,
-			pm->pm_rowindex, pmcid));
-
-		if (pm->pm_state == PMC_STATE_STOPPED) /* already stopped */
-			break;
-		else if (pm->pm_state != PMC_STATE_RUNNING) {
-			error = EINVAL;
-			break;
-		}
-
-		error = pmc_stop(pm);
-	}
-	break;
-
-
-	/*
-	 * Write a user-entry to the log file.
-	 */
-
-	case PMC_OP_WRITELOG:
-	{
-
-		PMC_DOWNGRADE_SX();
-
-		/*
-		 * flush all per-cpu hash tables
-		 * append user-log entry
-		 */
-
-		error = ENOSYS;
-	}
-	break;
-
-
-#if __i386__ || __amd64__
-
-	/*
-	 * Machine dependent operation for i386-class processors.
-	 *
-	 * Retrieve the MSR number associated with the counter
-	 * 'pmc_id'.  This allows processes to directly use RDPMC
-	 * instructions to read their PMCs, without the overhead of a
-	 * system call.
-	 */
-
-	case PMC_OP_PMCX86GETMSR:
-	{
-		int ri;
-		struct pmc	*pm;
-		struct pmc_op_x86_getmsr gm;
-
-		PMC_DOWNGRADE_SX();
-
-		/* CPU has no 'GETMSR' support */
-		if (md->pmd_get_msr == NULL) {
-			error = ENOSYS;
-			break;
-		}
-
-		if ((error = copyin(arg, &gm, sizeof(gm))) != 0)
-			break;
-
-		if ((error = pmc_find_pmc(gm.pm_pmcid, &pm)) != 0)
-			break;
-
-		/*
-		 * The allocated PMC needs to be a process virtual PMC,
-		 * i.e., of type T[CS].
-		 *
-		 * Global PMCs can only be read using the PMCREAD
-		 * operation since they may be allocated on a
-		 * different CPU than the one we could be running on
-		 * at the time of the read.
-		 */
-
-		if (!PMC_IS_VIRTUAL_MODE(pm->pm_mode)) {
-			error = EINVAL;
-			break;
-		}
-
-		ri = pm->pm_rowindex;
-
-		if ((error = (*md->pmd_get_msr)(ri, &gm.pm_msr)) < 0)
-			break;
-		if ((error = copyout(&gm, arg, sizeof(gm))) < 0)
-			break;
-	}
-	break;
-#endif
-
-	default:
-		error = EINVAL;
-		break;
-	}
-
-	if (is_sx_downgraded)
-		sx_sunlock(&pmc_sx);
-	else
-		sx_xunlock(&pmc_sx);
-
-	if (error)
-		atomic_add_int(&pmc_stats.pm_syscall_errors, 1);
-
-	return error;
-}
-
-/*
- * Helper functions
- */
-
-/*
- * Configure a log file.
- */
-
-static int
-pmc_configure_log(struct pmc_owner *po, int logfd)
-{
-	struct proc *p;
-
-	return ENOSYS; /* for now */
-
-	p = po->po_owner;
-
-	if (po->po_logfd < 0 && logfd < 0) /* nothing to do */
-		return 0;
-
-	if (po->po_logfd >= 0 && logfd < 0) {
-		/* deconfigure log */
-		/* XXX */
-		po->po_flags &= ~PMC_FLAG_OWNS_LOGFILE;
-		pmc_maybe_remove_owner(po);
-
-	} else if (po->po_logfd < 0 && logfd >= 0) {
-		/* configure log file */
-		/* XXX */
-		po->po_flags |= PMC_FLAG_OWNS_LOGFILE;
-
-		/* mark process as using HWPMCs */
-		PROC_LOCK(p);
-		p->p_flag |= P_HWPMC;
-		PROC_UNLOCK(p);
-	} else
-		return EBUSY;
-
-	return 0;
-}
-
-/*
- * Log an exit event to the PMC owner's log file.
- */
-
-static void
-pmc_log_process_exit(struct pmc *pm, struct pmc_process *pp)
-{
-	KASSERT(pm->pm_flags & PMC_F_LOG_TC_PROCEXIT,
-	    ("[pmc,%d] log-process-exit called gratuitously", __LINE__));
-
-	(void) pm;
-	(void) pp;
-
-	return;
-}
-
-/*
- * Event handlers.
- */
-
-/*
- * Handle a process exit.
- *
- * XXX This eventhandler gets called early in the exit process.
- * Consider using a 'hook' invocation from thread_exit() or equivalent
- * spot.  Another negative is that kse_exit doesn't seem to call
- * exit1() [??].
- */
-
-static void
-pmc_process_exit(void *arg __unused, struct proc *p)
-{
-	int is_using_hwpmcs;
-
-	PROC_LOCK(p);
-	is_using_hwpmcs = p->p_flag & P_HWPMC;
-	PROC_UNLOCK(p);
-
-	if (is_using_hwpmcs) {
-		PMCDBG(PRC,EXT,1,"process-exit proc=%p (%d, %s)", p, p->p_pid,
-		    p->p_comm);
-
-		PMC_GET_SX_XLOCK();
-		(void) pmc_hook_handler(curthread, PMC_FN_PROCESS_EXIT,
-		    (void *) p);
-		sx_xunlock(&pmc_sx);
-	}
-}
-
-/*
- * Handle a process fork.
- *
- * If the parent process 'p1' is under HWPMC monitoring, then copy
- * over any attached PMCs that have 'do_descendants' semantics.
- */
-
-static void
-pmc_process_fork(void *arg __unused, struct proc *p1, struct proc *p2,
-    int flags)
-{
-	int is_using_hwpmcs;
-
-	(void) flags;		/* unused parameter */
-
-	PROC_LOCK(p1);
-	is_using_hwpmcs = p1->p_flag & P_HWPMC;
-	PROC_UNLOCK(p1);
-
-	if (is_using_hwpmcs) {
-		PMCDBG(PMC,FRK,1, "process-fork proc=%p (%d, %s)", p1,
-		    p1->p_pid, p1->p_comm);
-		PMC_GET_SX_XLOCK();
-		(void) pmc_hook_handler(curthread, PMC_FN_PROCESS_FORK,
-		    (void *) p2);
-		sx_xunlock(&pmc_sx);
-	}
-}
-
-
-/*
- * initialization
- */
-
-static const char *pmc_name_of_pmcclass[] = {
-#undef	__PMC_CLASS
-#define	__PMC_CLASS(N) #N ,
-	__PMC_CLASSES()
-};
-
-static int
-pmc_initialize(void)
-{
-	int error, cpu, n;
-	struct pmc_binding pb;
-
-	md = NULL;
-	error = 0;
-
-#if	DEBUG
-	/* parse debug flags first */
-	if (TUNABLE_STR_FETCH(PMC_SYSCTL_NAME_PREFIX "debugflags",
-		pmc_debugstr, sizeof(pmc_debugstr)))
-		pmc_debugflags_parse(pmc_debugstr,
-		    pmc_debugstr+strlen(pmc_debugstr));
-#endif
-
-	PMCDBG(MOD,INI,0, "PMC Initialize (version %x)", PMC_VERSION);
-
-	/*
-	 * check sysctl parameters
-	 */
-
-	if (pmc_hashsize <= 0) {
-		(void) printf("pmc: sysctl variable \""
-		    PMC_SYSCTL_NAME_PREFIX "hashsize\" must be greater than "
-		    "zero\n");
-		pmc_hashsize = PMC_HASH_SIZE;
-	}
-
-#if	defined(__i386__)
-	/* determine the CPU kind.  This is i386 specific */
-	if (strcmp(cpu_vendor, "AuthenticAMD") == 0)
-		md = pmc_amd_initialize();
-	else if (strcmp(cpu_vendor, "GenuineIntel") == 0)
-		md = pmc_intel_initialize();
-	/* XXX: what about the other i386 CPU manufacturers? */
-#elif	defined(__amd64__)
-	if (strcmp(cpu_vendor, "AuthenticAMD") == 0)
-		md = pmc_amd_initialize();
-#else  /* other architectures */
-	md = NULL;
-#endif
-
-	if (md == NULL || md->pmd_init == NULL)
-		return ENOSYS;
-
-	/* allocate space for the per-cpu array */
-	MALLOC(pmc_pcpu, struct pmc_cpu **, mp_ncpus * sizeof(struct pmc_cpu *),
-	    M_PMC, M_WAITOK|M_ZERO);
-
-	/* per-cpu 'saved values' for managing process-mode PMCs */
-	MALLOC(pmc_pcpu_saved, pmc_value_t *,
-	    sizeof(pmc_value_t) * mp_ncpus * md->pmd_npmc, M_PMC, M_WAITOK);
-
-	/* perform cpu dependent initialization */
-	pmc_save_cpu_binding(&pb);
-	for (cpu = 0; cpu < mp_ncpus; cpu++) {
-		if (pmc_cpu_is_disabled(cpu))
-			continue;
-		pmc_select_cpu(cpu);
-		if ((error = md->pmd_init(cpu)) != 0)
-			break;
-	}
-	pmc_restore_cpu_binding(&pb);
-
-	if (error != 0)
-		return error;
-
-	/* allocate space for the row disposition array */
-	pmc_pmcdisp = malloc(sizeof(enum pmc_mode) * md->pmd_npmc,
-	    M_PMC, M_WAITOK|M_ZERO);
-
-	KASSERT(pmc_pmcdisp != NULL,
-	    ("[pmc,%d] pmcdisp allocation returned NULL", __LINE__));
-
-	/* mark all PMCs as available */
-	for (n = 0; n < (int) md->pmd_npmc; n++)
-		PMC_MARK_ROW_FREE(n);
-
-	/* allocate thread hash tables */
-	pmc_ownerhash = hashinit(pmc_hashsize, M_PMC,
-	    &pmc_ownerhashmask);
-
-	pmc_processhash = hashinit(pmc_hashsize, M_PMC,
-	    &pmc_processhashmask);
-	mtx_init(&pmc_processhash_mtx, "pmc-process-hash", "pmc", MTX_SPIN);
-
-	/* allocate a pool of spin mutexes */
-	pmc_mtxpool = mtx_pool_create("pmc", pmc_mtxpool_size, MTX_SPIN);
-
-	PMCDBG(MOD,INI,1, "pmc_ownerhash=%p, mask=0x%lx "
-	    "targethash=%p mask=0x%lx", pmc_ownerhash, pmc_ownerhashmask,
-	    pmc_processhash, pmc_processhashmask);
-
-	/* register process {exit,fork,exec} handlers */
-	pmc_exit_tag = EVENTHANDLER_REGISTER(process_exit,
-	    pmc_process_exit, NULL, EVENTHANDLER_PRI_ANY);
-	pmc_fork_tag = EVENTHANDLER_REGISTER(process_fork,
-	    pmc_process_fork, NULL, EVENTHANDLER_PRI_ANY);
-
-	/* set hook functions */
-	pmc_intr = md->pmd_intr;
-	pmc_hook = pmc_hook_handler;
-
-	if (error == 0) {
-		printf(PMC_MODULE_NAME ":");
-		for (n = 0; n < (int) md->pmd_nclass; n++)
-			printf(" %s(%d)",
-			    pmc_name_of_pmcclass[md->pmd_classes[n]],
-			    md->pmd_nclasspmcs[n]);
-		printf("\n");
-	}
-
-	return error;
-}
-
-/* prepare to be unloaded */
-static void
-pmc_cleanup(void)
-{
-	int cpu;
-	struct pmc_ownerhash *ph;
-	struct pmc_owner *po, *tmp;
-	struct pmc_binding pb;
-#if	DEBUG
-	struct pmc_processhash *prh;
-#endif
-
-	PMCDBG(MOD,INI,0, "%s", "cleanup");
-
-	pmc_intr = NULL;	/* no more interrupts please */
-
-	sx_xlock(&pmc_sx);
-	if (pmc_hook == NULL) {	/* being unloaded already */
-		sx_xunlock(&pmc_sx);
-		return;
-	}
-
-	pmc_hook = NULL; /* prevent new threads from entering module */
-
-	/* deregister event handlers */
-	EVENTHANDLER_DEREGISTER(process_fork, pmc_fork_tag);
-	EVENTHANDLER_DEREGISTER(process_exit, pmc_exit_tag);
-
-	/* send SIGBUS to all owner threads, free up allocations */
-	if (pmc_ownerhash)
-		for (ph = pmc_ownerhash;
-		     ph <= &pmc_ownerhash[pmc_ownerhashmask];
-		     ph++) {
-			LIST_FOREACH_SAFE(po, ph, po_next, tmp) {
-				pmc_remove_owner(po);
-
-				/* send SIGBUS to owner processes */
-				PMCDBG(MOD,INI,2, "cleanup signal proc=%p "
-				    "(%d, %s)", po->po_owner,
-				    po->po_owner->p_pid,
-				    po->po_owner->p_comm);
-
-				PROC_LOCK(po->po_owner);
-				psignal(po->po_owner, SIGBUS);
-				PROC_UNLOCK(po->po_owner);
-				FREE(po, M_PMC);
-			}
-		}
-
-	/* reclaim allocated data structures */
-	if (pmc_mtxpool)
-		mtx_pool_destroy(&pmc_mtxpool);
-
-	mtx_destroy(&pmc_processhash_mtx);
-	if (pmc_processhash) {
-#if	DEBUG
-		struct pmc_process *pp;
-
-		PMCDBG(MOD,INI,3, "%s", "destroy process hash");
-		for (prh = pmc_processhash;
-		     prh <= &pmc_processhash[pmc_processhashmask];
-		     prh++)
-			LIST_FOREACH(pp, prh, pp_next)
-			    PMCDBG(MOD,INI,3, "pid=%d", pp->pp_proc->p_pid);
-#endif
-
-		hashdestroy(pmc_processhash, M_PMC, pmc_processhashmask);
-		pmc_processhash = NULL;
-	}
-
-	if (pmc_ownerhash) {
-		PMCDBG(MOD,INI,3, "%s", "destroy owner hash");
-		hashdestroy(pmc_ownerhash, M_PMC, pmc_ownerhashmask);
-		pmc_ownerhash = NULL;
-	}
-
- 	/* do processor dependent cleanup */
-	PMCDBG(MOD,INI,3, "%s", "md cleanup");
-	if (md) {
-		pmc_save_cpu_binding(&pb);
-		for (cpu = 0; cpu < mp_ncpus; cpu++) {
-			PMCDBG(MOD,INI,1,"pmc-cleanup cpu=%d pcs=%p",
-			    cpu, pmc_pcpu[cpu]);
-			if (pmc_cpu_is_disabled(cpu))
-				continue;
-			pmc_select_cpu(cpu);
-			if (pmc_pcpu[cpu])
-				(void) md->pmd_cleanup(cpu);
-		}
-		FREE(md, M_PMC);
-		md = NULL;
-		pmc_restore_cpu_binding(&pb);
-	}
-
-	/* deallocate per-cpu structures */
-	FREE(pmc_pcpu, M_PMC);
-	pmc_pcpu = NULL;
-
-	FREE(pmc_pcpu_saved, M_PMC);
-	pmc_pcpu_saved = NULL;
-
-	if (pmc_pmcdisp) {
-		FREE(pmc_pmcdisp, M_PMC);
-		pmc_pmcdisp = NULL;
-	}
-
-	sx_xunlock(&pmc_sx); 	/* we are done */
-}
-
-/*
- * The function called at load/unload.
- */
-
-static int
-load (struct module *module __unused, int cmd, void *arg __unused)
-{
-	int error;
-
-	error = 0;
-
-	switch (cmd) {
-	case MOD_LOAD :
-		/* initialize the subsystem */
-		error = pmc_initialize();
-		if (error != 0)
-			break;
-		PMCDBG(MOD,INI,1, "syscall=%d ncpus=%d",
-		    pmc_syscall_num, mp_ncpus);
-		break;
-
-
-	case MOD_UNLOAD :
-	case MOD_SHUTDOWN:
-		pmc_cleanup();
-		PMCDBG(MOD,INI,1, "%s", "unloaded");
-		break;
-
-	default :
-		error = EINVAL;	/* XXX should panic(9) */
-		break;
-	}
-
-	return error;
-}
-
-/* memory pool */
-MALLOC_DEFINE(M_PMC, "pmc", "Memory space for the PMC module");
diff --git a/sys/hwpmc/hwpmc_pentium.c b/sys/hwpmc/hwpmc_pentium.c
deleted file mode 100644
index 48e8be3..0000000
--- a/sys/hwpmc/hwpmc_pentium.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2003-2005 Joseph Koshy
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/pmc.h>
-#include <sys/pmckern.h>
-#include <sys/smp.h>
-#include <sys/systm.h>
-
-#include <machine/cputypes.h>
-#include <machine/md_var.h>
-
-/*
- * Intel Pentium PMCs
- */
-
-int
-pmc_initialize_p5(struct pmc_mdep *pmc_mdep)
-{
-	(void) pmc_mdep;
-	return ENOSYS;		/* nothing here yet */
-}
diff --git a/sys/hwpmc/hwpmc_piv.c b/sys/hwpmc/hwpmc_piv.c
deleted file mode 100644
index de2ad70..0000000
--- a/sys/hwpmc/hwpmc_piv.c
+++ /dev/null
@@ -1,1480 +0,0 @@
-/*-
- * Copyright (c) 2003-2005 Joseph Koshy
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/pmc.h>
-#include <sys/pmckern.h>
-#include <sys/smp.h>
-#include <sys/systm.h>
-
-#include <machine/cputypes.h>
-#include <machine/md_var.h>
-
-/*
- * PENTIUM 4 SUPPORT
- *
- * The P4 has 18 PMCs, divided into 4 groups with 4,4,4 and 6 PMCs
- * respectively.  Each PMC comprises of two model specific registers:
- * a counter configuration control register (CCCR) and a counter
- * register that holds the actual event counts.
- *
- * Configuring an event requires the use of one of 45 event selection
- * control registers (ESCR).  Events are associated with specific
- * ESCRs.  Each PMC group has a set of ESCRs it can use.
- *
- * - The BPU counter group (4 PMCs) can use the 16 ESCRs:
- *   BPU_ESCR{0,1}, IS_ESCR{0,1}, MOB_ESCR{0,1}, ITLB_ESCR{0,1},
- *   PMH_ESCR{0,1}, IX_ESCR{0,1}, FSB_ESCR{0,}, BSU_ESCR{0,1}.
- *
- * - The MS counter group (4 PMCs) can use the 6 ESCRs: MS_ESCR{0,1},
- *   TC_ESCR{0,1}, TBPU_ESCR{0,1}.
- *
- * - The FLAME counter group (4 PMCs) can use the 10 ESCRs:
- *   FLAME_ESCR{0,1}, FIRM_ESCR{0,1}, SAAT_ESCR{0,1}, U2L_ESCR{0,1},
- *   DAC_ESCR{0,1}.
- *
- * - The IQ counter group (6 PMCs) can use the 13 ESCRs: IQ_ESCR{0,1},
- *   ALF_ESCR{0,1}, RAT_ESCR{0,1}, SSU_ESCR0, CRU_ESCR{0,1,2,3,4,5}.
- *
- * Even-numbered ESCRs can be used with counters 0, 1 and 4 (if
- * present) of a counter group.  Odd-numbers ESCRs can be used with
- * counters 2, 3 and 5 (if present) of a counter group.  The
- * 'p4_escrs[]' table describes these restrictions in a form that
- * function 'p4_allocate()' uses for making allocation decisions.
- *
- * SYSTEM-MODE AND THREAD-MODE ALLOCATION
- *
- * In addition to remembering the state of PMC rows
- * ('FREE','STANDALONE', or 'THREAD'), we similar need to track the
- * state of ESCR rows.  If an ESCR is allocated to a system-mode PMC
- * on a CPU we cannot allocate this to a thread-mode PMC.  On a
- * multi-cpu (multiple physical CPUs) system, ESCR allocation on each
- * CPU is tracked by the pc_escrs[] array.
- *
- * Each system-mode PMC that is using an ESCR records its row-index in
- * the appropriate entry and system-mode allocation attempts check
- * that an ESCR is available using this array.  Process-mode PMCs do
- * not use the pc_escrs[] array, since ESCR row itself would have been
- * marked as in 'THREAD' mode.
- *
- * HYPERTHREADING SUPPORT
- *
- * When HTT is enabled, the FreeBSD kernel treats the two 'logical'
- * cpus as independent CPUs and can schedule kernel threads on them
- * independently.  However, the two logical CPUs share the same set of
- * PMC resources.  We need to ensure that:
- * - PMCs that use the PMC_F_DESCENDANTS semantics are handled correctly,
- *   and,
- * - Threads of multi-threaded processes that get scheduled on the same
- *   physical CPU are handled correctly.
- *
- * Not all HTT capable systems will have HTT enabled since users may
- * have turned HTT support off using the appropriate sysctls
- * (machdep.hlt_logical_cpus and machdep.logical_cpus_mask).  We
- * detect the presence of HTT by remembering if an initialization was
- * done for a logical CPU.
- *
- */
-
-#define	P4_PMCS()				\
-	P4_PMC(BPU_COUNTER0)			\
-	P4_PMC(BPU_COUNTER1)			\
-	P4_PMC(BPU_COUNTER2)			\
-	P4_PMC(BPU_COUNTER3)			\
-	P4_PMC(MS_COUNTER0)			\
-	P4_PMC(MS_COUNTER1)			\
-	P4_PMC(MS_COUNTER2)			\
-	P4_PMC(MS_COUNTER3)			\
-	P4_PMC(FLAME_COUNTER0)			\
-	P4_PMC(FLAME_COUNTER1)			\
-	P4_PMC(FLAME_COUNTER2)			\
-	P4_PMC(FLAME_COUNTER3)			\
-	P4_PMC(IQ_COUNTER0)			\
-	P4_PMC(IQ_COUNTER1)			\
-	P4_PMC(IQ_COUNTER2)			\
-	P4_PMC(IQ_COUNTER3)			\
-	P4_PMC(IQ_COUNTER4)			\
-	P4_PMC(IQ_COUNTER5)			\
-	P4_PMC(NONE)
-
-enum pmc_p4pmc {
-#undef	P4_PMC
-#define	P4_PMC(N)	P4_PMC_##N ,
-	P4_PMCS()
-};
-
-/*
- * P4 ESCR descriptors
- */
-
-#define	P4_ESCRS()							\
-    P4_ESCR(BSU_ESCR0,	0x3A0, BPU_COUNTER0, BPU_COUNTER1, NONE)	\
-    P4_ESCR(BSU_ESCR1,	0x3A1, BPU_COUNTER2, BPU_COUNTER3, NONE)	\
-    P4_ESCR(FSB_ESCR0,	0x3A2, BPU_COUNTER0, BPU_COUNTER1, NONE)	\
-    P4_ESCR(FSB_ESCR1,	0x3A3, BPU_COUNTER2, BPU_COUNTER3, NONE)	\
-    P4_ESCR(FIRM_ESCR0,	0x3A4, FLAME_COUNTER0, FLAME_COUNTER1, NONE)	\
-    P4_ESCR(FIRM_ESCR1,	0x3A5, FLAME_COUNTER2, FLAME_COUNTER3, NONE)	\
-    P4_ESCR(FLAME_ESCR0, 0x3A6, FLAME_COUNTER0, FLAME_COUNTER1, NONE)	\
-    P4_ESCR(FLAME_ESCR1, 0x3A7, FLAME_COUNTER2, FLAME_COUNTER3, NONE)	\
-    P4_ESCR(DAC_ESCR0,	0x3A8, FLAME_COUNTER0, FLAME_COUNTER1, NONE)	\
-    P4_ESCR(DAC_ESCR1,	0x3A9, FLAME_COUNTER2, FLAME_COUNTER3, NONE)	\
-    P4_ESCR(MOB_ESCR0,	0x3AA, BPU_COUNTER0, BPU_COUNTER1, NONE)	\
-    P4_ESCR(MOB_ESCR1,	0x3AB, BPU_COUNTER2, BPU_COUNTER3, NONE)	\
-    P4_ESCR(PMH_ESCR0,	0x3AC, BPU_COUNTER0, BPU_COUNTER1, NONE)	\
-    P4_ESCR(PMH_ESCR1,	0x3AD, BPU_COUNTER2, BPU_COUNTER3, NONE)	\
-    P4_ESCR(SAAT_ESCR0,	0x3AE, FLAME_COUNTER0, FLAME_COUNTER1, NONE)	\
-    P4_ESCR(SAAT_ESCR1,	0x3AF, FLAME_COUNTER2, FLAME_COUNTER3, NONE)	\
-    P4_ESCR(U2L_ESCR0,	0x3B0, FLAME_COUNTER0, FLAME_COUNTER1, NONE)	\
-    P4_ESCR(U2L_ESCR1,	0x3B1, FLAME_COUNTER2, FLAME_COUNTER3, NONE)	\
-    P4_ESCR(BPU_ESCR0,	0x3B2, BPU_COUNTER0, BPU_COUNTER1, NONE)	\
-    P4_ESCR(BPU_ESCR1,	0x3B3, BPU_COUNTER2, BPU_COUNTER3, NONE)	\
-    P4_ESCR(IS_ESCR0,	0x3B4, BPU_COUNTER0, BPU_COUNTER1, NONE)	\
-    P4_ESCR(IS_ESCR1,	0x3B5, BPU_COUNTER2, BPU_COUNTER3, NONE)	\
-    P4_ESCR(ITLB_ESCR0,	0x3B6, BPU_COUNTER0, BPU_COUNTER1, NONE)	\
-    P4_ESCR(ITLB_ESCR1,	0x3B7, BPU_COUNTER2, BPU_COUNTER3, NONE)	\
-    P4_ESCR(CRU_ESCR0,	0x3B8, IQ_COUNTER0, IQ_COUNTER1, IQ_COUNTER4)	\
-    P4_ESCR(CRU_ESCR1,	0x3B9, IQ_COUNTER2, IQ_COUNTER3, IQ_COUNTER5)	\
-    P4_ESCR(IQ_ESCR0,	0x3BA, IQ_COUNTER0, IQ_COUNTER1, IQ_COUNTER4)	\
-    P4_ESCR(IQ_ESCR1,	0x3BB, IQ_COUNTER1, IQ_COUNTER3, IQ_COUNTER5)	\
-    P4_ESCR(RAT_ESCR0,	0x3BC, IQ_COUNTER0, IQ_COUNTER1, IQ_COUNTER4)	\
-    P4_ESCR(RAT_ESCR1,	0x3BD, IQ_COUNTER2, IQ_COUNTER3, IQ_COUNTER5)	\
-    P4_ESCR(SSU_ESCR0,	0x3BE, IQ_COUNTER0, IQ_COUNTER2, IQ_COUNTER4)	\
-    P4_ESCR(MS_ESCR0,	0x3C0, MS_COUNTER0, MS_COUNTER1, NONE)		\
-    P4_ESCR(MS_ESCR1,	0x3C1, MS_COUNTER2, MS_COUNTER3, NONE)		\
-    P4_ESCR(TBPU_ESCR0,	0x3C2, MS_COUNTER0, MS_COUNTER1, NONE)		\
-    P4_ESCR(TBPU_ESCR1,	0x3C3, MS_COUNTER2, MS_COUNTER3, NONE)		\
-    P4_ESCR(TC_ESCR0,	0x3C4, MS_COUNTER0, MS_COUNTER1, NONE)		\
-    P4_ESCR(TC_ESCR1,	0x3C5, MS_COUNTER2, MS_COUNTER3, NONE)		\
-    P4_ESCR(IX_ESCR0,	0x3C8, BPU_COUNTER0, BPU_COUNTER1, NONE)	\
-    P4_ESCR(IX_ESCR1,	0x3C9, BPU_COUNTER2, BPU_COUNTER3, NONE)	\
-    P4_ESCR(ALF_ESCR0,	0x3CA, IQ_COUNTER0, IQ_COUNTER1, IQ_COUNTER4)	\
-    P4_ESCR(ALF_ESCR1,	0x3CB, IQ_COUNTER2, IQ_COUNTER3, IQ_COUNTER5)	\
-    P4_ESCR(CRU_ESCR2,	0x3CC, IQ_COUNTER0, IQ_COUNTER1, IQ_COUNTER4)	\
-    P4_ESCR(CRU_ESCR3,	0x3CD, IQ_COUNTER2, IQ_COUNTER3, IQ_COUNTER5)	\
-    P4_ESCR(CRU_ESCR4,	0x3E0, IQ_COUNTER0, IQ_COUNTER1, IQ_COUNTER4)	\
-    P4_ESCR(CRU_ESCR5,	0x3E1, IQ_COUNTER2, IQ_COUNTER3, IQ_COUNTER5)	\
-    P4_ESCR(NONE,		~0,    NONE, NONE, NONE)
-
-enum pmc_p4escr {
-#define	P4_ESCR(N, MSR, P1, P2, P3)	P4_ESCR_##N ,
-	P4_ESCRS()
-#undef	P4_ESCR
-};
-
-struct pmc_p4escr_descr {
-	const char	pm_escrname[PMC_NAME_MAX];
-	u_short		pm_escr_msr;
-	const enum pmc_p4pmc pm_pmcs[P4_MAX_PMC_PER_ESCR];
-};
-
-static struct pmc_p4escr_descr p4_escrs[] =
-{
-#define	P4_ESCR(N, MSR, P1, P2, P3)		\
-	{					\
-		.pm_escrname = #N,		\
-		.pm_escr_msr = (MSR),		\
-		.pm_pmcs =			\
-		{				\
-			P4_PMC_##P1,		\
-			P4_PMC_##P2,		\
-			P4_PMC_##P3		\
-		}				\
-	} ,
-
-	P4_ESCRS()
-
-#undef	P4_ESCR
-};
-
-/*
- * P4 Event descriptor
- */
-
-struct p4_event_descr {
-	const enum pmc_event pm_event;
-	const uint32_t	pm_escr_eventselect;
-	const uint32_t	pm_cccr_select;
-	const char	pm_is_ti_event;
-	enum pmc_p4escr	pm_escrs[P4_MAX_ESCR_PER_EVENT];
-};
-
-static struct p4_event_descr p4_events[] = {
-
-#define	P4_EVDESCR(NAME, ESCREVENTSEL, CCCRSEL, TI_EVENT, ESCR0, ESCR1)	\
-	{								\
-		.pm_event            = PMC_EV_P4_##NAME,		\
-		.pm_escr_eventselect = (ESCREVENTSEL),			\
-		.pm_cccr_select      = (CCCRSEL),			\
-		.pm_is_ti_event	     = (TI_EVENT),			\
-		.pm_escrs            =					\
-		{							\
-			P4_ESCR_##ESCR0,				\
-			P4_ESCR_##ESCR1					\
-		}							\
-	}
-
-P4_EVDESCR(TC_DELIVER_MODE,	0x01, 0x01, TRUE,  TC_ESCR0,	TC_ESCR1),
-P4_EVDESCR(BPU_FETCH_REQUEST,	0x03, 0x00, FALSE, BPU_ESCR0,	BPU_ESCR1),
-P4_EVDESCR(ITLB_REFERENCE,	0x18, 0x03, FALSE, ITLB_ESCR0,	ITLB_ESCR1),
-P4_EVDESCR(MEMORY_CANCEL,	0x02, 0x05, FALSE, DAC_ESCR0,	DAC_ESCR1),
-P4_EVDESCR(MEMORY_COMPLETE,	0x08, 0x02, FALSE, SAAT_ESCR0,	SAAT_ESCR1),
-P4_EVDESCR(LOAD_PORT_REPLAY,	0x04, 0x02, FALSE, SAAT_ESCR0,	SAAT_ESCR1),
-P4_EVDESCR(STORE_PORT_REPLAY,	0x05, 0x02, FALSE, SAAT_ESCR0,	SAAT_ESCR1),
-P4_EVDESCR(MOB_LOAD_REPLAY,	0x03, 0x02, FALSE, MOB_ESCR0,	MOB_ESCR1),
-P4_EVDESCR(PAGE_WALK_TYPE,	0x01, 0x04, TRUE,  PMH_ESCR0,	PMH_ESCR1),
-P4_EVDESCR(BSQ_CACHE_REFERENCE,	0x0C, 0x07, FALSE, BSU_ESCR0,	BSU_ESCR1),
-P4_EVDESCR(IOQ_ALLOCATION,	0x03, 0x06, FALSE, FSB_ESCR0,	FSB_ESCR1),
-P4_EVDESCR(IOQ_ACTIVE_ENTRIES,	0x1A, 0x06, FALSE, FSB_ESCR1,	NONE),
-P4_EVDESCR(FSB_DATA_ACTIVITY,	0x17, 0x06, TRUE,  FSB_ESCR0,	FSB_ESCR1),
-P4_EVDESCR(BSQ_ALLOCATION,	0x05, 0x07, FALSE, BSU_ESCR0,	NONE),
-P4_EVDESCR(BSQ_ACTIVE_ENTRIES,	0x06, 0x07, FALSE, BSU_ESCR1,	NONE),
-	/* BSQ_ACTIVE_ENTRIES inherits CPU specificity from BSQ_ALLOCATION */
-P4_EVDESCR(SSE_INPUT_ASSIST,	0x34, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(PACKED_SP_UOP,	0x08, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(PACKED_DP_UOP,	0x0C, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(SCALAR_SP_UOP,	0x0A, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(SCALAR_DP_UOP,	0x0E, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(64BIT_MMX_UOP,	0x02, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(128BIT_MMX_UOP,	0x1A, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(X87_FP_UOP,		0x04, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(X87_SIMD_MOVES_UOP,	0x2E, 0x01, TRUE,  FIRM_ESCR0,	FIRM_ESCR1),
-P4_EVDESCR(GLOBAL_POWER_EVENTS,	0x13, 0x06, FALSE, FSB_ESCR0,	FSB_ESCR1),
-P4_EVDESCR(TC_MS_XFER,		0x05, 0x00, FALSE, MS_ESCR0,	MS_ESCR1),
-P4_EVDESCR(UOP_QUEUE_WRITES,	0x09, 0x00, FALSE, MS_ESCR0,	MS_ESCR1),
-P4_EVDESCR(RETIRED_MISPRED_BRANCH_TYPE,
-    				0x05, 0x02, FALSE, TBPU_ESCR0,	TBPU_ESCR1),
-P4_EVDESCR(RETIRED_BRANCH_TYPE,	0x04, 0x02, FALSE, TBPU_ESCR0,	TBPU_ESCR1),
-P4_EVDESCR(RESOURCE_STALL,	0x01, 0x01, FALSE, ALF_ESCR0,	ALF_ESCR1),
-P4_EVDESCR(WC_BUFFER,		0x05, 0x05, TRUE,  DAC_ESCR0,	DAC_ESCR1),
-P4_EVDESCR(B2B_CYCLES,		0x16, 0x03, TRUE,  FSB_ESCR0,	FSB_ESCR1),
-P4_EVDESCR(BNR,			0x08, 0x03, TRUE,  FSB_ESCR0,	FSB_ESCR1),
-P4_EVDESCR(SNOOP,		0x06, 0x03, TRUE,  FSB_ESCR0,	FSB_ESCR1),
-P4_EVDESCR(RESPONSE,		0x04, 0x03, TRUE,  FSB_ESCR0,	FSB_ESCR1),
-P4_EVDESCR(FRONT_END_EVENT,	0x08, 0x05, FALSE, CRU_ESCR2,	CRU_ESCR3),
-P4_EVDESCR(EXECUTION_EVENT,	0x0C, 0x05, FALSE, CRU_ESCR2,	CRU_ESCR3),
-P4_EVDESCR(REPLAY_EVENT, 	0x09, 0x05, FALSE, CRU_ESCR2,	CRU_ESCR3),
-P4_EVDESCR(INSTR_RETIRED,	0x02, 0x04, FALSE, CRU_ESCR0,	CRU_ESCR1),
-P4_EVDESCR(UOPS_RETIRED,	0x01, 0x04, FALSE, CRU_ESCR0,	CRU_ESCR1),
-P4_EVDESCR(UOP_TYPE,		0x02, 0x02, FALSE, RAT_ESCR0,	RAT_ESCR1),
-P4_EVDESCR(BRANCH_RETIRED,	0x06, 0x05, FALSE, CRU_ESCR2,	CRU_ESCR3),
-P4_EVDESCR(MISPRED_BRANCH_RETIRED, 0x03, 0x04, FALSE, CRU_ESCR0, CRU_ESCR1),
-P4_EVDESCR(X87_ASSIST,		0x03, 0x05, FALSE, CRU_ESCR2,	CRU_ESCR3),
-P4_EVDESCR(MACHINE_CLEAR,	0x02, 0x05, FALSE, CRU_ESCR2,	CRU_ESCR3)
-
-#undef	P4_EVDESCR
-};
-
-#define	P4_EVENT_IS_TI(E) ((E)->pm_is_ti_event == TRUE)
-
-#define	P4_NEVENTS	(PMC_EV_P4_LAST - PMC_EV_P4_FIRST + 1)
-
-/*
- * P4 PMC descriptors
- */
-
-struct p4pmc_descr {
-	struct pmc_descr pm_descr; 	/* common information */
-	enum pmc_p4pmc	pm_pmcnum;	/* PMC number */
-	uint32_t	pm_pmc_msr; 	/* PERFCTR MSR address */
-	uint32_t	pm_cccr_msr;  	/* CCCR MSR address */
-};
-
-static struct p4pmc_descr p4_pmcdesc[P4_NPMCS] = {
-
-	/*
-	 * TSC descriptor
-	 */
-
-	{
-		.pm_descr =
-		{
-			.pd_name  = "TSC",
-			.pd_class = PMC_CLASS_TSC,
-			.pd_caps  = PMC_CAP_READ | PMC_CAP_WRITE,
-			.pd_width = 64
-		},
-		.pm_pmcnum   = ~0,
-		.pm_cccr_msr = ~0,
-		.pm_pmc_msr  = 0x10,
-	},
-
-	/*
-	 * P4 PMCS
-	 */
-
-#define	P4_PMC_CAPS (PMC_CAP_INTERRUPT | PMC_CAP_USER | PMC_CAP_SYSTEM |  \
-	PMC_CAP_EDGE | PMC_CAP_THRESHOLD | PMC_CAP_READ | PMC_CAP_WRITE | \
-	PMC_CAP_INVERT | PMC_CAP_QUALIFIER | PMC_CAP_PRECISE |            \
-	PMC_CAP_TAGGING | PMC_CAP_CASCADE)
-
-#define	P4_PMCDESCR(N, PMC, CCCR)			\
-	{						\
-		.pm_descr =				\
-		{					\
-			.pd_name = #N,			\
-			.pd_class = PMC_CLASS_P4,	\
-			.pd_caps = P4_PMC_CAPS,		\
-			.pd_width = 40			\
-		},					\
-		.pm_pmcnum      = P4_PMC_##N,		\
-		.pm_cccr_msr 	= (CCCR),		\
-		.pm_pmc_msr	= (PMC)			\
-	}
-
-	P4_PMCDESCR(BPU_COUNTER0,	0x300,	0x360),
-	P4_PMCDESCR(BPU_COUNTER1,	0x301,	0x361),
-	P4_PMCDESCR(BPU_COUNTER2,	0x302,	0x362),
-	P4_PMCDESCR(BPU_COUNTER3,	0x303,	0x363),
-	P4_PMCDESCR(MS_COUNTER0,	0x304,	0x364),
-	P4_PMCDESCR(MS_COUNTER1,	0x305,	0x365),
-	P4_PMCDESCR(MS_COUNTER2,	0x306,	0x366),
-	P4_PMCDESCR(MS_COUNTER3,	0x307,	0x367),
-	P4_PMCDESCR(FLAME_COUNTER0,	0x308,	0x368),
-	P4_PMCDESCR(FLAME_COUNTER1,	0x309,	0x369),
-	P4_PMCDESCR(FLAME_COUNTER2,	0x30A,	0x36A),
-	P4_PMCDESCR(FLAME_COUNTER3,	0x30B,	0x36B),
-	P4_PMCDESCR(IQ_COUNTER0,	0x30C,	0x36C),
-	P4_PMCDESCR(IQ_COUNTER1,	0x30D,	0x36D),
-	P4_PMCDESCR(IQ_COUNTER2,	0x30E,	0x36E),
-	P4_PMCDESCR(IQ_COUNTER3,	0x30F,	0x36F),
-	P4_PMCDESCR(IQ_COUNTER4,	0x310,	0x370),
-	P4_PMCDESCR(IQ_COUNTER5,	0x311,	0x371),
-
-#undef	P4_PMCDESCR
-};
-
-/* HTT support */
-#define	P4_NHTT					2 /* logical processors/chip */
-#define	P4_HTT_CPU_INDEX_0			0
-#define	P4_HTT_CPU_INDEX_1			1
-
-static int p4_system_has_htt;
-
-/*
- * Per-CPU data structure for P4 class CPUs
- *
- * [common stuff]
- * [19 struct pmc_hw pointers]
- * [19 struct pmc_hw structures]
- * [45 ESCRs status bytes]
- * [per-cpu spin mutex]
- * [19 flags for holding the config count and runcount]
- * [19*2 saved value fields] (Thread mode PMC support)
- * [19*2 pmc value fields]   (-do-)
- */
-
-struct p4_cpu {
-	struct pmc_cpu	pc_common;
-	struct pmc_hw	*pc_hwpmcs[P4_NPMCS];
-	struct pmc_hw	pc_p4pmcs[P4_NPMCS];
-	char		pc_escrs[P4_NESCR];
-	struct mtx	pc_mtx;	/* spin lock */
-	unsigned char	pc_flags[P4_NPMCS]; /* 4 bits each: {cfg,run}count */
-	pmc_value_t	pc_saved[P4_NPMCS * P4_NHTT];
-	pmc_value_t	pc_pmc_values[P4_NPMCS * P4_NHTT];
-};
-
-#define	P4_PCPU_SAVED_VALUE(PC,RI,CPU)	(PC)->pc_saved[(RI)*((CPU) & 1)]
-#define	P4_PCPU_PMC_VALUE(P,R,C) (P)->pc_pmc_values[(R)*((C) & 1)]
-
-#define	P4_PCPU_GET_FLAGS(PC,RI,MASK)	((PC)->pc_flags[(RI)] & (MASK))
-#define	P4_PCPU_SET_FLAGS(PC,RI,MASK,VAL)	do {	\
-	char _tmp;					\
-	_tmp = (PC)->pc_flags[(RI)];			\
-	_tmp &= ~(MASK);				\
-	_tmp |= (VAL) & (MASK);				\
-	(PC)->pc_flags[(RI)] = _tmp;			\
-} while (0)
-
-#define	P4_PCPU_GET_RUNCOUNT(PC,RI)	P4_PCPU_GET_FLAGS(PC,RI,0x0F)
-#define	P4_PCPU_SET_RUNCOUNT(PC,RI,V)	P4_PCPU_SET_FLAGS(PC,RI,0x0F,V)
-
-#define	P4_PCPU_GET_CFGCOUNT(PC,RI)	(P4_PCPU_GET_FLAGS(PC,RI,0xF0) >> 4)
-#define	P4_PCPU_SET_CFGCOUNT(PC,RI,C)	P4_PCPU_SET_FLAGS(PC,RI,0xF0,((C) <<4))
-
-/* ESCR row disposition */
-static int p4_escrdisp[P4_NESCR];
-
-#define	P4_ESCR_ROW_DISP_IS_THREAD(E)		(p4_escrdisp[(E)] > 0)
-#define	P4_ESCR_ROW_DISP_IS_STANDALONE(E)	(p4_escrdisp[(E)] < 0)
-#define	P4_ESCR_ROW_DISP_IS_FREE(E)		(p4_escrdisp[(E)] == 0)
-
-#define	P4_ESCR_MARK_ROW_STANDALONE(E) do {				\
-	KASSERT(p4_escrdisp[(E)] <= 0, ("[p4,%d] row disposition error",\
-		    __LINE__));						\
-	atomic_add_int(&p4_escrdisp[(E)], -1);				\
-	KASSERT(p4_escrdisp[(E)] >= (-mp_ncpus), ("[p4,%d] row "	\
-		"disposition error", __LINE__));			\
-} while (0)
-
-#define	P4_ESCR_UNMARK_ROW_STANDALONE(E) do {				\
-	atomic_add_int(&p4_escrdisp[(E)], 1);				\
-	KASSERT(p4_escrdisp[(E)] <= 0, ("[p4,%d] row disposition error",\
-		    __LINE__));						\
-} while (0)
-
-#define	P4_ESCR_MARK_ROW_THREAD(E) do {					 \
-	KASSERT(p4_escrdisp[(E)] >= 0, ("[p4,%d] row disposition error", \
-		    __LINE__));						 \
-	atomic_add_int(&p4_escrdisp[(E)], 1);				 \
-} while (0)
-
-#define	P4_ESCR_UNMARK_ROW_THREAD(E) do {				 \
-	atomic_add_int(&p4_escrdisp[(E)], -1);				 \
-	KASSERT(p4_escrdisp[(E)] >= 0, ("[p4,%d] row disposition error",\
-		    __LINE__));						 \
-} while (0)
-
-#define	P4_PMC_IS_STOPPED(cccr)	((rdmsr(cccr) & P4_CCCR_ENABLE) == 0)
-
-#define	P4_TO_PHYSICAL_CPU(cpu) (pmc_cpu_is_logical(cpu) ?		\
-    ((cpu) & ~1) : (cpu))
-
-#define	P4_CCCR_Tx_MASK	(~(P4_CCCR_OVF_PMI_T0|P4_CCCR_OVF_PMI_T1|	\
-			     P4_CCCR_ENABLE|P4_CCCR_OVF))
-#define	P4_ESCR_Tx_MASK	(~(P4_ESCR_T0_OS|P4_ESCR_T0_USR|P4_ESCR_T1_OS|	\
-			     P4_ESCR_T1_USR))
-
-/*
- * support routines
- */
-
-static struct p4_event_descr *
-p4_find_event(enum pmc_event ev)
-{
-	int n;
-
-	for (n = 0; n < P4_NEVENTS; n++)
-		if (p4_events[n].pm_event == ev)
-			break;
-	if (n == P4_NEVENTS)
-		return NULL;
-	return &p4_events[n];
-}
-
-/*
- * Initialize per-cpu state
- */
-
-static int
-p4_init(int cpu)
-{
-	int n, phycpu;
-	char *pescr;
-	struct p4_cpu *pcs;
-	struct pmc_hw *phw;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p4,%d] insane cpu number %d", __LINE__, cpu));
-
-	PMCDBG(MDP,INI,0, "p4-init cpu=%d logical=%d", cpu,
-	    pmc_cpu_is_logical(cpu) != 0);
-
-	/*
-	 * A 'logical' CPU shares its per-cpu state with its physical
-	 * CPU.  The physical CPU would have been initialized prior to
-	 * the initialization for this cpu.
-	 */
-
-	if (pmc_cpu_is_logical(cpu)) {
-		phycpu = P4_TO_PHYSICAL_CPU(cpu);
-		pcs = (struct p4_cpu *) pmc_pcpu[phycpu];
-		PMCDBG(MDP,INI,1, "p4-init cpu=%d phycpu=%d pcs=%p",
-		    cpu, phycpu, pcs);
-		KASSERT(pcs,
-		    ("[p4,%d] Null Per-Cpu state cpu=%d phycpu=%d", __LINE__,
-			cpu, phycpu));
-		if (pcs == NULL) /* decline to init */
-			return ENXIO;
-		p4_system_has_htt = 1;
-		pmc_pcpu[cpu] = (struct pmc_cpu *) pcs;
-		return 0;
-	}
-
-	MALLOC(pcs, struct p4_cpu *, sizeof(struct p4_cpu), M_PMC,
-	    M_WAITOK|M_ZERO);
-
-	if (pcs == NULL)
-		return ENOMEM;
-	phw = pcs->pc_p4pmcs;
-
-	for (n = 0; n < P4_NPMCS; n++, phw++) {
-		phw->phw_state   = PMC_PHW_FLAG_IS_ENABLED |
-		    PMC_PHW_CPU_TO_STATE(cpu) | PMC_PHW_INDEX_TO_STATE(n);
-		phw->phw_pmc     = NULL;
-		pcs->pc_hwpmcs[n] = phw;
-	}
-
-	/* Mark the TSC as shareable */
-	pcs->pc_hwpmcs[0]->phw_state |= PMC_PHW_FLAG_IS_SHAREABLE;
-
-	pescr = pcs->pc_escrs;
-	for (n = 0; n < P4_NESCR; n++)
-		*pescr++ = P4_INVALID_PMC_INDEX;
-	pmc_pcpu[cpu] = (struct pmc_cpu *) pcs;
-
-	mtx_init(&pcs->pc_mtx, "p4-pcpu", "pmc", MTX_SPIN);
-
-	return 0;
-}
-
-/*
- * Destroy per-cpu state.
- */
-
-static int
-p4_cleanup(int cpu)
-{
-	struct p4_cpu *pcs;
-
-	PMCDBG(MDP,INI,0, "p4-cleanup cpu=%d", cpu);
-
-	/*
-	 * Free up the per-cpu structure for the given cpu if
-	 * allocated, and if this is a physical CPU.
-	 */
-
-	if ((pcs = (struct p4_cpu *) pmc_pcpu[cpu]) != NULL &&
-	    !pmc_cpu_is_logical(cpu)) {
-		mtx_destroy(&pcs->pc_mtx);
-		FREE(pcs, M_PMC);
-	}
-
-	pmc_pcpu[cpu] = NULL;
-
-	return 0;
-}
-
-/*
- * Context switch in.
- */
-
-static int
-p4_switch_in(struct pmc_cpu *pc)
-{
-	(void) pc;
-	/* enable the RDPMC instruction */
-	load_cr4(rcr4() | CR4_PCE);
-	return 0;
-}
-
-/*
- * Context switch out.
- */
-
-static int
-p4_switch_out(struct pmc_cpu *pc)
-{
-	(void) pc;
-	/* disallow RDPMC instruction */
-	load_cr4(rcr4() & ~CR4_PCE);
-	return 0;
-}
-
-/*
- * Read a PMC
- */
-
-static int
-p4_read_pmc(int cpu, int ri, pmc_value_t *v)
-{
-	enum pmc_mode mode;
-	struct p4pmc_descr *pd;
-	struct pmc *pm;
-	struct p4_cpu *pc;
-	struct pmc_hw *phw;
-	pmc_value_t tmp;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p4,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P4_NPMCS,
-	    ("[p4,%d] illegal row-index %d", __LINE__, ri));
-
-	pc  = (struct p4_cpu *) pmc_pcpu[P4_TO_PHYSICAL_CPU(cpu)];
-	phw = pc->pc_hwpmcs[ri];
-	pd  = &p4_pmcdesc[ri];
-	pm  = phw->phw_pmc;
-
-	KASSERT(pm != NULL,
-	    ("[p4,%d] No owner for HWPMC [cpu%d,pmc%d]", __LINE__,
-		cpu, ri));
-
-	mode = pm->pm_mode;
-
-	PMCDBG(MDP,REA,1, "p4-read cpu=%d ri=%d mode=%d", cpu, ri, mode);
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC) {
-		KASSERT(PMC_IS_COUNTING_MODE(mode),
-		    ("[p4,%d] TSC counter in non-counting mode", __LINE__));
-		*v = rdtsc();
-		PMCDBG(MDP,REA,2, "p4-read -> %jx", *v);
-		return 0;
-	}
-
-	KASSERT(pd->pm_descr.pd_class == PMC_CLASS_P4,
-	    ("[p4,%d] unknown PMC class %d", __LINE__, pd->pm_descr.pd_class));
-
-	if (PMC_IS_SYSTEM_MODE(pm->pm_mode))
-		tmp = rdmsr(p4_pmcdesc[ri].pm_pmc_msr);
-	else
-		tmp = P4_PCPU_PMC_VALUE(pc,ri,cpu);
-
-	if (PMC_IS_SAMPLING_MODE(mode))
-		*v = -(tmp + 1); /* undo transformation */
-	else
-		*v = tmp;
-
-	PMCDBG(MDP,REA,2, "p4-read -> %jx", *v);
-	return 0;
-}
-
-/*
- * Write a PMC
- */
-
-static int
-p4_write_pmc(int cpu, int ri, pmc_value_t v)
-{
-	struct pmc *pm;
-	struct p4_cpu *pc;
-	const struct pmc_hw *phw;
-	const struct p4pmc_descr *pd;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[amd,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P4_NPMCS,
-	    ("[amd,%d] illegal row-index %d", __LINE__, ri));
-
-	pc  = (struct p4_cpu *) pmc_pcpu[P4_TO_PHYSICAL_CPU(cpu)];
-	phw = pc->pc_hwpmcs[ri];
-	pm  = phw->phw_pmc;
-	pd  = &p4_pmcdesc[ri];
-
-	KASSERT(pm != NULL,
-	    ("[p4,%d] No owner for HWPMC [cpu%d,pmc%d]", __LINE__,
-		cpu, ri));
-
-	PMCDBG(MDP,WRI,1, "p4-write cpu=%d ri=%d mode=%d v=%jx", cpu, ri,
-	    pm->pm_mode, v);
-
-	/*
-	 * The P4's TSC register is writeable, but we don't allow a
-	 * write as changing the TSC's value could interfere with
-	 * other parts of the system.
-	 */
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;
-
-	/*
-	 * write the PMC value to the register/saved value: for
-	 * sampling mode PMCs, the value to be programmed into the PMC
-	 * counter is -(C+1) where 'C' is the requested sample rate.
-	 */
-	if (PMC_IS_SAMPLING_MODE(pm->pm_mode))
-		v = -(v + 1);
-
-	if (PMC_IS_SYSTEM_MODE(pm->pm_mode))
-		wrmsr(pd->pm_pmc_msr, v);
-	else
-		P4_PCPU_PMC_VALUE(pc,ri,cpu) = v;
-
-	return 0;
-}
-
-/*
- * Configure a PMC 'pm' on the given CPU and row-index.
- *
- * 'pm' may be NULL to indicate de-configuration.
- *
- * On HTT systems, a PMC may get configured twice, once for each
- * "logical" CPU.
- */
-
-static int
-p4_config_pmc(int cpu, int ri, struct pmc *pm)
-{
-	struct pmc_hw *phw;
-	struct p4_cpu *pc;
-	int cfgcount;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p4,%d] illegal CPU %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P4_NPMCS,
-	    ("[p4,%d] illegal row-index %d", __LINE__, ri));
-
-	pc  = (struct p4_cpu *) pmc_pcpu[P4_TO_PHYSICAL_CPU(cpu)];
-	phw = pc->pc_hwpmcs[ri];
-
-	KASSERT(pm == NULL || phw->phw_pmc == NULL ||
-	    (p4_system_has_htt && phw->phw_pmc == pm),
-	    ("[p4,%d] hwpmc not unconfigured before re-config", __LINE__));
-
-	mtx_lock_spin(&pc->pc_mtx);
-	cfgcount = P4_PCPU_GET_CFGCOUNT(pc,ri);
-
-	KASSERT(cfgcount >= 0 || cfgcount <= 2,
-	    ("[p4,%d] illegal cfgcount cfg=%d on cpu=%d ri=%d", __LINE__,
-		cfgcount, cpu, ri));
-
-	KASSERT(cfgcount == 0 || phw->phw_pmc,
-	    ("[p4,%d] cpu=%d ri=%d pmc configured with zero cfg count",
-		__LINE__, cpu, ri));
-
-	PMCDBG(MDP,CFG,1, "cpu=%d ri=%d cfg=%d pm=%p", cpu, ri, cfgcount,
-	    pm);
-
-	if (pm) {		/* config */
-		if (cfgcount == 0)
-			phw->phw_pmc = pm;
-
-		KASSERT(phw->phw_pmc == pm,
-		    ("[p4,%d] cpu=%d ri=%d config %p != hw %p",
-			__LINE__, cpu, ri, pm, phw->phw_pmc));
-
-		cfgcount++;
-	} else {		/* unconfig */
-		--cfgcount;
-		if (cfgcount == 0)
-			phw->phw_pmc = NULL;
-	}
-
-	KASSERT(cfgcount >= 0 || cfgcount <= 2,
-	    ("[p4,%d] illegal runcount cfg=%d on cpu=%d ri=%d", __LINE__,
-		cfgcount, cpu, ri));
-
-	P4_PCPU_SET_CFGCOUNT(pc,ri,cfgcount);
-
-	mtx_unlock_spin(&pc->pc_mtx);
-
-	return 0;
-}
-
-/*
- * Allocate a PMC.
- *
- * The allocation strategy differs between HTT and non-HTT systems.
- *
- * The non-HTT case:
- *   - Given the desired event and the PMC row-index, lookup the
- *   list of valid ESCRs for the event.
- *   - For each valid ESCR:
- *     - Check if the ESCR is free and the ESCR row is in a compatible
- *       mode (i.e., system or process))
- *     - Check if the ESCR is usable with a P4 PMC at the desired row-index.
- *   If everything matches, we determine the appropriate bit values for the
- *   ESCR and CCCR registers.
- *
- * The HTT case:
- *
- * - Process mode PMCs require special care.  The FreeBSD scheduler could
- *   schedule any two processes on the same physical CPU.  We need to ensure
- *   that a given PMC row-index is never allocated to two different
- *   PMCs owned by different user-processes.
- *   This is ensured by always allocating a PMC from a 'FREE' PMC row
- *   if the system has HTT active.
- * - A similar check needs to be done for ESCRs; we do not want two PMCs
- *   using the same ESCR to be scheduled at the same time.  Thus ESCR
- *   allocation is also restricted to FREE rows if the system has HTT
- *   enabled.
- * - Thirdly, some events are 'thread-independent' terminology, i.e.,
- *   the PMC hardware cannot distinguish between events caused by
- *   different logical CPUs.  This makes it impossible to assign events
- *   to a given thread of execution.  If the system has HTT enabled,
- *   these events are not allowed for process-mode PMCs.
- */
-
-static int
-p4_allocate_pmc(int cpu, int ri, struct pmc *pm,
-    const struct pmc_op_pmcallocate *a)
-{
-	int found, n, m;
-	uint32_t caps, cccrvalue, escrvalue, tflags;
-	enum pmc_p4escr escr;
-	struct p4_cpu *pc;
-	struct p4_event_descr *pevent;
-	const struct p4pmc_descr *pd;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p4,%d] illegal CPU %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P4_NPMCS,
-	    ("[p4,%d] illegal row-index value %d", __LINE__, ri));
-
-	pd = &p4_pmcdesc[ri];
-
-	PMCDBG(MDP,ALL,1, "p4-allocate ri=%d class=%d pmccaps=0x%x "
-	    "reqcaps=0x%x\n", ri, pd->pm_descr.pd_class, pd->pm_descr.pd_caps,
-	    pm->pm_caps);
-
-	/* check class */
-	if (pd->pm_descr.pd_class != pm->pm_class)
-		return EINVAL;
-
-	/* check requested capabilities */
-	caps = a->pm_caps;
-	if ((pd->pm_descr.pd_caps & caps) != caps)
-		return EPERM;
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC) {
-		/* TSC's are always allocated in system-wide counting mode */
-		if (a->pm_ev != PMC_EV_TSC_TSC ||
-		    a->pm_mode != PMC_MODE_SC)
-			return EINVAL;
-		return 0;
-	}
-
-	/*
-	 * If the system has HTT enabled, and the desired allocation
-	 * mode is process-private, and the PMC row disposition is not
-	 * FREE (0), decline the allocation.
-	 */
-
-	if (p4_system_has_htt &&
-	    PMC_IS_VIRTUAL_MODE(pm->pm_mode) &&
-	    pmc_getrowdisp(ri) != 0)
-		return EBUSY;
-
-	KASSERT(pd->pm_descr.pd_class == PMC_CLASS_P4,
-	    ("[p4,%d] unknown PMC class %d", __LINE__,
-		pd->pm_descr.pd_class));
-
-	if (pm->pm_event < PMC_EV_P4_FIRST ||
-	    pm->pm_event > PMC_EV_P4_LAST)
-		return EINVAL;
-
-	if ((pevent = p4_find_event(pm->pm_event)) == NULL)
-		return ESRCH;
-
-	PMCDBG(MDP,ALL,2, "pevent={ev=%d,escrsel=0x%x,cccrsel=0x%x,isti=%d}",
-	    pevent->pm_event, pevent->pm_escr_eventselect,
-	    pevent->pm_cccr_select, pevent->pm_is_ti_event);
-
-	/*
-	 * Some PMC events are 'thread independent'and therefore
-	 * cannot be used for process-private modes if HTT is being
-	 * used.
-	 */
-
-	if (P4_EVENT_IS_TI(pevent) &&
-	    PMC_IS_VIRTUAL_MODE(pm->pm_mode) && p4_system_has_htt)
-		return EINVAL;
-
-	pc = (struct p4_cpu *) pmc_pcpu[P4_TO_PHYSICAL_CPU(cpu)];
-
-	found   = 0;
-
-	/* look for a suitable ESCR for this event */
-	for (n = 0; n < P4_MAX_ESCR_PER_EVENT && !found; n++) {
-		if ((escr = pevent->pm_escrs[n]) == P4_ESCR_NONE)
-			break;	/* out of ESCRs */
-		/*
-		 * Check ESCR row disposition.
-		 *
-		 * If the request is for a system-mode PMC, then the
-		 * ESCR row should not be in process-virtual mode, and
-		 * should also be free on the current CPU.
-		 */
-
-		if (PMC_IS_SYSTEM_MODE(pm->pm_mode)) {
-		    if (P4_ESCR_ROW_DISP_IS_THREAD(escr) ||
-			pc->pc_escrs[escr] != P4_INVALID_PMC_INDEX)
-			    continue;
-		}
-
-		/*
-		 * If the request is for a process-virtual PMC, and if
-		 * HTT is not enabled, we can use an ESCR row that is
-		 * either FREE or already in process mode.
-		 *
-		 * If HTT is enabled, then we need to ensure that a
-		 * given ESCR is never allocated to two PMCS that
-		 * could run simultaneously on the two logical CPUs of
-		 * a CPU package.  We ensure this be only allocating
-		 * ESCRs from rows marked as 'FREE'.
-		 */
-
-		if (PMC_IS_VIRTUAL_MODE(pm->pm_mode)) {
-			if (p4_system_has_htt) {
-				if (!P4_ESCR_ROW_DISP_IS_FREE(escr))
-					continue;
-			} else
-				if (P4_ESCR_ROW_DISP_IS_STANDALONE(escr))
-					continue;
-		}
-
-		/*
-		 * We found a suitable ESCR for this event.  Now check if
-		 * this escr can work with the PMC at row-index 'ri'.
-		 */
-
-		for (m = 0; m < P4_MAX_PMC_PER_ESCR; m++)
-			if (p4_escrs[escr].pm_pmcs[m] == pd->pm_pmcnum) {
-				found = 1;
-				break;
-			}
-	}
-
-	if (found == 0)
-		return ESRCH;
-
-	KASSERT((int) escr >= 0 && escr < P4_NESCR,
-	    ("[p4,%d] illegal ESCR value %d", __LINE__, escr));
-
-	/* mark ESCR row mode */
-	if (PMC_IS_SYSTEM_MODE(pm->pm_mode)) {
-		pc->pc_escrs[escr] = ri; /* mark ESCR as in use on this cpu */
-		P4_ESCR_MARK_ROW_STANDALONE(escr);
-	} else {
-		KASSERT(pc->pc_escrs[escr] == P4_INVALID_PMC_INDEX,
-		    ("[p4,%d] escr[%d] already in use", __LINE__, escr));
-		P4_ESCR_MARK_ROW_THREAD(escr);
-	}
-
-	pm->pm_md.pm_p4.pm_p4_escrmsr   = p4_escrs[escr].pm_escr_msr;
-	pm->pm_md.pm_p4.pm_p4_escr      = escr;
-
-	cccrvalue = P4_CCCR_TO_ESCR_SELECT(pevent->pm_cccr_select);
-	escrvalue = P4_ESCR_TO_EVENT_SELECT(pevent->pm_escr_eventselect);
-
-	/* CCCR fields */
-	if (caps & PMC_CAP_THRESHOLD)
-		cccrvalue |= (a->pm_p4_cccrconfig & P4_CCCR_THRESHOLD_MASK) |
-		    P4_CCCR_COMPARE;
-
-	if (caps & PMC_CAP_EDGE)
-		cccrvalue |= P4_CCCR_EDGE;
-
-	if (caps & PMC_CAP_INVERT)
-		cccrvalue |= P4_CCCR_COMPLEMENT;
-
-	if (p4_system_has_htt)
-		cccrvalue |= a->pm_p4_cccrconfig & P4_CCCR_ACTIVE_THREAD_MASK;
-	else			/* no HTT; thread field should be '11b' */
-		cccrvalue |= P4_CCCR_TO_ACTIVE_THREAD(0x3);
-
-	if (caps & PMC_CAP_CASCADE)
-		cccrvalue |= P4_CCCR_CASCADE;
-
-	/* On HTT systems the PMI T0 field may get moved to T1 at pmc start */
-	if (caps & PMC_CAP_INTERRUPT)
-		cccrvalue |= P4_CCCR_OVF_PMI_T0;
-
-	/* ESCR fields */
-	if (caps & PMC_CAP_QUALIFIER)
-		escrvalue |= a->pm_p4_escrconfig & P4_ESCR_EVENT_MASK_MASK;
-	if (caps & PMC_CAP_TAGGING)
-		escrvalue |= (a->pm_p4_escrconfig & P4_ESCR_TAG_VALUE_MASK) |
-		    P4_ESCR_TAG_ENABLE;
-	if (caps & PMC_CAP_QUALIFIER)
-		escrvalue |= (a->pm_p4_escrconfig & P4_ESCR_EVENT_MASK_MASK);
-
-	/* HTT: T0_{OS,USR} bits may get moved to T1 at pmc start */
-	tflags = 0;
-	if (caps & PMC_CAP_SYSTEM)
-		tflags |= P4_ESCR_T0_OS;
-	if (caps & PMC_CAP_USER)
-		tflags |= P4_ESCR_T0_USR;
-	if (tflags == 0)
-		tflags = (P4_ESCR_T0_OS|P4_ESCR_T0_USR);
-	escrvalue |= tflags;
-
-	pm->pm_md.pm_p4.pm_p4_cccrvalue = cccrvalue;
-	pm->pm_md.pm_p4.pm_p4_escrvalue = escrvalue;
-
-	PMCDBG(MDP,ALL,2, "p4-allocate cccrsel=0x%x cccrval=0x%x "
-	    "escr=%d escrmsr=0x%x escrval=0x%x\n", pevent->pm_cccr_select,
-	    cccrvalue, escr, pm->pm_md.pm_p4.pm_p4_escrmsr, escrvalue);
-
-	return 0;
-}
-
-/*
- * release a PMC.
- */
-
-static int
-p4_release_pmc(int cpu, int ri, struct pmc *pm)
-{
-	enum pmc_p4escr escr;
-	struct pmc_hw *phw;
-	struct p4_cpu *pc;
-
-	if (p4_pmcdesc[ri].pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;
-
-	escr = pm->pm_md.pm_p4.pm_p4_escr;
-
-	PMCDBG(MDP,REL,1, "p4-release cpu=%d ri=%d escr=%d", cpu, ri, escr);
-
-	if (PMC_IS_SYSTEM_MODE(pm->pm_mode)) {
-		pc  = (struct p4_cpu *) pmc_pcpu[P4_TO_PHYSICAL_CPU(cpu)];
-		phw = pc->pc_hwpmcs[ri];
-
-		KASSERT(phw->phw_pmc == NULL,
-		    ("[p4,%d] releasing configured PMC ri=%d", __LINE__, ri));
-
-		P4_ESCR_UNMARK_ROW_STANDALONE(escr);
-		KASSERT(pc->pc_escrs[escr] == ri,
-		    ("[p4,%d] escr[%d] not allocated to ri %d", __LINE__,
-			escr, ri));
-	        pc->pc_escrs[escr] = P4_INVALID_PMC_INDEX; /* mark as free */
-	} else
-		P4_ESCR_UNMARK_ROW_THREAD(escr);
-
-	return 0;
-}
-
-/*
- * Start a PMC
- */
-
-static int
-p4_start_pmc(int cpu, int ri)
-{
-	int rc;
-	uint32_t cccrvalue, cccrtbits, escrvalue, escrmsr, escrtbits;
-	struct pmc *pm;
-	struct p4_cpu *pc;
-	struct pmc_hw *phw;
-	struct p4pmc_descr *pd;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p4,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P4_NPMCS,
-	    ("[p4,%d] illegal row-index %d", __LINE__, ri));
-
-	pc  = (struct p4_cpu *) pmc_pcpu[P4_TO_PHYSICAL_CPU(cpu)];
-	phw = pc->pc_hwpmcs[ri];
-	pm  = phw->phw_pmc;
-	pd  = &p4_pmcdesc[ri];
-
-	KASSERT(pm != NULL,
-	    ("[p4,%d] starting cpu%d,pmc%d with null pmc", __LINE__,
-		cpu, ri));
-
-	PMCDBG(MDP,STA,1, "p4-start cpu=%d ri=%d", cpu, ri);
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC) /* TSC are always on */
-		return 0;
-
-	KASSERT(pd->pm_descr.pd_class == PMC_CLASS_P4,
-	    ("[p4,%d] wrong PMC class %d", __LINE__,
-		pd->pm_descr.pd_class));
-
-	/* retrieve the desired CCCR/ESCR values from the PMC */
-	cccrvalue = pm->pm_md.pm_p4.pm_p4_cccrvalue;
-	escrvalue = pm->pm_md.pm_p4.pm_p4_escrvalue;
-	escrmsr   = pm->pm_md.pm_p4.pm_p4_escrmsr;
-
-	/* extract and zero the logical processor selection bits */
-	cccrtbits = cccrvalue & P4_CCCR_OVF_PMI_T0;
-	escrtbits = escrvalue & (P4_ESCR_T0_OS|P4_ESCR_T0_USR);
-	cccrvalue &= ~P4_CCCR_OVF_PMI_T0;
-	escrvalue &= ~(P4_ESCR_T0_OS|P4_ESCR_T0_USR);
-
-	if (pmc_cpu_is_logical(cpu)) { /* shift T0 bits to T1 position */
-		cccrtbits <<= 1;
-		escrtbits >>= 2;
-	}
-
-	/* start system mode PMCs directly */
-	if (PMC_IS_SYSTEM_MODE(pm->pm_mode)) {
-		wrmsr(escrmsr, escrvalue | escrtbits);
-		wrmsr(pd->pm_cccr_msr, cccrvalue | cccrtbits | P4_CCCR_ENABLE);
-		return 0;
-	}
-
-	/*
-	 * Thread mode PMCs
-	 *
-	 * On HTT machines, the same PMC could be scheduled on the
-	 * same physical CPU twice (once for each logical CPU), for
-	 * example, if two threads of a multi-threaded process get
-	 * scheduled on the same CPU.
-	 *
-	 */
-
-	mtx_lock_spin(&pc->pc_mtx);
-
-	rc = P4_PCPU_GET_RUNCOUNT(pc,ri);
-	KASSERT(rc == 0 || rc == 1,
-	    ("[p4,%d] illegal runcount cpu=%d ri=%d rc=%d", __LINE__, cpu, ri,
-		rc));
-
-	if (rc == 0) {		/* 1st CPU and the non-HTT case */
-		/*
-		 * Enable the correct bits for this CPU.
-		 */
-		escrvalue |= escrtbits;
-		cccrvalue |= cccrtbits | P4_CCCR_ENABLE;
-
-		KASSERT(P4_PMC_IS_STOPPED(pd->pm_cccr_msr),
-		    ("[p4,%d] cpu=%d ri=%d cccr=0x%x not stopped", __LINE__,
-			cpu, ri, pd->pm_cccr_msr));
-
-		/* write out the low 40 bits of the saved value to hardware */
-		wrmsr(pd->pm_pmc_msr,
-		    P4_PCPU_PMC_VALUE(pc,ri,cpu) & P4_PERFCTR_MASK);
-		P4_PCPU_SAVED_VALUE(pc,ri,cpu) = P4_PCPU_PMC_VALUE(pc,ri,cpu) &
-		    P4_PERFCTR_MASK;
-
-		/* Program the ESCR and CCCR and start the PMC */
-		wrmsr(escrmsr, escrvalue);
-		wrmsr(pd->pm_cccr_msr, cccrvalue);
-
-		PMCDBG(MDP,STA,2,"p4-start cpu=%d rc=%d ri=%d escr=%d "
-		    "escrmsr=0x%x escrvalue=0x%x cccr_config=0x%x\n", cpu, rc,
-		    ri, pm->pm_md.pm_p4.pm_p4_escr, escrmsr, escrvalue,
-		    cccrvalue);
-
-	} else if (rc == 1) {		/* 2nd CPU */
-
-		/*
-		 * Retrieve the CCCR and ESCR values from their MSRs,
-		 * and turn on the addition T[0/1] bits for the 2nd
-		 * CPU.  Remember the difference between the saved
-		 * value from the previous 'write()' operation to this
-		 * (PMC,CPU) pair and the current PMC reading; this is
-		 * used at PMCSTOP time to derive the correct
-		 * increment.
-		 */
-
-		cccrvalue = rdmsr(pd->pm_cccr_msr);
-
-		KASSERT((cccrvalue & P4_CCCR_Tx_MASK) ==
-		    (pm->pm_md.pm_p4.pm_p4_cccrvalue & P4_CCCR_Tx_MASK),
-		    ("[p4,%d] cpu=%d rc=%d ri=%d CCCR bits 0x%x PMC 0x%x",
-			__LINE__, cpu, rc, ri, cccrvalue & P4_CCCR_Tx_MASK,
-			pm->pm_md.pm_p4.pm_p4_cccrvalue & P4_CCCR_Tx_MASK));
-		KASSERT(cccrvalue & P4_CCCR_ENABLE,
-		    ("[p4,%d] 2nd cpu rc=%d cpu=%d ri=%d not running",
-			__LINE__, rc, cpu, ri));
-		KASSERT((cccrvalue & cccrtbits) == 0,
-		    ("[p4,%d] CCCR T0/T1 mismatch rc=%d cpu=%d ri=%d"
-		     "cccrvalue=0x%x tbits=0x%x", __LINE__, rc, cpu, ri,
-			cccrvalue, cccrtbits));
-
-		/* stop PMC */
-		wrmsr(pd->pm_cccr_msr, cccrvalue & ~P4_CCCR_ENABLE);
-
-		escrvalue = rdmsr(escrmsr);
-
-		KASSERT((escrvalue & P4_ESCR_Tx_MASK) ==
-		    (pm->pm_md.pm_p4.pm_p4_escrvalue & P4_ESCR_Tx_MASK),
-		    ("[p4,%d] Extra ESCR bits cpu=%d rc=%d ri=%d "
-			"escr=0x%x pm=0x%x", __LINE__, cpu, rc, ri,
-			escrvalue & P4_ESCR_Tx_MASK,
-			pm->pm_md.pm_p4.pm_p4_escrvalue & P4_ESCR_Tx_MASK));
-
-		KASSERT((escrvalue & escrtbits) == 0,
-		    ("[p4,%d] ESCR T0/T1 mismatch rc=%d cpu=%d ri=%d "
-		     "escrmsr=0x%x escrvalue=0x%x tbits=0x%x", __LINE__,
-			rc, cpu, ri, escrmsr, escrvalue, escrtbits));
-
-		/* read current value and save it */
-		P4_PCPU_SAVED_VALUE(pc,ri,cpu) =
-		    rdmsr(pd->pm_pmc_msr) & P4_PERFCTR_MASK;
-
-		/*
-		 * program the new bits into the ESCR and CCCR,
-		 * starting the PMC in the process.
-		 */
-
-		escrvalue |= escrtbits;
-		cccrvalue |= cccrvalue;
-
-		wrmsr(escrmsr, escrvalue);
-		wrmsr(pd->pm_cccr_msr, cccrvalue);
-
-		PMCDBG(MDP,STA,2,"p4-start/2 cpu=%d rc=%d ri=%d escr=%d"
-		    "escrmsr=0x%x escrvalue=0x%x cccr_config=0x%x",
-		    cpu, rc, ri, pm->pm_md.pm_p4.pm_p4_escr, escrmsr,
-		    escrvalue, cccrvalue);
-
-	} else
-		panic("invalid runcount %d\n", rc);
-
-	++rc;
-	P4_PCPU_SET_RUNCOUNT(pc,ri,rc);
-
-	mtx_unlock_spin(&pc->pc_mtx);
-
-	return 0;
-}
-
-/*
- * Stop a PMC.
- */
-
-static int
-p4_stop_pmc(int cpu, int ri)
-{
-	int rc;
-	uint32_t cccrvalue, cccrtbits, escrvalue, escrmsr, escrtbits;
-	struct pmc *pm;
-	struct p4_cpu *pc;
-	struct pmc_hw *phw;
-	struct p4pmc_descr *pd;
-	pmc_value_t tmp;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p4,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P4_NPMCS,
-	    ("[p4,%d] illegal row index %d", __LINE__, ri));
-
-	pd  = &p4_pmcdesc[ri];
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;
-
-	pc  = (struct p4_cpu *) pmc_pcpu[P4_TO_PHYSICAL_CPU(cpu)];
-	phw = pc->pc_hwpmcs[ri];
-
-	KASSERT(phw != NULL,
-	    ("[p4,%d] null phw for cpu%d, ri%d", __LINE__, cpu, ri));
-
-	pm  = phw->phw_pmc;
-
-	KASSERT(pm != NULL,
-	    ("[p4,%d] null pmc for cpu%d, ri%d", __LINE__, cpu, ri));
-
-	PMCDBG(MDP,STO,1, "p4-stop cpu=%d ri=%d", cpu, ri);
-
-	if (PMC_IS_SYSTEM_MODE(pm->pm_mode)) {
-		wrmsr(pd->pm_cccr_msr,
-		    pm->pm_md.pm_p4.pm_p4_cccrvalue & ~P4_CCCR_ENABLE);
-		return 0;
-	}
-
-	/*
-	 * Thread mode PMCs.
-	 *
-	 * On HTT machines, this PMC may be in use by two threads
-	 * running on two logical CPUS.  Thus we look at the
-	 * 'pm_runcount' field and only turn off the appropriate TO/T1
-	 * bits (and keep the PMC running).
-	 *
-	 * The 'pc_saved' field has the 'diff' between the value in
-	 * the hardware register at PMCSTART time and the nominal
-	 * start value for the PMC.  This diff is added to the current
-	 * PMC reading to derived the correct (absolute) return value.
-	 */
-
-	/* bits to mask */
-	cccrtbits = P4_CCCR_OVF_PMI_T0;
-	escrtbits = P4_ESCR_T0_OS | P4_ESCR_T0_USR;
-	if (pmc_cpu_is_logical(cpu)) {
-		cccrtbits <<= 1;
-		escrtbits >>= 2;
-	}
-
-	mtx_lock_spin(&pc->pc_mtx);
-
-	rc = P4_PCPU_GET_RUNCOUNT(pc,ri);
-
-	KASSERT(rc == 2 || rc == 1,
-	    ("[p4,%d] illegal runcount cpu=%d ri=%d rc=%d", __LINE__, cpu, ri,
-		rc));
-
-	--rc;
-
-	P4_PCPU_SET_RUNCOUNT(pc,ri,rc);
-
-	/* Stop this PMC */
-	cccrvalue = rdmsr(pd->pm_cccr_msr);
-	wrmsr(pd->pm_cccr_msr, cccrvalue & ~P4_CCCR_ENABLE);
-
-	escrmsr   = pm->pm_md.pm_p4.pm_p4_escrmsr;
-	escrvalue = rdmsr(escrmsr);
-
-	/* get the current PMC reading */
-	tmp = rdmsr(pd->pm_pmc_msr) & P4_PERFCTR_MASK;
-
-	if (rc == 1) {		/* need to keep the PMC running */
-
-		KASSERT(escrvalue & escrtbits,
-		    ("[p4,%d] ESCR T0/T1 mismatch cpu=%d ri=%d escrmsr=0x%x "
-		     "escrvalue=0x%x tbits=0x%x", __LINE__, cpu, ri, escrmsr,
-			escrvalue, escrtbits));
-
-		KASSERT(PMC_IS_COUNTING_MODE(pm->pm_mode) ||
-		    (cccrvalue & cccrtbits),
-		    ("[p4,%d] CCCR T0/T1 mismatch cpu=%d ri=%d cccrvalue=0x%x "
-		     "tbits=0x%x", __LINE__, cpu, ri, cccrvalue, cccrtbits));
-
-		escrvalue &= ~escrtbits;
-		cccrvalue &= ~cccrtbits;
-
-		wrmsr(escrmsr, escrvalue);
-		wrmsr(pd->pm_cccr_msr, cccrvalue);
-
-	}
-
-	PMCDBG(MDP,STO,2, "p4-stop/2 cpu=%d rc=%d ri=%d escrmsr=0x%x escrval=0x%x "
-	    "cccrval=0x%x", cpu, rc, ri, escrmsr, escrvalue, cccrvalue);
-
-	/* get the incremental count from this context switch */
-	tmp -= P4_PCPU_SAVED_VALUE(pc,ri,cpu);
-	if ((int64_t) tmp < 0)		/* counter wrap-around */
-		tmp = -tmp + 1;
-
-	P4_PCPU_PMC_VALUE(pc,ri,cpu) += tmp;
-
-	mtx_unlock_spin(&pc->pc_mtx);
-	return 0;
-}
-
-/*
- * Handle an interrupt.
- */
-
-static int
-p4_intr(int cpu, uintptr_t eip)
-{
-	(void) cpu;
-	(void) eip;
-
-	return 0;
-}
-
-/*
- * Describe a CPU's PMC state.
- */
-
-static int
-p4_describe(int cpu, int ri, struct pmc_info *pi,
-    struct pmc **ppmc)
-{
-	int error;
-	size_t copied;
-	struct pmc_hw *phw;
-	const struct p4pmc_descr *pd;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p4,%d] illegal CPU %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P4_NPMCS,
-	    ("[p4,%d] row-index %d out of range", __LINE__, ri));
-
-	PMCDBG(MDP,OPS,1,"p4-describe cpu=%d ri=%d", cpu, ri);
-
-	if (pmc_cpu_is_logical(cpu))
-		return EINVAL;
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pd  = &p4_pmcdesc[ri];
-
-	if ((error = copystr(pd->pm_descr.pd_name, pi->pm_name,
-		 PMC_NAME_MAX, &copied)) != 0)
-		return error;
-
-	pi->pm_class = pd->pm_descr.pd_class;
-	pi->pm_caps  = pd->pm_descr.pd_caps;
-	pi->pm_width = pd->pm_descr.pd_width;
-
-	if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
-		pi->pm_enabled = TRUE;
-		*ppmc          = phw->phw_pmc;
-	} else {
-		pi->pm_enabled = FALSE;
-		*ppmc          = NULL;
-	}
-
-	return 0;
-}
-
-/*
- * Get MSR# for use with RDPMC.
- */
-
-static int
-p4_get_msr(int ri, uint32_t *msr)
-{
-	KASSERT(ri >= 0 && ri < P4_NPMCS,
-	    ("[p4,%d] ri %d out of range", __LINE__, ri));
-
-	*msr = p4_pmcdesc[ri].pm_pmc_msr;
-	return 0;
-}
-
-
-int
-pmc_initialize_p4(struct pmc_mdep *pmc_mdep)
-{
-	struct p4_event_descr *pe;
-
-	KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0,
-	    ("[p4,%d] Initializing non-intel processor", __LINE__));
-
-	PMCDBG(MDP,INI,1, "%s", "p4-initialize");
-
-	switch (pmc_mdep->pmd_cputype) {
-	case PMC_CPU_INTEL_PIV:
-
-		pmc_mdep->pmd_npmc	    = P4_NPMCS;
-		pmc_mdep->pmd_classes[1]    = PMC_CLASS_P4;
-		pmc_mdep->pmd_nclasspmcs[1] = 18;
-
-		pmc_mdep->pmd_init    	    = p4_init;
-		pmc_mdep->pmd_cleanup 	    = p4_cleanup;
-		pmc_mdep->pmd_switch_in     = p4_switch_in;
-		pmc_mdep->pmd_switch_out    = p4_switch_out;
-		pmc_mdep->pmd_read_pmc 	    = p4_read_pmc;
-		pmc_mdep->pmd_write_pmc     = p4_write_pmc;
-		pmc_mdep->pmd_config_pmc    = p4_config_pmc;
-		pmc_mdep->pmd_allocate_pmc  = p4_allocate_pmc;
-		pmc_mdep->pmd_release_pmc   = p4_release_pmc;
-		pmc_mdep->pmd_start_pmc     = p4_start_pmc;
-		pmc_mdep->pmd_stop_pmc      = p4_stop_pmc;
-		pmc_mdep->pmd_intr	    = p4_intr;
-		pmc_mdep->pmd_describe      = p4_describe;
-		pmc_mdep->pmd_get_msr  	    = p4_get_msr; /* i386 */
-
-		/* model specific munging */
-		if ((cpu_id & 0xFFF) < 0xF27) {
-
-			/*
-			 * On P4 and Xeon with CPUID < (Family 15,
-			 * Model 2, Stepping 7), only one ESCR is
-			 * available for the IOQ_ALLOCATION event.
-			 */
-
-			pe = p4_find_event(PMC_EV_P4_IOQ_ALLOCATION);
-			pe->pm_escrs[1] = P4_ESCR_NONE;
-		}
-
-		break;
-
-	default:
-		KASSERT(0,("[p4,%d] Unknown CPU type", __LINE__));
-		return ENOSYS;
-	}
-
-	return 0;
-}
diff --git a/sys/hwpmc/hwpmc_ppro.c b/sys/hwpmc/hwpmc_ppro.c
deleted file mode 100644
index c08c509..0000000
--- a/sys/hwpmc/hwpmc_ppro.c
+++ /dev/null
@@ -1,741 +0,0 @@
-/*-
- * Copyright (c) 2003-2005 Joseph Koshy
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/pmc.h>
-#include <sys/pmckern.h>
-#include <sys/smp.h>
-#include <sys/systm.h>
-
-#include <machine/cputypes.h>
-#include <machine/md_var.h>
-
-/*
- * PENTIUM PRO SUPPORT
- */
-
-struct p6pmc_descr {
-	struct pmc_descr pm_descr; /* common information */
-	uint32_t	pm_pmc_msr;
-	uint32_t	pm_evsel_msr;
-};
-
-static struct p6pmc_descr p6_pmcdesc[P6_NPMCS] = {
-
-	/* TSC */
-	{
-		.pm_descr =
-		{
-			.pd_name  = "TSC",
-			.pd_class = PMC_CLASS_TSC,
-			.pd_caps  = PMC_CAP_READ,
-			.pd_width = 64
-		},
-		.pm_pmc_msr   = 0x10,
-		.pm_evsel_msr = ~0
-	},
-
-#define	P6_PMC_CAPS (PMC_CAP_INTERRUPT | PMC_CAP_USER | PMC_CAP_SYSTEM | \
-    PMC_CAP_EDGE | PMC_CAP_THRESHOLD | PMC_CAP_READ | PMC_CAP_WRITE |	 \
-    PMC_CAP_INVERT | PMC_CAP_QUALIFIER)
-
-	/* PMC 0 */
-	{
-		.pm_descr =
-		{
-			.pd_name  ="P6-0",
-			.pd_class = PMC_CLASS_P6,
-			.pd_caps  = P6_PMC_CAPS,
-			.pd_width = 40
-		},
-		.pm_pmc_msr   = P6_MSR_PERFCTR0,
-		.pm_evsel_msr = P6_MSR_EVSEL0
-	},
-
-	/* PMC 1 */
-	{
-		.pm_descr =
-		{
-			.pd_name  ="P6-1",
-			.pd_class = PMC_CLASS_P6,
-			.pd_caps  = P6_PMC_CAPS,
-			.pd_width = 40
-		},
-		.pm_pmc_msr   = P6_MSR_PERFCTR1,
-		.pm_evsel_msr = P6_MSR_EVSEL1
-	}
-};
-
-static enum pmc_cputype p6_cputype;
-
-/*
- * P6 Event descriptor
- */
-
-struct p6_event_descr {
-	const enum pmc_event pm_event;
-	uint32_t	     pm_evsel;
-	uint32_t	     pm_flags;
-	uint32_t	     pm_unitmask;
-};
-
-static const struct p6_event_descr p6_events[] = {
-
-#define	P6_EVDESCR(NAME, EVSEL, FLAGS, UMASK)	\
-	{					\
-		.pm_event = PMC_EV_P6_##NAME,	\
-		.pm_evsel = (EVSEL),		\
-		.pm_flags = (FLAGS),		\
-		.pm_unitmask = (UMASK)		\
-	}
-
-#define	P6F_P6		(1 << PMC_CPU_INTEL_P6)
-#define	P6F_CL		(1 << PMC_CPU_INTEL_CL)
-#define	P6F_PII		(1 << PMC_CPU_INTEL_PII)
-#define	P6F_PIII	(1 << PMC_CPU_INTEL_PIII)
-#define	P6F_PM		(1 << PMC_CPU_INTEL_PM)
-#define	P6F_CTR0	0x0001
-#define	P6F_CTR1	0x0002
-#define	P6F_ALL_CPUS	(P6F_P6 | P6F_PII | P6F_CL | P6F_PIII | P6F_PM)
-#define	P6F_ALL_CTRS	(P6F_CTR0 | P6F_CTR1)
-#define	P6F_ALL		(P6F_ALL_CPUS | P6F_ALL_CTRS)
-
-#define	P6_EVENT_VALID_FOR_CPU(P,CPU)	((P)->pm_flags & (1 << (CPU)))
-#define	P6_EVENT_VALID_FOR_CTR(P,CTR)	((P)->pm_flags & (1 << (CTR)))
-
-P6_EVDESCR(DATA_MEM_REFS,		0x43, P6F_ALL, 0x00),
-P6_EVDESCR(DCU_LINES_IN,		0x45, P6F_ALL, 0x00),
-P6_EVDESCR(DCU_M_LINES_IN,		0x46, P6F_ALL, 0x00),
-P6_EVDESCR(DCU_M_LINES_OUT,		0x47, P6F_ALL, 0x00),
-P6_EVDESCR(DCU_MISS_OUTSTANDING,	0x47, P6F_ALL, 0x00),
-P6_EVDESCR(IFU_FETCH,			0x80, P6F_ALL, 0x00),
-P6_EVDESCR(IFU_FETCH_MISS,		0x81, P6F_ALL, 0x00),
-P6_EVDESCR(ITLB_MISS,			0x85, P6F_ALL, 0x00),
-P6_EVDESCR(IFU_MEM_STALL,		0x86, P6F_ALL, 0x00),
-P6_EVDESCR(ILD_STALL,			0x87, P6F_ALL, 0x00),
-P6_EVDESCR(L2_IFETCH,			0x28, P6F_ALL, 0x0F),
-P6_EVDESCR(L2_LD,			0x29, P6F_ALL, 0x0F),
-P6_EVDESCR(L2_ST,			0x2A, P6F_ALL, 0x0F),
-P6_EVDESCR(L2_LINES_IN,			0x24, P6F_ALL, 0x0F),
-P6_EVDESCR(L2_LINES_OUT,		0x26, P6F_ALL, 0x0F),
-P6_EVDESCR(L2_M_LINES_INM,		0x25, P6F_ALL, 0x00),
-P6_EVDESCR(L2_M_LINES_OUTM,		0x27, P6F_ALL, 0x0F),
-P6_EVDESCR(L2_RQSTS,			0x2E, P6F_ALL, 0x0F),
-P6_EVDESCR(L2_ADS,			0x21, P6F_ALL, 0x00),
-P6_EVDESCR(L2_DBUS_BUSY,		0x22, P6F_ALL, 0x00),
-P6_EVDESCR(L2_DBUS_BUSY_RD,		0x23, P6F_ALL, 0x00),
-P6_EVDESCR(BUS_DRDY_CLOCKS,		0x62, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_LOCK_CLOCKS,		0x63, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_REQ_OUTSTANDING,		0x60, P6F_ALL, 0x00),
-P6_EVDESCR(BUS_TRAN_BRD,		0x65, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRAN_RFO,		0x66, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRANS_WB,		0x67, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRAN_IFETCH,		0x68, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRAN_INVAL,		0x69, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRAN_PWR,		0x6A, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRANS_P,			0x6B, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRANS_IO,		0x6C, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRAN_DEF,		0x6D, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRAN_BURST,		0x6E, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRAN_ANY,		0x70, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_TRAN_MEM,		0x6F, P6F_ALL, 0x20),
-P6_EVDESCR(BUS_DATA_RCV,		0x64, P6F_ALL, 0x00),
-P6_EVDESCR(BUS_BNR_DRV,			0x61, P6F_ALL, 0x00),
-P6_EVDESCR(BUS_HIT_DRV,			0x7A, P6F_ALL, 0x00),
-P6_EVDESCR(BUS_HITM_DRV,		0x7B, P6F_ALL, 0x00),
-P6_EVDESCR(BUS_SNOOP_STALL,		0x7E, P6F_ALL, 0x00),
-P6_EVDESCR(FLOPS,			0xC1, P6F_ALL_CPUS | P6F_CTR0, 0x00),
-P6_EVDESCR(FP_COMPS_OPS_EXE,		0x10, P6F_ALL_CPUS | P6F_CTR0, 0x00),
-P6_EVDESCR(FP_ASSIST,			0x11, P6F_ALL_CPUS | P6F_CTR1, 0x00),
-P6_EVDESCR(MUL,				0x12, P6F_ALL_CPUS | P6F_CTR1, 0x00),
-P6_EVDESCR(DIV,				0x13, P6F_ALL_CPUS | P6F_CTR1, 0x00),
-P6_EVDESCR(CYCLES_DIV_BUSY,		0x14, P6F_ALL_CPUS | P6F_CTR0, 0x00),
-P6_EVDESCR(LD_BLOCKS,			0x03, P6F_ALL, 0x00),
-P6_EVDESCR(SB_DRAINS,			0x04, P6F_ALL, 0x00),
-P6_EVDESCR(MISALIGN_MEM_REF,		0x05, P6F_ALL, 0x00),
-P6_EVDESCR(EMON_KNI_PREF_DISPATCHED,	0x07, P6F_PIII | P6F_ALL_CTRS, 0x03),
-P6_EVDESCR(EMON_KNI_PREF_MISS,		0x4B, P6F_PIII | P6F_ALL_CTRS, 0x03),
-P6_EVDESCR(INST_RETIRED,		0xC0, P6F_ALL, 0x00),
-P6_EVDESCR(UOPS_RETIRED,		0xC2, P6F_ALL, 0x00),
-P6_EVDESCR(INST_DECODED,		0xD0, P6F_ALL, 0x00),
-P6_EVDESCR(EMON_KNI_INST_RETIRED,	0xD8, P6F_PIII | P6F_ALL_CTRS, 0x01),
-P6_EVDESCR(EMON_KNI_COMP_INST_RET,	0xD9, P6F_PIII | P6F_ALL_CTRS, 0x01),
-P6_EVDESCR(HW_INT_RX,			0xC8, P6F_ALL, 0x00),
-P6_EVDESCR(CYCLES_INT_MASKED,		0xC6, P6F_ALL, 0x00),
-P6_EVDESCR(CYCLES_INT_PENDING_AND_MASKED, 0xC7, P6F_ALL, 0x00),
-P6_EVDESCR(BR_INST_RETIRED,		0xC4, P6F_ALL, 0x00),
-P6_EVDESCR(BR_MISS_PRED_RETIRED,	0xC5, P6F_ALL, 0x00),
-P6_EVDESCR(BR_TAKEN_RETIRED,		0xC9, P6F_ALL, 0x00),
-P6_EVDESCR(BR_MISS_PRED_TAKEN_RET, 	0xCA, P6F_ALL, 0x00),
-P6_EVDESCR(BR_INST_DECODED,		0xE0, P6F_ALL, 0x00),
-P6_EVDESCR(BTB_MISSES,			0xE2, P6F_ALL, 0x00),
-P6_EVDESCR(BR_BOGUS,			0xE4, P6F_ALL, 0x00),
-P6_EVDESCR(BACLEARS,			0xE6, P6F_ALL, 0x00),
-P6_EVDESCR(RESOURCE_STALLS,		0xA2, P6F_ALL, 0x00),
-P6_EVDESCR(PARTIAL_RAT_STALLS,		0xD2, P6F_ALL, 0x00),
-P6_EVDESCR(SEGMENT_REG_LOADS,		0x06, P6F_ALL, 0x00),
-P6_EVDESCR(CPU_CLK_UNHALTED,		0x79, P6F_ALL, 0x00),
-P6_EVDESCR(MMX_INSTR_EXEC,		0xB0,
-			P6F_ALL_CTRS | P6F_CL | P6F_PII, 0x00),
-P6_EVDESCR(MMX_SAT_INSTR_EXEC,		0xB1,
-			P6F_ALL_CTRS | P6F_PII | P6F_PIII, 0x00),
-P6_EVDESCR(MMX_UOPS_EXEC,		0xB2,
-			P6F_ALL_CTRS | P6F_PII | P6F_PIII, 0x0F),
-P6_EVDESCR(MMX_INSTR_TYPE_EXEC,		0xB3,
-			P6F_ALL_CTRS | P6F_PII | P6F_PIII, 0x3F),
-P6_EVDESCR(FP_MMX_TRANS,		0xCC,
-			P6F_ALL_CTRS | P6F_PII | P6F_PIII, 0x01),
-P6_EVDESCR(MMX_ASSIST,			0xCD,
-			P6F_ALL_CTRS | P6F_PII | P6F_PIII, 0x00),
-P6_EVDESCR(MMX_INSTR_RET,		0xCE, P6F_ALL_CTRS | P6F_PII, 0x00),
-P6_EVDESCR(SEG_RENAME_STALLS,		0xD4,
-			P6F_ALL_CTRS | P6F_PII | P6F_PIII, 0x0F),
-P6_EVDESCR(SEG_REG_RENAMES,		0xD5,
-			P6F_ALL_CTRS | P6F_PII | P6F_PIII, 0x0F),
-P6_EVDESCR(RET_SEG_RENAMES,		0xD6,
-			P6F_ALL_CTRS | P6F_PII | P6F_PIII, 0x00),
-P6_EVDESCR(EMON_EST_TRANS,		0x58, P6F_ALL_CTRS | P6F_PM, 0x02),
-P6_EVDESCR(EMON_THERMAL_TRIP,		0x59, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_INST_EXEC,		0x88, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_MISSP_EXEC,		0x89, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_BAC_MISSP_EXEC,		0x8A, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_CND_EXEC,			0x8B, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_CND_MISSP_EXEC,		0x8C, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_IND_EXEC,			0x8D, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_IND_MISSP_EXEC,		0x8E, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_RET_EXEC,			0x8F, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_RET_MISSP_EXEC,		0x90, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_RET_BAC_MISSP_EXEC,	0x91, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_CALL_EXEC,		0x92, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_CALL_MISSP_EXEC,		0x93, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(BR_IND_CALL_EXEC,		0x94, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(EMON_SIMD_INSTR_RETIRED,	0xCE, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(EMON_SYNCH_UOPS,		0xD3, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(EMON_ESP_UOPS,		0xD7, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(EMON_FUSED_UOPS_RET,		0xDA, P6F_ALL_CTRS | P6F_PM, 0x03),
-P6_EVDESCR(EMON_UNFUSION,		0xDB, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(EMON_PREF_RQSTS_UP,		0xF0, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(EMON_PREF_RQSTS_DN,		0xD8, P6F_ALL_CTRS | P6F_PM, 0x00),
-P6_EVDESCR(EMON_SSE_SSE2_INST_RETIRED,	0xD8, P6F_ALL_CTRS | P6F_PM, 0x03),
-P6_EVDESCR(EMON_SSE_SSE2_COMP_INST_RETIRED, 0xD9, P6F_ALL_CTRS | P6F_PM, 0x03)
-
-#undef	P6_EVDESCR
-};
-
-#define	P6_NEVENTS	(PMC_EV_P6_LAST - PMC_EV_P6_FIRST + 1)
-
-static const struct p6_event_descr *
-p6_find_event(enum pmc_event ev)
-{
-	int n;
-
-	for (n = 0; n < P6_NEVENTS; n++)
-		if (p6_events[n].pm_event == ev)
-			break;
-	if (n == P6_NEVENTS)
-		return NULL;
-	return &p6_events[n];
-}
-
-/*
- * Per-CPU data structure for P6 class CPUs
- *
- * [common stuff]
- * [3 struct pmc_hw pointers]
- * [3 struct pmc_hw structures]
- */
-
-struct p6_cpu {
-	struct pmc_cpu	pc_common;
-	struct pmc_hw	*pc_hwpmcs[P6_NPMCS];
-	struct pmc_hw	pc_p6pmcs[P6_NPMCS];
-};
-
-static int
-p6_init(int cpu)
-{
-	int n;
-	struct p6_cpu *pcs;
-	struct pmc_hw *phw;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p6,%d] bad cpu %d", __LINE__, cpu));
-
-	PMCDBG(MDP,INI,0,"p6-init cpu=%d", cpu);
-
-	MALLOC(pcs, struct p6_cpu *, sizeof(struct p6_cpu), M_PMC,
-	    M_WAITOK|M_ZERO);
-
-	if (pcs == NULL)
-		return ENOMEM;
-
-	phw = pcs->pc_p6pmcs;
-
-	for (n = 0; n < P6_NPMCS; n++, phw++) {
-		phw->phw_state   = PMC_PHW_FLAG_IS_ENABLED |
-		    PMC_PHW_CPU_TO_STATE(cpu) | PMC_PHW_INDEX_TO_STATE(n);
-		phw->phw_pmc     = NULL;
-		pcs->pc_hwpmcs[n] = phw;
-	}
-
-	/* Mark the TSC as shareable */
-	pcs->pc_hwpmcs[0]->phw_state |= PMC_PHW_FLAG_IS_SHAREABLE;
-
-	pmc_pcpu[cpu] = (struct pmc_cpu *) pcs;
-
-	return 0;
-}
-
-static int
-p6_cleanup(int cpu)
-{
-	struct pmc_cpu *pcs;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p6,%d] bad cpu %d", __LINE__, cpu));
-
-	PMCDBG(MDP,INI,0,"p6-cleanup cpu=%d", cpu);
-
-	if ((pcs = pmc_pcpu[cpu]) != NULL)
-		FREE(pcs, M_PMC);
-	pmc_pcpu[cpu] = NULL;
-
-	return 0;
-}
-
-static int
-p6_switch_in(struct pmc_cpu *pc)
-{
-	(void) pc;
-	return 0;
-}
-
-static int
-p6_switch_out(struct pmc_cpu *pc)
-{
-	(void) pc;
-	return 0;
-}
-
-static int
-p6_read_pmc(int cpu, int ri, pmc_value_t *v)
-{
-	struct pmc_hw *phw;
-	struct pmc *pm;
-	struct p6pmc_descr *pd;
-	pmc_value_t tmp;
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pm  = phw->phw_pmc;
-	pd  = &p6_pmcdesc[ri];
-
-	KASSERT(pm,
-	    ("[p6,%d] cpu %d ri %d pmc not configured", __LINE__, cpu, ri));
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;
-
-	tmp = rdmsr(pd->pm_pmc_msr) & P6_PERFCTR_MASK;
-	if (PMC_IS_SAMPLING_MODE(pm->pm_mode))
-		*v = -tmp;
-	else
-		*v = tmp;
-
-	PMCDBG(MDP,REA,1, "p6-read cpu=%d ri=%d msr=0x%x -> v=%jx", cpu, ri,
-	    pd->pm_pmc_msr, *v);
-
-	return 0;
-}
-
-static int
-p6_write_pmc(int cpu, int ri, pmc_value_t v)
-{
-	struct pmc_hw *phw;
-	struct pmc *pm;
-	struct p6pmc_descr *pd;
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pm  = phw->phw_pmc;
-	pd  = &p6_pmcdesc[ri];
-
-	KASSERT(pm,
-	    ("[p6,%d] cpu %d ri %d pmc not configured", __LINE__, cpu, ri));
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;
-
-	PMCDBG(MDP,WRI,1, "p6-write cpu=%d ri=%d msr=0x%x v=%jx", cpu, ri,
-	    pd->pm_pmc_msr, v);
-
-	if (PMC_IS_SAMPLING_MODE(pm->pm_mode))
-		v = -v;
-
-	wrmsr(pd->pm_pmc_msr, v & P6_PERFCTR_MASK);
-
-	return 0;
-}
-
-static int
-p6_config_pmc(int cpu, int ri, struct pmc *pm)
-{
-	struct pmc_hw *phw;
-
-	PMCDBG(MDP,CFG,1, "p6-config cpu=%d ri=%d pm=%p", cpu, ri, pm);
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	phw->phw_pmc = pm;
-
-	return 0;
-}
-
-/*
- * A pmc may be allocated to a given row index if:
- * - the event is valid for this CPU
- * - the event is valid for this counter index
- */
-
-static int
-p6_allocate_pmc(int cpu, int ri, struct pmc *pm,
-    const struct pmc_op_pmcallocate *a)
-{
-	uint32_t allowed_unitmask, caps, config, unitmask;
-	const struct p6pmc_descr *pd;
-	const struct p6_event_descr *pevent;
-	enum pmc_event ev;
-
-	(void) cpu;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p4,%d] illegal CPU %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P6_NPMCS,
-	    ("[p4,%d] illegal row-index value %d", __LINE__, ri));
-
-	pd = &p6_pmcdesc[ri];
-
-	PMCDBG(MDP,ALL,1, "p6-allocate ri=%d class=%d pmccaps=0x%x "
-	    "reqcaps=0x%x", ri, pd->pm_descr.pd_class, pd->pm_descr.pd_caps,
-	    pm->pm_caps);
-
-	/* check class */
-	if (pd->pm_descr.pd_class != pm->pm_class)
-		return EINVAL;
-
-	/* check requested capabilities */
-	caps = a->pm_caps;
-	if ((pd->pm_descr.pd_caps & caps) != caps)
-		return EPERM;
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC) {
-		/* TSC's are always allocated in system-wide counting mode */
-		if (a->pm_ev != PMC_EV_TSC_TSC ||
-		    a->pm_mode != PMC_MODE_SC)
-			return EINVAL;
-		return 0;
-	}
-
-	/*
-	 * P6 class events
-	 */
-
-	ev = pm->pm_event;
-
-	if (ev < PMC_EV_P6_FIRST || ev > PMC_EV_P6_LAST)
-		return EINVAL;
-
-	if ((pevent = p6_find_event(ev)) == NULL)
-		return ESRCH;
-
-	if (!P6_EVENT_VALID_FOR_CPU(pevent, p6_cputype) ||
-	    !P6_EVENT_VALID_FOR_CTR(pevent, (ri-1)))
-		return EINVAL;
-
-	/* For certain events, Pentium M differs from the stock P6 */
-	allowed_unitmask = 0;
-	if (p6_cputype == PMC_CPU_INTEL_PM) {
-		if (ev == PMC_EV_P6_L2_LD || ev == PMC_EV_P6_L2_LINES_IN ||
-		    ev == PMC_EV_P6_L2_LINES_OUT)
-			allowed_unitmask = P6_EVSEL_TO_UMASK(0x3F);
-		else if (ev == PMC_EV_P6_L2_M_LINES_OUTM)
-			allowed_unitmask = P6_EVSEL_TO_UMASK(0x30);
-	} else
-		allowed_unitmask = P6_EVSEL_TO_UMASK(pevent->pm_unitmask);
-
-	unitmask = a->pm_p6_config & P6_EVSEL_UMASK_MASK;
-	if (unitmask & ~allowed_unitmask) /* disallow reserved bits */
-		return EINVAL;
-
-	if (ev == PMC_EV_P6_MMX_UOPS_EXEC) /* hardcoded mask */
-		unitmask = P6_EVSEL_TO_UMASK(0x0F);
-
-	config = 0;
-
-	config |= P6_EVSEL_EVENT_SELECT(pevent->pm_evsel);
-
-	if (unitmask & (caps & PMC_CAP_QUALIFIER))
-		config |= unitmask;
-
-	if (caps & PMC_CAP_THRESHOLD)
-		config |= a->pm_p6_config & P6_EVSEL_CMASK_MASK;
-
-	/* set at least one of the 'usr' or 'os' caps */
-	if (caps & PMC_CAP_USER)
-		config |= P6_EVSEL_USR;
-	if (caps & PMC_CAP_SYSTEM)
-		config |= P6_EVSEL_OS;
-	if ((caps & (PMC_CAP_USER|PMC_CAP_SYSTEM)) == 0)
-		config |= (P6_EVSEL_USR|P6_EVSEL_OS);
-
-	if (caps & PMC_CAP_EDGE)
-		config |= P6_EVSEL_E;
-	if (caps & PMC_CAP_INVERT)
-		config |= P6_EVSEL_INV;
-	if (caps & PMC_CAP_INTERRUPT)
-		config |= P6_EVSEL_INT;
-
-	pm->pm_md.pm_p6.pm_p6_evsel = config;
-
-	PMCDBG(MDP,ALL,2, "p6-allocate config=0x%x", config);
-
-	return 0;
-}
-
-static int
-p6_release_pmc(int cpu, int ri, struct pmc *pm)
-{
-	struct pmc_hw *phw;
-
-	(void) pm;
-
-	PMCDBG(MDP,REL,1, "p6-release cpu=%d ri=%d pm=%p", cpu, ri, pm);
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p6,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P6_NPMCS,
-	    ("[p6,%d] illegal row-index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-
-	KASSERT(phw->phw_pmc == NULL,
-	    ("[p6,%d] PHW pmc %p != pmc %p", __LINE__, phw->phw_pmc, pm));
-
-	return 0;
-}
-
-static int
-p6_start_pmc(int cpu, int ri)
-{
-	uint32_t config;
-	struct pmc *pm;
-	struct pmc_hw *phw;
-	const struct p6pmc_descr *pd;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p6,%d] illegal CPU value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P6_NPMCS,
-	    ("[p6,%d] illegal row-index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pm  = phw->phw_pmc;
-	pd  = &p6_pmcdesc[ri];
-
-	KASSERT(pm,
-	    ("[p6,%d] starting cpu%d,ri%d with no pmc configured",
-		__LINE__, cpu, ri));
-
-	PMCDBG(MDP,STA,1, "p6-start cpu=%d ri=%d", cpu, ri);
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;	/* TSC are always running */
-
-	KASSERT(pd->pm_descr.pd_class == PMC_CLASS_P6,
-	    ("[p6,%d] unknown PMC class %d", __LINE__,
-		pd->pm_descr.pd_class));
-
-	config = pm->pm_md.pm_p6.pm_p6_evsel;
-
-	PMCDBG(MDP,STA,2, "p6-start/2 cpu=%d ri=%d evselmsr=0x%x config=0x%x",
-	    cpu, ri, pd->pm_evsel_msr, config);
-
-	if (pd->pm_evsel_msr == P6_MSR_EVSEL0) /* CTR 0 */
-		wrmsr(pd->pm_evsel_msr, config | P6_EVSEL_EN);
-	else {			/* CTR1 shares the enable bit CTR 0 */
-		wrmsr(pd->pm_evsel_msr, config);
-		wrmsr(P6_MSR_EVSEL0, rdmsr(P6_MSR_EVSEL0) | P6_EVSEL_EN);
-	}
-	return 0;
-}
-
-static int
-p6_stop_pmc(int cpu, int ri)
-{
-	uint32_t config;
-	struct pmc *pm;
-	struct pmc_hw *phw;
-	struct p6pmc_descr *pd;
-
-	KASSERT(cpu >= 0 && cpu < mp_ncpus,
-	    ("[p6,%d] illegal cpu value %d", __LINE__, cpu));
-	KASSERT(ri >= 0 && ri < P6_NPMCS,
-	    ("[p6,%d] illegal row index %d", __LINE__, ri));
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pm  = phw->phw_pmc;
-	pd  = &p6_pmcdesc[ri];
-
-	KASSERT(pm,
-	    ("[p6,%d] cpu%d ri%d no configured PMC to stop", __LINE__,
-		cpu, ri));
-
-	if (pd->pm_descr.pd_class == PMC_CLASS_TSC)
-		return 0;
-
-	KASSERT(pd->pm_descr.pd_class == PMC_CLASS_P6,
-	    ("[p6,%d] unknown PMC class %d", __LINE__,
-		pd->pm_descr.pd_class));
-
-	PMCDBG(MDP,STO,1, "p6-stop cpu=%d ri=%d", cpu, ri);
-
-	/*
-	 * If CTR0 is being turned off but CTR1 is active, we need
-	 * leave CTR0's EN field set.  If CTR1 is being stopped, it
-	 * suffices to zero its EVSEL register.
-	 */
-
-	if (ri == 1 &&
-	    pmc_pcpu[cpu]->pc_hwpmcs[2]->phw_pmc != NULL)
-		config = P6_EVSEL_EN;
-	else
-		config = 0;
-	wrmsr(pd->pm_evsel_msr, config);
-
-	PMCDBG(MDP,STO,2, "p6-stop/2 cpu=%d ri=%d config=0x%x", cpu, ri,
-	    config);
-	return 0;
-}
-
-static int
-p6_intr(int cpu, uintptr_t eip)
-{
-	(void) cpu;
-	(void) eip;
-	return 0;
-}
-
-static int
-p6_describe(int cpu, int ri, struct pmc_info *pi,
-    struct pmc **ppmc)
-{
-	int error;
-	size_t copied;
-	struct pmc_hw *phw;
-	struct p6pmc_descr *pd;
-
-	phw = pmc_pcpu[cpu]->pc_hwpmcs[ri];
-	pd  = &p6_pmcdesc[ri];
-
-	if ((error = copystr(pd->pm_descr.pd_name, pi->pm_name,
-		 PMC_NAME_MAX, &copied)) != 0)
-		return error;
-
-	pi->pm_class = pd->pm_descr.pd_class;
-	pi->pm_caps  = pd->pm_descr.pd_caps;
-	pi->pm_width = pd->pm_descr.pd_width;
-
-	if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
-		pi->pm_enabled = TRUE;
-		*ppmc          = phw->phw_pmc;
-	} else {
-		pi->pm_enabled = FALSE;
-		*ppmc          = NULL;
-	}
-
-	return 0;
-}
-
-static int
-p6_get_msr(int ri, uint32_t *msr)
-{
-	KASSERT(ri >= 0 && ri < P6_NPMCS,
-	    ("[p6,%d ri %d out of range", __LINE__, ri));
-
-	*msr = p6_pmcdesc[ri].pm_pmc_msr;
-	return 0;
-}
-
-int
-pmc_initialize_p6(struct pmc_mdep *pmc_mdep)
-{
-	KASSERT(strcmp(cpu_vendor, "GenuineIntel") == 0,
-	    ("[p6,%d] Initializing non-intel processor", __LINE__));
-
-	PMCDBG(MDP,INI,1, "%s", "p6-initialize");
-
-	switch (pmc_mdep->pmd_cputype) {
-
-		/*
-		 * P6 Family Processors
-		 */
-
-	case PMC_CPU_INTEL_P6:
-	case PMC_CPU_INTEL_CL:
-	case PMC_CPU_INTEL_PII:
-	case PMC_CPU_INTEL_PIII:
-	case PMC_CPU_INTEL_PM:
-
-		p6_cputype = pmc_mdep->pmd_cputype;
-
-		pmc_mdep->pmd_npmc          = P6_NPMCS;
-		pmc_mdep->pmd_classes[1]    = PMC_CLASS_P6;
-		pmc_mdep->pmd_nclasspmcs[1] = 2;
-
-		pmc_mdep->pmd_init    	    = p6_init;
-		pmc_mdep->pmd_cleanup 	    = p6_cleanup;
-		pmc_mdep->pmd_switch_in     = p6_switch_in;
-		pmc_mdep->pmd_switch_out    = p6_switch_out;
-		pmc_mdep->pmd_read_pmc 	    = p6_read_pmc;
-		pmc_mdep->pmd_write_pmc     = p6_write_pmc;
-		pmc_mdep->pmd_config_pmc    = p6_config_pmc;
-		pmc_mdep->pmd_allocate_pmc  = p6_allocate_pmc;
-		pmc_mdep->pmd_release_pmc   = p6_release_pmc;
-		pmc_mdep->pmd_start_pmc     = p6_start_pmc;
-		pmc_mdep->pmd_stop_pmc      = p6_stop_pmc;
-		pmc_mdep->pmd_intr	    = p6_intr;
-		pmc_mdep->pmd_describe      = p6_describe;
-		pmc_mdep->pmd_get_msr  	    = p6_get_msr; /* i386 */
-
-		break;
-	default:
-		KASSERT(0,("[p6,%d] Unknown CPU type", __LINE__));
-		return ENOSYS;
-	}
-
-	return 0;
-}