Skip to content

Commit 2da202a

Browse files
Kan LiangPeter Zijlstra
authored andcommitted
perf/x86/cstate: Add Raptor Lake support
Raptor Lake is Intel's successor to Alder lake. From the perspective of Intel cstate residency counters, there is nothing changed compared with Alder lake. Share adl_cstates with Alder lake. Update the comments for Raptor Lake. Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lore.kernel.org/r/1647366360-82824-2-git-send-email-kan.liang@linux.intel.com
1 parent c61759e commit 2da202a

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

arch/x86/events/intel/cstate.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* Model specific counters:
4141
* MSR_CORE_C1_RES: CORE C1 Residency Counter
4242
* perf code: 0x00
43-
* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL
43+
* Available model: SLM,AMT,GLM,CNL,ICX,TNT,ADL,RPL
4444
* Scope: Core (each processor core has a MSR)
4545
* MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter
4646
* perf code: 0x01
@@ -51,49 +51,50 @@
5151
* perf code: 0x02
5252
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
5353
* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
54-
* TGL,TNT,RKL,ADL
54+
* TGL,TNT,RKL,ADL,RPL
5555
* Scope: Core
5656
* MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter
5757
* perf code: 0x03
5858
* Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML,
59-
* ICL,TGL,RKL,ADL
59+
* ICL,TGL,RKL,ADL,RPL
6060
* Scope: Core
6161
* MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter.
6262
* perf code: 0x00
6363
* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
64-
* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL
64+
* KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
65+
* RPL
6566
* Scope: Package (physical package)
6667
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
6768
* perf code: 0x01
6869
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL,
6970
* GLM,CNL,KBL,CML,ICL,TGL,TNT,RKL,
70-
* ADL
71+
* ADL,RPL
7172
* Scope: Package (physical package)
7273
* MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter.
7374
* perf code: 0x02
7475
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
7576
* SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,
76-
* TGL,TNT,RKL,ADL
77+
* TGL,TNT,RKL,ADL,RPL
7778
* Scope: Package (physical package)
7879
* MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.
7980
* perf code: 0x03
8081
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL,
81-
* KBL,CML,ICL,TGL,RKL,ADL
82+
* KBL,CML,ICL,TGL,RKL,ADL,RPL
8283
* Scope: Package (physical package)
8384
* MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter.
8485
* perf code: 0x04
8586
* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL,
86-
* ADL
87+
* ADL,RPL
8788
* Scope: Package (physical package)
8889
* MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter.
8990
* perf code: 0x05
9091
* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL,
91-
* ADL
92+
* ADL,RPL
9293
* Scope: Package (physical package)
9394
* MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
9495
* perf code: 0x06
9596
* Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL,
96-
* TNT,RKL,ADL
97+
* TNT,RKL,ADL,RPL
9798
* Scope: Package (physical package)
9899
*
99100
*/
@@ -680,6 +681,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
680681
X86_MATCH_INTEL_FAM6_MODEL(ROCKETLAKE, &icl_cstates),
681682
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_cstates),
682683
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, &adl_cstates),
684+
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_cstates),
683685
{ },
684686
};
685687
MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

0 commit comments

Comments
 (0)