Skip to content

Commit d903b6d

Browse files
Pu WenIngo Molnar
authored andcommitted
perf/x86/rapl: Add Hygon Fam18h RAPL support
Hygon Family 18h(Dhyana) support RAPL in bit 14 of CPUID 0x80000007 EDX, and has MSRs RAPL_PWR_UNIT/CORE_ENERGY_STAT/PKG_ENERGY_STAT. So add Hygon Dhyana Family 18h support for RAPL. The output is available via the energy-pkg pseudo event: $ perf stat -a -I 1000 --per-socket -e power/energy-pkg/ [ mingo: Tidied up the initializers. ] Signed-off-by: Pu Wen <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 112a0e4 commit d903b6d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/events/rapl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
787787
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &model_hsx),
788788
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &model_skl),
789789
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &model_skl),
790-
X86_MATCH_VENDOR_FAM(AMD, 0x17, &model_amd_fam17h),
790+
X86_MATCH_VENDOR_FAM(AMD, 0x17, &model_amd_fam17h),
791+
X86_MATCH_VENDOR_FAM(HYGON, 0x18, &model_amd_fam17h),
791792
{},
792793
};
793794
MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);

0 commit comments

Comments
 (0)