linux-kernel - [tip:perf/core] perf/x86/rapl: Add Skylake server model detection

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-348c5ac6c7dc117e1de095bf07c86c31101d56f3@git.kernel.org>
Date:	Wed, 8 Jun 2016 04:03:42 -0700
From:	tip-bot for Jacob Pan <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	alexander.shishkin@...ux.intel.com, vincent.weaver@...ne.edu,
	torvalds@...ux-foundation.org, bp@...en8.de,
	jacob.jun.pan@...ux.intel.com, dave@...1.net, dvlasenk@...hat.com,
	mingo@...nel.org, dave.hansen@...ux.intel.com, hpa@...or.com,
	linux-kernel@...r.kernel.org, peterz@...radead.org,
	jolsa@...hat.com, acme@...hat.com, luto@...capital.net,
	brgerst@...il.com, tglx@...utronix.de, eranian@...gle.com
Subject: [tip:perf/core] perf/x86/rapl: Add Skylake server model detection

Commit-ID:  348c5ac6c7dc117e1de095bf07c86c31101d56f3
Gitweb:     http://git.kernel.org/tip/348c5ac6c7dc117e1de095bf07c86c31101d56f3
Author:     Jacob Pan <jacob.jun.pan@...ux.intel.com>
AuthorDate: Thu, 2 Jun 2016 17:19:53 -0700
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 8 Jun 2016 12:06:01 +0200

perf/x86/rapl: Add Skylake server model detection

SKX uses similar RAPL interface as Broadwell server.

Signed-off-by: Jacob Pan <jacob.jun.pan@...ux.intel.com>
Signed-off-by: Dave Hansen <dave.hansen@...ux.intel.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Dave Hansen <dave@...1.net>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Stephane Eranian <eranian@...gle.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: Vince Weaver <vincent.weaver@...ne.edu>
Cc: jacob.jun.pan@...el.com
Link: http://lkml.kernel.org/r/20160603001953.38848836@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/events/intel/rapl.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 8012fe6..d0c58b3 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -807,6 +807,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
 
 	X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_MOBILE,  skl_rapl_init),
 	X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_DESKTOP, skl_rapl_init),
+	X86_RAPL_MODEL_MATCH(INTEL_FAM6_SKYLAKE_X,	 hsx_rapl_init),
 	{},
 };