The following commit has been merged into the perf/core branch of tip: Commit-ID: f649fc2eefdef7a67698a3c584222c5c8c5a6785 Gitweb: https://git.kernel.org/tip/f649fc2eefdef7a67698a3c584222c5c8c5a6785 Author: Kan Liang <kan.li...@linux.intel.com> AuthorDate: Thu, 07 May 2020 06:14:18 -07:00 Committer: Peter Zijlstra <pet...@infradead.org> CommitterDate: Tue, 19 May 2020 20:34:16 +02:00
perf/x86/rapl: Add Ice Lake RAPL support Enable RAPL support for Intel Ice Lake X and Ice Lake D. For RAPL support, it is identical to Sky Lake X. Reported-by: Stephane Eranian <eran...@google.com> Signed-off-by: Kan Liang <kan.li...@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org> Link: https://lkml.kernel.org/r/1588857258-38213-1-git-send-email-kan.li...@linux.intel.com --- 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 a5dbd25..9e1e141 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -738,6 +738,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &model_hsw), X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &model_skl), X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, &model_skl), + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, &model_hsx), + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, &model_hsx), X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &model_skl), X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &model_skl), {},
