From fc8e826433a5a05cb6dfa47fabe3a958318716a3 Mon Sep 17 00:00:00 2001 From: Kan Liang Date: Thu, 7 May 2020 06:14:18 -0700 Subject: [PATCH 2650/2944] perf/x86/rapl: Add Ice Lake RAPL support to #33635199 commit f649fc2eefdef7a67698a3c584222c5c8c5a6785 upstream Enable RAPL support for Intel Ice Lake X and Ice Lake D. For RAPL support, it is identical to Sky Lake X. [ Artie: fixes conflicts in: arch/x86/events/intel/rapl.c ] Reported-by: Stephane Eranian Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/1588857258-38213-1-git-send-email-kan.liang@linux.intel.com Signed-off-by: Artie Ding Reviewed-by: Zelin Deng Reviewed-by: Shile Zhang Reviewed-by: Baolin Wang --- arch/x86/events/intel/rapl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 5a2a3bf..f0e0ba8 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -744,6 +744,8 @@ static int __init init_rapl_pmus(void) X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_X, model_hsw), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, model_hsw), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE, model_skl), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_XEON_D, model_hsx), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_X, model_hsx), {}, }; -- 1.8.3.1