From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751859AbcDWMxa (ORCPT ); Sat, 23 Apr 2016 08:53:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39010 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751283AbcDWMx2 (ORCPT ); Sat, 23 Apr 2016 08:53:28 -0400 Date: Sat, 23 Apr 2016 05:52:46 -0700 From: tip-bot for Andi Kleen Message-ID: Cc: ak@linux.intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, eranian@google.com, torvalds@linux-foundation.org, vincent.weaver@maine.edu, peterz@infradead.org, jolsa@redhat.com, hpa@zytor.com, acme@redhat.com Reply-To: hpa@zytor.com, jolsa@redhat.com, acme@redhat.com, mingo@kernel.org, ak@linux.intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, eranian@google.com, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <1460751933-2264-1-git-send-email-andi@firstfloor.org> References: <1460751933-2264-1-git-send-email-andi@firstfloor.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/intel: Add model number for Skylake Server to perf Git-Commit-ID: b89c173788c3a8ed571652c203bf59a0e9d700aa 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b89c173788c3a8ed571652c203bf59a0e9d700aa Gitweb: http://git.kernel.org/tip/b89c173788c3a8ed571652c203bf59a0e9d700aa Author: Andi Kleen AuthorDate: Fri, 15 Apr 2016 13:25:33 -0700 Committer: Ingo Molnar CommitDate: Sat, 23 Apr 2016 13:46:44 +0200 perf/x86/intel: Add model number for Skylake Server to perf Everything the same as base Skylake, just a new model number. Signed-off-by: Andi Kleen 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 Link: http://lkml.kernel.org/r/1460751933-2264-1-git-send-email-andi@firstfloor.org Signed-off-by: Ingo Molnar --- arch/x86/events/intel/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 68fa55b..aff7988 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3639,6 +3639,7 @@ __init int intel_pmu_init(void) case 78: /* 14nm Skylake Mobile */ case 94: /* 14nm Skylake Desktop */ + case 85: /* 14nm Skylake Server */ x86_pmu.late_ack = true; memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids)); memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));