Commit d903b6d0 authored Jul 20, 2020 by Pu Wen Committed by Ingo Molnar Jul 28, 2020

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 <puwen@hygon.cn>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200720082205.1307-1-puwen@hygon.cn

parent 112a0e41

arch/x86/events/rapl.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -788,6 +788,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = {
		X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &model_skl),
		X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &model_skl),
		X86_MATCH_VENDOR_FAM(AMD, 0x17, &model_amd_fam17h),
		X86_MATCH_VENDOR_FAM(HYGON, 0x18, &model_amd_fam17h),
		{},
		};
		MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);

Admin message