Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754037AbdGXKXG (ORCPT ); Mon, 24 Jul 2017 06:23:06 -0400 Received: from terminus.zytor.com ([65.50.211.136]:53275 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753225AbdGXKWi (ORCPT ); Mon, 24 Jul 2017 06:22:38 -0400 Date: Mon, 24 Jul 2017 03:17:21 -0700 From: tip-bot for Kan Liang Message-ID: Cc: eranian@google.com, kan.liang@intel.com, jolsa@redhat.com, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, acme@redhat.com, torvalds@linux-foundation.org Reply-To: jolsa@redhat.com, vincent.weaver@maine.edu, linux-kernel@vger.kernel.org, kan.liang@intel.com, eranian@google.com, acme@redhat.com, torvalds@linux-foundation.org, mingo@kernel.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de In-Reply-To: <1499967350-10385-3-git-send-email-kan.liang@intel.com> References: <1499967350-10385-3-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 PCU PMU event format Git-Commit-ID: bab4e569e80c07ba6fe5e4f2d815adeef26cee94 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: 2462 Lines: 67 Commit-ID: bab4e569e80c07ba6fe5e4f2d815adeef26cee94 Gitweb: http://git.kernel.org/tip/bab4e569e80c07ba6fe5e4f2d815adeef26cee94 Author: Kan Liang AuthorDate: Thu, 13 Jul 2017 10:35:46 -0700 Committer: Ingo Molnar CommitDate: Mon, 24 Jul 2017 11:13:18 +0200 perf/x86/intel/uncore: Fix Skylake server PCU PMU event format PCU event format for SKX are different from snbep. Introduce a new format group for SKX PCU. 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-3-git-send-email-kan.liang@intel.com Signed-off-by: Ingo Molnar --- arch/x86/events/intel/uncore_snbep.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index 19a00a7..fbf8f6e 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c @@ -3492,6 +3492,26 @@ static struct intel_uncore_type skx_uncore_irp = { .format_group = &skx_uncore_format_group, }; +static struct attribute *skx_uncore_pcu_formats_attr[] = { + &format_attr_event.attr, + &format_attr_umask.attr, + &format_attr_edge.attr, + &format_attr_inv.attr, + &format_attr_thresh8.attr, + &format_attr_occ_invert.attr, + &format_attr_occ_edge_det.attr, + &format_attr_filter_band0.attr, + &format_attr_filter_band1.attr, + &format_attr_filter_band2.attr, + &format_attr_filter_band3.attr, + NULL, +}; + +static struct attribute_group skx_uncore_pcu_format_group = { + .name = "format", + .attrs = skx_uncore_pcu_formats_attr, +}; + static struct intel_uncore_ops skx_uncore_pcu_ops = { IVBEP_UNCORE_MSR_OPS_COMMON_INIT(), .hw_config = hswep_pcu_hw_config, @@ -3510,7 +3530,7 @@ static struct intel_uncore_type skx_uncore_pcu = { .box_ctl = HSWEP_PCU_MSR_PMON_BOX_CTL, .num_shared_regs = 1, .ops = &skx_uncore_pcu_ops, - .format_group = &snbep_uncore_pcu_format_group, + .format_group = &skx_uncore_pcu_format_group, }; static struct intel_uncore_type *skx_msr_uncores[] = {