d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwpmc: Add IDs for Intel Comet/Ice/Tiger/Rocketlake CPUs.

Browse Source 
MFC after:	1 month
This commit is contained in:
Alexander Motin 2021-11-25 19:17:58 -05:00
parent 7e1d3eefd4
commit 913c07a049
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/hwpmc/hwpmc_core.c
View File

@ -761,6 +761,8 @@ iap_allocate_pmc(int cpu, int ri, struct pmc *pm,
break;
case PMC_CPU_INTEL_SKYLAKE:
case PMC_CPU_INTEL_SKYLAKE_XEON:
case PMC_CPU_INTEL_ICELAKE:
case PMC_CPU_INTEL_ICELAKE_XEON:
case PMC_CPU_INTEL_BROADWELL:
case PMC_CPU_INTEL_BROADWELL_XEON:
case PMC_CPU_INTEL_SANDYBRIDGE:
@ -1263,7 +1265,7 @@ pmc_core_initialize(struct pmc_mdep *md, int maxcpu, int version_override)
PMCDBG3(MDP,INI,1,"core-init cputype=%d ncpu=%d ipa-version=%d",
core_cputype, maxcpu, ipa_version);
if (ipa_version < 1 || ipa_version > 4 ||
if (ipa_version < 1 || ipa_version > 5 ||
(core_cputype != PMC_CPU_INTEL_CORE && ipa_version == 1)) {
/* Unknown PMC architecture. */
printf("hwpc_core: unknown PMC architecture: %d\n",

23
sys/dev/hwpmc/hwpmc_intel.c
View File

@ -169,6 +169,9 @@ pmc_intel_initialize(void)
/* Kabylake */
case 0x8E: /* Per Intel document 325462-063US July 2017. */
case 0x9E: /* Per Intel document 325462-063US July 2017. */
/* Cometlake */
case 0xA5:
case 0xA6:
cputype = PMC_CPU_INTEL_SKYLAKE;
nclasses = 3;
break;
@ -176,6 +179,22 @@ pmc_intel_initialize(void)
cputype = PMC_CPU_INTEL_SKYLAKE_XEON;
nclasses = 3;
break;
/* Icelake */
case 0x7D:
case 0x7E:
/* Tigerlake */
case 0x8C:
case 0x8D:
/* Rocketlake */
case 0xA7:
cputype = PMC_CPU_INTEL_ICELAKE;
nclasses = 3;
break;
case 0x6A:
case 0x6C:
cputype = PMC_CPU_INTEL_ICELAKE_XEON;
nclasses = 3;
break;
case 0x3D:
case 0x47:
cputype = PMC_CPU_INTEL_BROADWELL;
@ -242,6 +261,8 @@ pmc_intel_initialize(void)
case PMC_CPU_INTEL_BROADWELL_XEON:
case PMC_CPU_INTEL_SKYLAKE_XEON:
case PMC_CPU_INTEL_SKYLAKE:
case PMC_CPU_INTEL_ICELAKE:
case PMC_CPU_INTEL_ICELAKE_XEON:
case PMC_CPU_INTEL_CORE:
case PMC_CPU_INTEL_CORE2:
case PMC_CPU_INTEL_CORE2EXTREME:
@ -325,6 +346,8 @@ pmc_intel_finalize(struct pmc_mdep *md)
case PMC_CPU_INTEL_BROADWELL_XEON:
case PMC_CPU_INTEL_SKYLAKE_XEON:
case PMC_CPU_INTEL_SKYLAKE:
case PMC_CPU_INTEL_ICELAKE:
case PMC_CPU_INTEL_ICELAKE_XEON:
case PMC_CPU_INTEL_CORE:
case PMC_CPU_INTEL_CORE2:
case PMC_CPU_INTEL_CORE2EXTREME:

2
sys/sys/pmc.h
View File

@ -111,6 +111,8 @@ extern char pmc_cpuid[PMC_CPUID_LEN];
__PMC_CPU(INTEL_SKYLAKE, 0x98, "Intel Skylake") \
__PMC_CPU(INTEL_SKYLAKE_XEON, 0x99, "Intel Skylake Xeon") \
__PMC_CPU(INTEL_ATOM_GOLDMONT, 0x9A, "Intel Atom Goldmont") \
__PMC_CPU(INTEL_ICELAKE, 0x9B, "Intel Icelake") \
__PMC_CPU(INTEL_ICELAKE_XEON, 0x9C, "Intel Icelake Xeon") \
__PMC_CPU(INTEL_XSCALE, 0x100, "Intel XScale") \
__PMC_CPU(MIPS_24K, 0x200, "MIPS 24K") \
__PMC_CPU(MIPS_OCTEON, 0x201, "Cavium Octeon") \