Skip to content

Commit ecf71fb

Browse files
Kan LiangIngo Molnar
authored andcommitted
perf/x86/cstate: Add Tremont support
Tremont is Intel's successor to Goldmont Plus. From the perspective of Intel cstate residency counters, there is nothing changed compared with Goldmont Plus and Goldmont. Share glm_cstates with Goldmont Plus and Goldmont. Update the comments for Tremont. Signed-off-by: Kan Liang <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Reviewed-by: Andi Kleen <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent eda23b3 commit ecf71fb

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

arch/x86/events/intel/cstate.c

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,18 @@
4040
* Model specific counters:
4141
* MSR_CORE_C1_RES: CORE C1 Residency Counter
4242
* perf code: 0x00
43-
* Available model: SLM,AMT,GLM,CNL
43+
* Available model: SLM,AMT,GLM,CNL,TNT
4444
* Scope: Core (each processor core has a MSR)
4545
* MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter
4646
* perf code: 0x01
4747
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,GLM,
48-
* CNL,KBL,CML
48+
* CNL,KBL,CML,TNT
4949
* Scope: Core
5050
* MSR_CORE_C6_RESIDENCY: CORE C6 Residency Counter
5151
* perf code: 0x02
5252
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
53-
* SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL
53+
* SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL,
54+
* TNT
5455
* Scope: Core
5556
* MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter
5657
* perf code: 0x03
@@ -60,17 +61,18 @@
6061
* MSR_PKG_C2_RESIDENCY: Package C2 Residency Counter.
6162
* perf code: 0x00
6263
* Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
63-
* KBL,CML,ICL,TGL
64+
* KBL,CML,ICL,TGL,TNT
6465
* Scope: Package (physical package)
6566
* MSR_PKG_C3_RESIDENCY: Package C3 Residency Counter.
6667
* perf code: 0x01
6768
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL,
68-
* GLM,CNL,KBL,CML,ICL,TGL
69+
* GLM,CNL,KBL,CML,ICL,TGL,TNT
6970
* Scope: Package (physical package)
7071
* MSR_PKG_C6_RESIDENCY: Package C6 Residency Counter.
7172
* perf code: 0x02
72-
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW
73-
* SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL
73+
* Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
74+
* SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL,
75+
* TNT
7476
* Scope: Package (physical package)
7577
* MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.
7678
* perf code: 0x03
@@ -87,7 +89,8 @@
8789
* Scope: Package (physical package)
8890
* MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
8991
* perf code: 0x06
90-
* Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL
92+
* Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL,
93+
* TNT
9194
* Scope: Package (physical package)
9295
*
9396
*/
@@ -640,8 +643,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = {
640643

641644
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates),
642645
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_D, glm_cstates),
643-
644646
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),
647+
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_TREMONT_D, glm_cstates),
648+
X86_CSTATES_MODEL(INTEL_FAM6_ATOM_TREMONT, glm_cstates),
645649

646650
X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_L, icl_cstates),
647651
X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE, icl_cstates),

0 commit comments

Comments
 (0)