[PATCH v10 06/10] powerpc/powernv: Core IMC events detection

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[PATCH v10 06/10] powerpc/powernv: Core IMC events detection

Madhavan Srinivasan
This patch adds support for detection of core IMC events along with the
Nest IMC events. It adds a new domain IMC_DOMAIN_CORE and its determined
with the help of the "type" property in the IMC device tree.

Signed-off-by: Anju T Sudhakar <[hidden email]>
Signed-off-by: Hemant Kumar <[hidden email]>
Signed-off-by: Madhavan Srinivasan <[hidden email]>
---
 arch/powerpc/include/asm/imc-pmu.h        |  2 ++
 arch/powerpc/include/asm/opal-api.h       |  3 +++
 arch/powerpc/perf/imc-pmu.c               |  4 ++++
 arch/powerpc/platforms/powernv/opal-imc.c | 19 ++++++++++++++++---
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/include/asm/imc-pmu.h b/arch/powerpc/include/asm/imc-pmu.h
index 865cd756bfb6..0f018b6510c0 100644
--- a/arch/powerpc/include/asm/imc-pmu.h
+++ b/arch/powerpc/include/asm/imc-pmu.h
@@ -95,7 +95,9 @@ struct imc_pmu {
  * Domains for IMC PMUs
  */
 #define IMC_DOMAIN_NEST 1
+#define IMC_DOMAIN_CORE 2
 
 extern struct imc_pmu *per_nest_pmu_arr[IMC_MAX_PMUS];
+extern struct imc_pmu *core_imc_pmu;
 extern int __init init_imc_pmu(struct imc_events *events, int idx, struct imc_pmu *pmu_ptr);
 #endif /* PPC_POWERNV_IMC_PMU_DEF_H */
diff --git a/arch/powerpc/include/asm/opal-api.h b/arch/powerpc/include/asm/opal-api.h
index ebe9d6bd3f06..7056b977df53 100644
--- a/arch/powerpc/include/asm/opal-api.h
+++ b/arch/powerpc/include/asm/opal-api.h
@@ -1008,6 +1008,9 @@ enum {
 
 /* In-Memory Collection Counters Type */
 enum {
+ IMC_COUNTER_PER_SUB_CORE = 0x2,
+ IMC_COUNTER_PER_CORE = 0x4,
+ IMC_COUNTER_PER_QUAD = 0x8,
  IMC_COUNTER_PER_CHIP = 0x10,
  IMC_COUNTER_PER_SOCKET = 0x20,
 };
diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c
index d3691d4d5f4b..08b363ac35ac 100644
--- a/arch/powerpc/perf/imc-pmu.c
+++ b/arch/powerpc/perf/imc-pmu.c
@@ -20,6 +20,8 @@
 
 /* Needed for sanity check */
 extern u64 nest_max_offset;
+extern u64 core_max_offset;
+
 struct imc_pmu *per_nest_pmu_arr[IMC_MAX_PMUS];
 static cpumask_t nest_imc_cpumask;
 static int nest_imc_cpumask_initialized;
@@ -31,6 +33,8 @@ static DEFINE_MUTEX(imc_nest_reserve);
 static struct cpumask imc_result_mask;
 static DEFINE_MUTEX(imc_control_mutex);
 
+struct imc_pmu *core_imc_pmu;
+
 struct imc_pmu *imc_event_to_pmu(struct perf_event *event)
 {
  return container_of(event->pmu, struct imc_pmu, pmu);
diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
index c2a6019536a1..be6158a098dd 100644
--- a/arch/powerpc/platforms/powernv/opal-imc.c
+++ b/arch/powerpc/platforms/powernv/opal-imc.c
@@ -35,6 +35,7 @@
 #include <asm/imc-pmu.h>
 
 u64 nest_max_offset;
+u64 core_max_offset;
 
 static int imc_event_prop_update(char *name, struct imc_events *events)
 {
@@ -115,6 +116,10 @@ static void update_max_value(u32 value, int pmu_domain)
  if (nest_max_offset < value)
  nest_max_offset = value;
  break;
+ case IMC_DOMAIN_CORE:
+ if (core_max_offset < value)
+ core_max_offset = value;
+ break;
  default:
  /* Unknown domain, return */
  return;
@@ -399,7 +404,7 @@ static int imc_get_mem_addr_nest(struct device_node *node,
 /*
  * imc_pmu_create : Takes the parent device which is the pmu unit, pmu_index
  *    and domain as the inputs.
- * Allocates memory for the pmu, sets up its domain (NEST), and
+ * Allocates memory for the pmu, sets up its domain (NEST/CORE), and
  * calls imc_events_setup() to allocate memory for the events supported
  * by this pmu. Assigns a name for the pmu.
  *
@@ -426,7 +431,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
  pmu_ptr->domain = domain;
 
  /* Needed for hotplug/migration */
- per_nest_pmu_arr[pmu_index] = pmu_ptr;
+ if (pmu_ptr->domain == IMC_DOMAIN_CORE)
+ core_imc_pmu = pmu_ptr;
+ else if (pmu_ptr->domain == IMC_DOMAIN_NEST)
+ per_nest_pmu_arr[pmu_index] = pmu_ptr;
 
  pp = of_find_property(parent, "name", NULL);
  if (!pp) {
@@ -447,7 +455,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
  goto free_pmu;
  }
  /* Save the name to register it later */
- sprintf(buf, "nest_%s", (char *)pp->value);
+ if (pmu_ptr->domain == IMC_DOMAIN_NEST)
+ sprintf(buf, "nest_%s", (char *)pp->value);
+ else
+ sprintf(buf, "%s_imc", (char *)pp->value);
  pmu_ptr->pmu.name = (char *)buf;
 
  if (of_property_read_u32(parent, "size", &pmu_ptr->counter_mem_size))
@@ -510,6 +521,8 @@ static int opal_imc_counters_probe(struct platform_device *pdev)
  continue;
  if (type == IMC_COUNTER_PER_CHIP)
  domain = IMC_DOMAIN_NEST;
+ else if (type == IMC_COUNTER_PER_CORE)
+ domain = IMC_DOMAIN_CORE;
  else
  continue;
  if (!imc_pmu_create(imc_dev, pmu_count, domain))
--
2.7.4

Loading...