RE: [PATCH RESEND] perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

[Wang, Wendy]

Verified on SRF-SP, the Perf PC2 counter is updated:

[root@p-srf07 ~]# perf stat --per-socket  -e cstate_pkg/c2-residency/ sleep 20

 Performance counter stats for 'system wide':

S0        1      9,589,297,024      cstate_pkg/c2-residency/
S1        1     10,204,349,952      cstate_pkg/c2-residency/

      20.003533150 seconds time elapsed

[root@p-srf07 ~]# perf stat --per-socket  -e cstate_pkg/c2-residency/ sleep 20

 Performance counter stats for 'system wide':

S0        1      9,309,806,784      cstate_pkg/c2-residency/
S1        1     10,897,684,928      cstate_pkg/c2-residency/

      20.004747926 seconds time elapsed

Tested-by: Wendy Wang <wendy.wang@xxxxxxxxx>


-----Original Message-----
From: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx> 
Sent: Wednesday, May 15, 2024 11:22 AM
To: peterz@xxxxxxxxxxxxx
Cc: kan.liang@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; linux-perf-users@xxxxxxxxxxxxxxx; x86@xxxxxxxxxx; Zhang, Rui <rui.zhang@xxxxxxxxx>; Bityutskiy, Artem <artem.bityutskiy@xxxxxxxxx>; Wang, Wendy <wendy.wang@xxxxxxxxx>
Subject: [PATCH RESEND] perf/x86/intel/cstate: Add pkg C2 residency counter for Sierra Forest

Package C2 residency counter is also available on Sierra Forest.
So add it support in srf_cstates.

Cc: Rui Zhang <rui.zhang@xxxxxxxxx>
Cc: Artem Bityutskiy <artem.bityutskiy@xxxxxxxxx>
Cc: Wendy Wang <wendy.wang@xxxxxxxxx>
Fixes: 3877d55a0db2 ("perf/x86/intel/cstate: Add Sierra Forest support")
Signed-off-by: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx>
---
 arch/x86/events/intel/cstate.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c index e64eaa8dda5a..4cd36848cfff 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -64,7 +64,7 @@
  *			       perf code: 0x00
  *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
  *						KBL,CML,ICL,ICX,TGL,TNT,RKL,ADL,
- *						RPL,SPR,MTL
+ *						RPL,SPR,MTL,SRF
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
@@ -683,7 +683,8 @@ static const struct cstate_model srf_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 
-	.pkg_events		= BIT(PERF_CSTATE_PKG_C6_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES),
 
 	.module_events		= BIT(PERF_CSTATE_MODULE_C6_RES),
 };
--
2.43.0