Skip to content

Commit 01f2ea5

Browse files
Kan Liangingomolnar
authored andcommitted
perf/x86/cstate: Add Meteor Lake support
Meteor Lake is Intel's successor to Raptor lake. From the perspective of Intel cstate residency counters, there is nothing changed compared with Raptor lake. Share adl_cstates with Raptor lake. Update the comments for Meteor Lake. Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@kernel.org> Reviewed-by: Andi Kleen <ak@linux.intel.com> Link: https://lore.kernel.org/r/20230104201349.1451191-6-kan.liang@linux.intel.com
1 parent b7bfaa7 commit 01f2ea5

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

arch/x86/events/intel/cstate.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
* MSR_CORE_C1_RES: CORE C1 Residency Counter
4242
* perf code: 0x00
4343
* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL
44+
* MTL
4445
* Scope: Core (each processor core has a MSR)
4546
* MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter
4647
* perf code: 0x01
@@ -51,50 +52,50 @@
5152
* perf code: 0x02
5253
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
5354
* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
54-
* TGL,TNT,RKL,ADL,RPL,SPR
55+
* TGL,TNT,RKL,ADL,RPL,SPR,MTL
5556
* Scope: Core
5657
* MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter
5758
* perf code: 0x03
5859
* Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML,
59-
* ICL,TGL,RKL,ADL,RPL
60+
* ICL,TGL,RKL,ADL,RPL,MTL
6061
* Scope: Core
6162
* MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter.
6263
* perf code: 0x00
6364
* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
6465
* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
65-
* RPL,SPR
66+
* RPL,SPR,MTL
6667
* Scope: Package (physical package)
6768
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
6869
* perf code: 0x01
6970
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL,
7071
* GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL,
71-
* ADL,RPL
72+
* ADL,RPL,MTL
7273
* Scope: Package (physical package)
7374
* MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter.
7475
* perf code: 0x02
7576
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
7677
* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
77-
* TGL,TNT,RKL,ADL,RPL,SPR
78+
* TGL,TNT,RKL,ADL,RPL,SPR,MTL
7879
* Scope: Package (physical package)
7980
* MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.
8081
* perf code: 0x03
8182
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL,
82-
* KBL,CML,ICL,TGL,RKL,ADL,RPL
83+
* KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL
8384
* Scope: Package (physical package)
8485
* MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter.
8586
* perf code: 0x04
8687
* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL,
87-
* ADL,RPL
88+
* ADL,RPL,MTL
8889
* Scope: Package (physical package)
8990
* MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter.
9091
* perf code: 0x05
9192
* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL,
92-
* ADL,RPL
93+
* ADL,RPL,MTL
9394
* Scope: Package (physical package)
9495
* MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
9596
* perf code: 0x06
9697
* Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL,
97-
* TNT,RKL,ADL,RPL
98+
* TNT,RKL,ADL,RPL,MTL
9899
* Scope: Package (physical package)
99100
*
100101
*/
@@ -686,6 +687,8 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
686687
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_cstates),
687688
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &adl_cstates),
688689
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_cstates),
690+
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE, &adl_cstates),
691+
X86_MATCH_INTEL_FAM6_MODEL(METEORLAKE_L, &adl_cstates),
689692
{ },
690693
};
691694
MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

0 commit comments

Comments
 (0)