Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753313AbdGXKWm (ORCPT ); Mon, 24 Jul 2017 06:22:42 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59237 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752320AbdGXKWe (ORCPT ); Mon, 24 Jul 2017 06:22:34 -0400 Date: Mon, 24 Jul 2017 03:17:46 -0700 From: tip-bot for Kan Liang Message-ID: Cc: eranian@google.com, tglx@linutronix.de, torvalds@linux-foundation.org, jolsa@redhat.com, linux-kernel@vger.kernel.org, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, peterz@infradead.org, hpa@zytor.com, acme@redhat.com, kan.liang@intel.com, mingo@kernel.org Reply-To: eranian@google.com, tglx@linutronix.de, torvalds@linux-foundation.org, jolsa@redhat.com, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, peterz@infradead.org, acme@redhat.com, kan.liang@intel.com, mingo@kernel.org In-Reply-To: <1499967350-10385-4-git-send-email-kan.liang@intel.com> References: <1499967350-10385-4-git-send-email-kan.liang@intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf/x86/intel/uncore: Fix Skylake server CHA LLC_LOOKUP event umask Git-Commit-ID: c3f02682a101b83424128915b14e60c156c03f02 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 Content-Length: 1775 Lines: 41 Commit-ID: c3f02682a101b83424128915b14e60c156c03f02 Gitweb: http://git.kernel.org/tip/c3f02682a101b83424128915b14e60c156c03f02 Author: Kan Liang AuthorDate: Thu, 13 Jul 2017 10:35:47 -0700 Committer: Ingo Molnar CommitDate: Mon, 24 Jul 2017 11:13:18 +0200 perf/x86/intel/uncore: Fix Skylake server CHA LLC_LOOKUP event umask Correct the umask for LLC_LOOKUP.LOCAL and LLC_LOOKUP.REMOTE events Signed-off-by: Kan Liang Acked-by: Peter Zijlstra Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1499967350-10385-4-git-send-email-kan.liang@intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/uncore_snbep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index fbf8f6e..a30bf97 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -3333,8 +3333,8 @@ static struct extra_reg skx_uncore_cha_extra_regs[] = { SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4), SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4), SNBEP_CBO_EVENT_EXTRA_REG(0x1134, 0xffff, 0x4), - SNBEP_CBO_EVENT_EXTRA_REG(0x2134, 0xffff, 0x4), - SNBEP_CBO_EVENT_EXTRA_REG(0x8134, 0xffff, 0x4), + SNBEP_CBO_EVENT_EXTRA_REG(0x3134, 0xffff, 0x4), + SNBEP_CBO_EVENT_EXTRA_REG(0x9134, 0xffff, 0x4), }; static u64 skx_cha_filter_mask(int fields)