aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Pan <[email protected]>2016-06-02 17:19:53 -0700
committerIngo Molnar <[email protected]>2016-06-08 12:06:01 +0200
commit348c5ac6c7dc117e1de095bf07c86c31101d56f3 (patch)
tree16f458e932af8ca8dd06962f7e504cc56e795e50
parenta07301ab3dabd1e31696c1bf1775aba24eb7573d (diff)
perf/x86/rapl: Add Skylake server model detection
SKX uses similar RAPL interface as Broadwell server. Signed-off-by: Jacob Pan <[email protected]> Signed-off-by: Dave Hansen <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vince Weaver <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
-rw-r--r--arch/x86/events/intel/rapl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 8012fe6c7c8b..d0c58b35155f 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),
{},
};