Commit 502d012a authored by Zhang Rui's avatar Zhang Rui Committed by Yunying Sun
Browse files

perf/x86/cstate: Add SAPPHIRERAPIDS_X CPU support 

mainline inclusion
from mainline-v5.18-rc4
commit 528c9f1d
category: feature
feature: EMR PMU support
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6YO4Z
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=528c9f1daf20da14d3e7348dc4b1d7c55743ee64



Intel-SIG: commit 528c9f1d perf/x86/cstate: Add SAPPHIRERAPIDS_X
CPU support
Backport as a dependency for adding EMR PMU support to OLK-5.10 kernel.

-------------------------------------

From the perspective of Intel cstate residency counters,
SAPPHIRERAPIDS_X is the same as ICELAKE_X.

Share the code with it. And update the comments for SAPPHIRERAPIDS_X.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Link: https://lkml.kernel.org/r/20220415104520.2737004-1-rui.zhang@intel.com


Signed-off-by: default avatarYunying Sun <yunying.sun@intel.com>
parent 0f756f5e

arch/x86/events/intel/cstate.c

+4 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
 *			       perf code: 0x02

 *			       Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,

 *						SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,

 *						TGL,TNT

 *						TGL,TNT,SPR

 *			       Scope: Core

 *	MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter

 *			       perf code: 0x03
@@ -61,7 +61,7 @@ 
 *	MSR_PKG_C2_RESIDENCY:  Package C2 Residency Counter.

 *			       perf code: 0x00

 *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,

 *						KBL,CML,ICL,ICX,TGL,TNT

 *						KBL,CML,ICL,ICX,TGL,TNT,SPR

 *			       Scope: Package (physical package)

 *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.

 *			       perf code: 0x01
@@ -72,7 +72,7 @@ 
 *			       perf code: 0x02

 *			       Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,

 *						SKL,KNL,GLM,CNL,KBL,CML,ICL,ICX,

 *						TGL,TNT

 *						TGL,TNT,SPR

 *			       Scope: Package (physical package)

 *	MSR_PKG_C7_RESIDENCY:  Package C7 Residency Counter.

 *			       perf code: 0x03
@@ -657,6 +657,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { 
	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE,		&icl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X,		&icx_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D,		&icx_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X,	&icx_cstates),



	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L,		&icl_cstates),

	X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE,		&icl_cstates),