diff options
| author | rrs <rrs@FreeBSD.org> | 2015-03-24 20:00:11 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2015-03-24 20:00:11 +0000 |
| commit | 0444d8258d3c6c2219b8aadd39daf2fe9473512c (patch) | |
| tree | 4d16eb1cb375dcd059efa00e91a45c0fbf17563a /sys/dev/hwpmc/hwpmc_intel.c | |
| parent | f5cf31bac5259172697ccde44e661519990bc4b4 (diff) | |
| download | FreeBSD-src-0444d8258d3c6c2219b8aadd39daf2fe9473512c.zip FreeBSD-src-0444d8258d3c6c2219b8aadd39daf2fe9473512c.tar.gz | |
MFC of r277177 and r279894 with the fixes for the PMC for Haswell.
Sponsored by: Netflix Inc.
Diffstat (limited to 'sys/dev/hwpmc/hwpmc_intel.c')
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_intel.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c index 9fd02889..cb313c2 100644 --- a/sys/dev/hwpmc/hwpmc_intel.c +++ b/sys/dev/hwpmc/hwpmc_intel.c @@ -171,7 +171,14 @@ pmc_intel_initialize(void) cputype = PMC_CPU_INTEL_IVYBRIDGE_XEON; nclasses = 3; break; + case 0x3F: /* Per Intel document 325462-045US 09/2014. */ + case 0x46: /* Per Intel document 325462-045US 09/2014. */ + /* Should 46 be XEON. probably its own? */ + cputype = PMC_CPU_INTEL_HASWELL_XEON; + nclasses = 3; + break; case 0x3C: /* Per Intel document 325462-045US 01/2013. */ + case 0x45: /* Per Intel document 325462-045US 09/2014. */ cputype = PMC_CPU_INTEL_HASWELL; nclasses = 5; break; @@ -224,6 +231,7 @@ pmc_intel_initialize(void) case PMC_CPU_INTEL_SANDYBRIDGE_XEON: case PMC_CPU_INTEL_IVYBRIDGE_XEON: case PMC_CPU_INTEL_HASWELL: + case PMC_CPU_INTEL_HASWELL_XEON: error = pmc_core_initialize(pmc_mdep, ncpus); break; @@ -309,6 +317,7 @@ pmc_intel_finalize(struct pmc_mdep *md) case PMC_CPU_INTEL_COREI7: case PMC_CPU_INTEL_NEHALEM_EX: case PMC_CPU_INTEL_HASWELL: + case PMC_CPU_INTEL_HASWELL_XEON: case PMC_CPU_INTEL_IVYBRIDGE: case PMC_CPU_INTEL_SANDYBRIDGE: case PMC_CPU_INTEL_WESTMERE: |
