2c2
< * Copyright (c) 2003, Joseph Koshy
---
> * Copyright (c) 2003-2005 Joseph Koshy
26c26
< * $FreeBSD: head/sys/amd64/include/pmc_mdep.h 145337 2005-04-20 20:22:33Z marcel $
---
> * $FreeBSD: head/sys/amd64/include/pmc_mdep.h 147191 2005-06-09 19:45:09Z jkoshy $
34c34,35
< #include <machine/specialreg.h>
---
> #include <dev/hwpmc/hwpmc_amd.h>
> #include <dev/hwpmc/hwpmc_piv.h>
36c37,41
< /* AMD K7 PMCs */
---
> union pmc_md_op_pmcallocate {
> struct pmc_md_amd_op_pmcallocate pm_amd;
> struct pmc_md_p4_op_pmcallocate pm_p4;
> uint64_t __pad[4];
> };
38c43,45
< #define K8_NPMCS 5 /* 1 TSC + 4 PMCs */
---
> /* Logging */
> #define PMCLOG_READADDR PMCLOG_READ64
> #define PMCLOG_EMITADDR PMCLOG_EMIT64
40,48c47
< #define K8_PMC_COUNTERMASK 0xFF000000
< #define K8_PMC_TO_COUNTER(x) (((x) << 24) & K8_PMC_COUNTERMASK)
< #define K8_PMC_INVERT (1 << 23)
< #define K8_PMC_ENABLE (1 << 22)
< #define K8_PMC_INT (1 << 20)
< #define K8_PMC_PC (1 << 19)
< #define K8_PMC_EDGE (1 << 18)
< #define K8_PMC_OS (1 << 17)
< #define K8_PMC_USR (1 << 16)
---
> #ifdef _KERNEL
50,55c49,52
< #define K8_PMC_UNITMASK_M 0x10
< #define K8_PMC_UNITMASK_O 0x08
< #define K8_PMC_UNITMASK_E 0x04
< #define K8_PMC_UNITMASK_S 0x02
< #define K8_PMC_UNITMASK_I 0x01
< #define K8_PMC_UNITMASK_MOESI 0x1F
---
> union pmc_md_pmc {
> struct pmc_md_amd_pmc pm_amd;
> struct pmc_md_p4_pmc pm_p4;
> };
57,63c54
< #define K8_PMC_UNITMASK 0xFF00
< #define K8_PMC_EVENTMASK 0x00FF
< #define K8_PMC_TO_UNITMASK(x) (((x) << 8) & K8_PMC_UNITMASK)
< #define K8_PMC_TO_EVENTMASK(x) ((x) & 0xFF)
< #define K8_VALID_BITS (K8_PMC_COUNTERMASK | K8_PMC_INVERT | \
< K8_PMC_ENABLE | K8_PMC_INT | K8_PMC_PC | K8_PMC_EDGE | K8_PMC_OS | \
< K8_PMC_USR | K8_PMC_UNITMASK | K8_PMC_EVENTMASK)
---
> struct pmc;
65,66d55
< #ifdef _KERNEL
<
71,73c60
< #if defined(__amd64__)
< struct pmc_mdep *pmc_amd_initialize(void);
< #endif /* defined(__i386__) */
---
> void pmc_x86_lapic_enable_pmc_interrupt(void);
75c62
< #endif /* _KERNEL */
---
> #endif