The following commit has been merged into the perf/core branch of tip: Commit-ID: a77259bdcb62a2c345914df659a1fbc421269a8b Gitweb: https://git.kernel.org/tip/a77259bdcb62a2c345914df659a1fbc421269a8b Author: Kim Phillips <[email protected]> AuthorDate: Tue, 08 Sep 2020 16:47:40 -05:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Thu, 10 Sep 2020 11:19:36 +02:00
perf/x86/rapl: Add AMD Fam19h RAPL support Family 19h RAPL support did not change from Family 17h; extend the existing Fam17h support to work on Family 19h too. Signed-off-by: Kim Phillips <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lkml.kernel.org/r/[email protected] --- arch/x86/events/rapl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index 67b411f..7c0120e 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -815,6 +815,7 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(SAPPHIRERAPIDS_X, &model_spr), X86_MATCH_VENDOR_FAM(AMD, 0x17, &model_amd_fam17h), X86_MATCH_VENDOR_FAM(HYGON, 0x18, &model_amd_fam17h), + X86_MATCH_VENDOR_FAM(AMD, 0x19, &model_amd_fam17h), {}, }; MODULE_DEVICE_TABLE(x86cpu, rapl_model_match);
