From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84B32C10F13 for ; Tue, 16 Apr 2019 11:39:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 592072077C for ; Tue, 16 Apr 2019 11:39:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728927AbfDPLjw (ORCPT ); Tue, 16 Apr 2019 07:39:52 -0400 Received: from terminus.zytor.com ([198.137.202.136]:42379 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725787AbfDPLjw (ORCPT ); Tue, 16 Apr 2019 07:39:52 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x3GBddBV3429093 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 16 Apr 2019 04:39:39 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x3GBddal3429090; Tue, 16 Apr 2019 04:39:39 -0700 Date: Tue, 16 Apr 2019 04:39:39 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Kan Liang Message-ID: Cc: vincent.weaver@maine.edu, peterz@infradead.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, hpa@zytor.com, torvalds@linux-foundation.org, jolsa@redhat.com, kan.liang@linux.intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, eranian@google.com, acme@redhat.com Reply-To: acme@redhat.com, vincent.weaver@maine.edu, torvalds@linux-foundation.org, kan.liang@linux.intel.com, hpa@zytor.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, eranian@google.com, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, jolsa@redhat.com In-Reply-To: <20190402194509.2832-11-kan.liang@linux.intel.com> References: <20190402194509.2832-11-kan.liang@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel/rapl: Add Icelake support Git-Commit-ID: b3377c3acb9e54cf86efcfe25f2e792bca599ed4 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b3377c3acb9e54cf86efcfe25f2e792bca599ed4 Gitweb: https://git.kernel.org/tip/b3377c3acb9e54cf86efcfe25f2e792bca599ed4 Author: Kan Liang AuthorDate: Tue, 2 Apr 2019 12:45:07 -0700 Committer: Ingo Molnar CommitDate: Tue, 16 Apr 2019 12:26:18 +0200 perf/x86/intel/rapl: Add Icelake support Icelake support the same RAPL counters as Skylake. Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Cc: acme@kernel.org Cc: jolsa@kernel.org Link: https://lkml.kernel.org/r/20190402194509.2832-11-kan.liang@linux.intel.com Signed-off-by: Ingo Molnar --- 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 94dc564146ca..37ebf6fc5415 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -775,6 +775,8 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_X, hsw_rapl_init), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, hsw_rapl_init), + + X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_MOBILE, skl_rapl_init), {}, };