From: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
To: mpe@ellerman.id.au
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Hemant Kumar <hemant@linux.vnet.ibm.com>,
"Gautham R . Shenoy" <ego@linux.vnet.ibm.com>,
Balbir Singh <bsingharora@gmail.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
Anton Blanchard <anton@samba.org>,
Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>,
Michael Neuling <mikey@neuling.org>,
Stewart Smith <stewart@linux.vnet.ibm.com>,
Daniel Axtens <dja@axtens.net>,
Stephane Eranian <eranian@google.com>,
Anju T Sudhakar <anju@linux.vnet.ibm.com>,
Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Subject: [PATCH v5 09/13] powerpc/powernv: Thread IMC events detection
Date: Thu, 16 Mar 2017 13:05:03 +0530 [thread overview]
Message-ID: <1489649707-8021-10-git-send-email-maddy@linux.vnet.ibm.com> (raw)
In-Reply-To: <1489649707-8021-1-git-send-email-maddy@linux.vnet.ibm.com>
From: Hemant Kumar <hemant@linux.vnet.ibm.com>
Patch adds support for detection of thread IMC events. It adds a new
domain IMC_DOMAIN_THREAD and it is determined with the help of the
compatibility string "ibm,imc-counters-thread" based on the IMC device
tree.
Cc: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Michael Neuling <mikey@neuling.org>
Cc: Stewart Smith <stewart@linux.vnet.ibm.com>
Cc: Daniel Axtens <dja@axtens.net>
Cc: Stephane Eranian <eranian@google.com>
Cc: Anju T Sudhakar <anju@linux.vnet.ibm.com>
Signed-off-by: Hemant Kumar <hemant@linux.vnet.ibm.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/imc-pmu.h | 2 ++
arch/powerpc/perf/imc-pmu.c | 1 +
arch/powerpc/platforms/powernv/opal-imc.c | 11 +++++++++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/arch/powerpc/include/asm/imc-pmu.h b/arch/powerpc/include/asm/imc-pmu.h
index 5e76cd06d6d8..f2b4f122e6c2 100644
--- a/arch/powerpc/include/asm/imc-pmu.h
+++ b/arch/powerpc/include/asm/imc-pmu.h
@@ -32,6 +32,7 @@
#define IMC_DTB_COMPAT "ibm,opal-in-memory-counters"
#define IMC_DTB_NEST_COMPAT "ibm,imc-counters-nest"
#define IMC_DTB_CORE_COMPAT "ibm,imc-counters-core"
+#define IMC_DTB_THREAD_COMPAT "ibm,imc-counters-thread"
/*
* Structure to hold per chip specific memory address
@@ -70,6 +71,7 @@ struct imc_pmu {
*/
#define IMC_DOMAIN_NEST 1
#define IMC_DOMAIN_CORE 2
+#define IMC_DOMAIN_THREAD 3
#define UNKNOWN_DOMAIN -1
diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c
index 6d5fda9279c0..32eea6941e95 100644
--- a/arch/powerpc/perf/imc-pmu.c
+++ b/arch/powerpc/perf/imc-pmu.c
@@ -26,6 +26,7 @@ struct imc_pmu *core_imc_pmu;
/* Needed for sanity check */
extern u64 nest_max_offset;
extern u64 core_max_offset;
+extern u64 thread_max_offset;
PMU_FORMAT_ATTR(event, "config:0-20");
static struct attribute *imc_format_attrs[] = {
diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
index 3d60549d006f..70f4b0924fae 100644
--- a/arch/powerpc/platforms/powernv/opal-imc.c
+++ b/arch/powerpc/platforms/powernv/opal-imc.c
@@ -39,6 +39,7 @@ extern int init_imc_pmu(struct imc_events *events,
int idx, struct imc_pmu *pmu_ptr);
u64 nest_max_offset;
u64 core_max_offset;
+u64 thread_max_offset;
static int imc_event_info(char *name, struct imc_events *events)
{
@@ -86,6 +87,10 @@ static void update_max_value(u32 value, int pmu_domain)
if (core_max_offset < value)
core_max_offset = value;
break;
+ case IMC_DOMAIN_THREAD:
+ if (thread_max_offset < value)
+ thread_max_offset = value;
+ break;
default:
/* Unknown domain, return */
return;
@@ -239,6 +244,8 @@ int imc_get_domain(struct device_node *pmu_dev)
return IMC_DOMAIN_NEST;
if (of_device_is_compatible(pmu_dev, IMC_DTB_CORE_COMPAT))
return IMC_DOMAIN_CORE;
+ if (of_device_is_compatible(pmu_dev, IMC_DTB_THREAD_COMPAT))
+ return IMC_DOMAIN_THREAD;
else
return UNKNOWN_DOMAIN;
}
@@ -277,7 +284,7 @@ static void imc_free_events(struct imc_events *events, int nr_entries)
/*
* imc_pmu_create : Takes the parent device which is the pmu unit and a
* pmu_index as the inputs.
- * Allocates memory for the pmu, sets up its domain (NEST or CORE), and
+ * Allocates memory for the pmu, sets up its domain (NEST/CORE/THREAD), and
* allocates memory for the events supported by this pmu. Assigns a name for
* the pmu. Calls imc_events_node_parser() to setup the individual events.
* If everything goes fine, it calls, init_imc_pmu() to setup the pmu device
@@ -305,7 +312,7 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index)
if (pmu_ptr->domain == UNKNOWN_DOMAIN)
goto free_pmu;
- /* Needed for hotplug/migration */
+ /* Needed for hotplug/migration for nest and core IMC PMUs */
if (pmu_ptr->domain == IMC_DOMAIN_CORE)
core_imc_pmu = pmu_ptr;
else if (pmu_ptr->domain == IMC_DOMAIN_NEST)
--
2.7.4
next prev parent reply other threads:[~2017-03-16 7:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 7:34 [PATCH v5 00/13] IMC Instrumentation Support Madhavan Srinivasan
2017-03-16 7:34 ` [PATCH v5 01/13] powerpc/powernv: Data structure and macros definitions Madhavan Srinivasan
2017-03-16 7:34 ` [PATCH v5 02/13] powerpc/powernv: Autoload IMC device driver module Madhavan Srinivasan
2017-03-16 7:34 ` [PATCH v5 03/13] powerpc/powernv: Detect supported IMC units and its events Madhavan Srinivasan
2017-03-16 7:34 ` [PATCH v5 04/13] powerpc/perf: Add event attribute and group to IMC pmus Madhavan Srinivasan
2017-03-16 7:34 ` [PATCH v5 05/13] powerpc/perf: Generic imc pmu event functions Madhavan Srinivasan
2017-03-16 7:35 ` [PATCH v5 06/13] powerpc/perf: IMC pmu cpumask and cpu hotplug support Madhavan Srinivasan
2017-03-23 11:52 ` Gautham R Shenoy
2017-03-27 10:34 ` Anju T Sudhakar
2017-03-16 7:35 ` [PATCH v5 07/13] powerpc/powernv: Core IMC events detection Madhavan Srinivasan
2017-03-16 7:35 ` [PATCH v5 08/13] powerpc/perf: PMU functions for Core IMC and hotplugging Madhavan Srinivasan
2017-03-23 13:09 ` Gautham R Shenoy
2017-03-28 4:41 ` Madhavan Srinivasan
2017-03-16 7:35 ` Madhavan Srinivasan [this message]
2017-03-16 7:35 ` [PATCH v5 10/13] powerpc/perf: Thread IMC PMU functions Madhavan Srinivasan
2017-03-16 7:35 ` [PATCH 11/13] powerpc/powernv: Add device shutdown function for Core IMC Madhavan Srinivasan
2017-03-16 7:35 ` [PATCH 12/13] powerpc/perf: Thread imc cpuhotplug support Madhavan Srinivasan
2017-03-23 17:15 ` Gautham R Shenoy
2017-03-27 10:35 ` Anju T Sudhakar
2017-03-16 7:35 ` [PATCH 13/13] powerpc/perf: Enable/disable core engine during cpuhotplug Madhavan Srinivasan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1489649707-8021-10-git-send-email-maddy@linux.vnet.ibm.com \
--to=maddy@linux.vnet.ibm.com \
--cc=anju@linux.vnet.ibm.com \
--cc=anton@samba.org \
--cc=benh@kernel.crashing.org \
--cc=bsingharora@gmail.com \
--cc=dja@axtens.net \
--cc=ego@linux.vnet.ibm.com \
--cc=eranian@google.com \
--cc=hemant@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
--cc=stewart@linux.vnet.ibm.com \
--cc=sukadev@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).