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: d0ca946bcf84 ("perf/x86/cstate: Add Alder Lake CPU support")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Link: https://lore.kernel.org/r/20240628031758.43103-2-rui.zhang@intel.com

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index e64eaa8dda5a45e7d8938d31afd2a0d9434469f9..bf0bfd783715f1d24d392becbfaea5a2fdeeecd7 100644 (file)
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -81,7 +81,7 @@
  *     MSR_PKG_C7_RESIDENCY:  Package C7 Residency Counter.
  *                            perf code: 0x03
  *                            Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL,
- *                                             KBL,CML,ICL,TGL,RKL,ADL,RPL,MTL
+ *                                             KBL,CML,ICL,TGL,RKL
  *                            Scope: Package (physical package)
  *     MSR_PKG_C8_RESIDENCY:  Package C8 Residency Counter.
  *                            perf code: 0x04
@@ -90,8 +90,7 @@
  *                            Scope: Package (physical package)
  *     MSR_PKG_C9_RESIDENCY:  Package C9 Residency Counter.
  *                            perf code: 0x05
- *                            Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL,
- *                                             ADL,RPL,MTL
+ *                            Available model: HSW ULT,KBL,CNL,CML,ICL,TGL,RKL
  *                            Scope: Package (physical package)
  *     MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
  *                            perf code: 0x06
@@ -636,9 +635,7 @@ static const struct cstate_model adl_cstates __initconst = {
        .pkg_events             = BIT(PERF_CSTATE_PKG_C2_RES) |
                                  BIT(PERF_CSTATE_PKG_C3_RES) |
                                  BIT(PERF_CSTATE_PKG_C6_RES) |
-                                 BIT(PERF_CSTATE_PKG_C7_RES) |
                                  BIT(PERF_CSTATE_PKG_C8_RES) |
-                                 BIT(PERF_CSTATE_PKG_C9_RES) |
                                  BIT(PERF_CSTATE_PKG_C10_RES),
 };