Skip to content

Commit 2c3aedd

Browse files
zhang-ruiPeter Zijlstra
authored andcommitted
perf/x86/intel/cstate: Fix Alderlake/Raptorlake/Meteorlake
For Alderlake, the spec changes after the patch submitted and PC7/PC9 are removed. Raptorlake and Meteorlake, which copy the Alderlake cstate PMU, also don't have PC7/PC9. Remove PC7/PC9 support for Alderlake/Raptorlake/Meteorlake. Fixes: d0ca946 ("perf/x86/cstate: Add Alder Lake CPU support") Signed-off-by: Zhang Rui <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Kan Liang <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 0c8ea05 commit 2c3aedd

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

arch/x86/events/intel/cstate.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
* MSR_PKG_C7_RESIDENCY: Package C7 Residency Counter.
8282
* perf code: 0x03
8383
* Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL,
84-
* KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL
84+
* KBL,CML,ICL,TGL,RKL
8585
* Scope: Package (physical package)
8686
* MSR_PKG_C8_RESIDENCY: Package C8 Residency Counter.
8787
* perf code: 0x04
@@ -90,8 +90,7 @@
9090
* Scope: Package (physical package)
9191
* MSR_PKG_C9_RESIDENCY: Package C9 Residency Counter.
9292
* perf code: 0x05
93-
* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL,
94-
* ADL,RPL,MTL
93+
* Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL
9594
* Scope: Package (physical package)
9695
* MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
9796
* perf code: 0x06
@@ -636,9 +635,7 @@ static const struct cstate_model adl_cstates __initconst = {
636635
.pkg_events = BIT(PERF_CSTATE_PKG_C2_RES) |
637636
BIT(PERF_CSTATE_PKG_C3_RES) |
638637
BIT(PERF_CSTATE_PKG_C6_RES) |
639-
BIT(PERF_CSTATE_PKG_C7_RES) |
640638
BIT(PERF_CSTATE_PKG_C8_RES) |
641-
BIT(PERF_CSTATE_PKG_C9_RES) |
642639
BIT(PERF_CSTATE_PKG_C10_RES),
643640
};
644641

0 commit comments

Comments
 (0)