From patchwork Wed Nov 7 19:19:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sukadev Bhattiprolu X-Patchwork-Id: 197721 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id CF1962C060D for ; Thu, 8 Nov 2012 06:19:41 +1100 (EST) Received: by ozlabs.org (Postfix) id 3C1402C04ED; Thu, 8 Nov 2012 06:18:58 +1100 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e32.co.us.ibm.com", Issuer "GeoTrust SSL CA" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 81ADB2C04E8 for ; Thu, 8 Nov 2012 06:18:57 +1100 (EST) Received: from /spool/local by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Nov 2012 12:18:54 -0700 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Nov 2012 12:18:47 -0700 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id B7A2E1FF001B for ; Wed, 7 Nov 2012 12:18:44 -0700 (MST) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qA7JIguk066632 for ; Wed, 7 Nov 2012 12:18:44 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qA7JIbw9021769 for ; Wed, 7 Nov 2012 12:18:40 -0700 Received: from suka ([9.47.24.134]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qA7JIZ3T021655; Wed, 7 Nov 2012 12:18:36 -0700 Received: by suka (Postfix, from userid 155514) id 5B2BA803A; Wed, 7 Nov 2012 11:19:52 -0800 (PST) Date: Wed, 7 Nov 2012 11:19:52 -0800 From: Sukadev Bhattiprolu To: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo , Anton Blanchard , robert.richter@amd.com Subject: [PATCH 4/4] perf: Create a sysfs entry for Power event format Message-ID: <20121107191951.GD16211@us.ibm.com> References: <20121107191818.GA16211@us.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121107191818.GA16211@us.ibm.com> X-Operating-System: Linux 2.0.32 on an i486 User-Agent: Mutt/1.5.20 (2009-06-14) X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12110719-5406-0000-0000-000001D69B01 Cc: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From bafc551c31ce23c1cba0b75d23de6c46aba90f26 Mon Sep 17 00:00:00 2001 From: Sukadev Bhattiprolu Date: Tue, 6 Nov 2012 16:30:28 -0800 Subject: [PATCH 4/4] perf: Create a sysfs entry for Power event format Create a sysfs entry, '/sys/bus/event_source/devices/cpu/format/event' which describes the format of a POWER cpu. $ cat /sys/bus/event_source/devices/cpu/format/event config:0-20 The format of the event is the same for all POWER cpus, so bulk of this change is in the code common to POWER cpus. Signed-off-by: Sukadev Bhattiprolu --- arch/powerpc/include/asm/perf_event_server.h | 8 ++++++++ arch/powerpc/perf/core-book3s.c | 19 +++++++++++++++++++ arch/powerpc/perf/power7-pmu.c | 1 + 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h index ad84f73..20a49bf 100644 --- a/arch/powerpc/include/asm/perf_event_server.h +++ b/arch/powerpc/include/asm/perf_event_server.h @@ -130,3 +130,11 @@ extern ssize_t power_events_sysfs_show(struct device *dev, .attr = __ATTR(_name, 0444, power_events_sysfs_show, NULL),\ .id = PM_##_id, \ }; + +/* + * Format of a perf event is the same on all POWER cpus. Declare a + * common sysfs attribute group that individual POWER cpus can share. + */ +extern struct attribute_group power_pmu_format_group; + + diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 19b23bd..388e2a1 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -1315,6 +1315,25 @@ ssize_t power_events_sysfs_show(struct device *dev, return sprintf(page, "event=0x%02llx\n", pmu_attr->id); } +static ssize_t power_config_sysfs_show(struct device *dev, + struct device_attribute *attr, char *page) +{ + return sprintf(page, "config:0-20\n"); +} + +static struct device_attribute config_dev_attr = \ + __ATTR(event, 0444, power_config_sysfs_show, NULL); + +static struct attribute *power_pmu_format_attr[] = { + &config_dev_attr.attr, + NULL, +}; + +struct attribute_group power_pmu_format_group = { + .name = "format", + .attrs = power_pmu_format_attr, +}; + struct pmu power_pmu = { .pmu_enable = power_pmu_enable, .pmu_disable = power_pmu_disable, diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c index 31c61ab..aa9f588 100644 --- a/arch/powerpc/perf/power7-pmu.c +++ b/arch/powerpc/perf/power7-pmu.c @@ -387,6 +387,7 @@ static struct attribute_group power7_pmu_events_group = { }; static const struct attribute_group *power7_pmu_attr_groups[] = { + &power_pmu_format_group, &power7_pmu_events_group, NULL, };