From dce2713886487c6540a84fc8a9afcde5660dd934 Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Tue, 8 Sep 2020 16:47:40 -0500 Subject: [PATCH 2659/2944] perf/x86/rapl: Add AMD Fam19h RAPL support to #33635199 commit a77259bdcb62a2c345914df659a1fbc421269a8b upstream Family 19h RAPL support did not change from Family 17h; extend the existing Fam17h support to work on Family 19h too. [ Artie: fixes conflicts in: arch/x86/events/rapl.c ] Signed-off-by: Kim Phillips Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20200908214740.18097-8-kim.phillips@amd.com Signed-off-by: Artie Ding Reviewed-by: Zelin Deng Reviewed-by: Shile Zhang Reviewed-by: Baolin Wang --- 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 7ccddb8..7d3a37d 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -779,6 +779,7 @@ static int __init init_rapl_pmus(void) X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_X, model_hsx), 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), {}, }; -- 1.8.3.1