Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752011AbdFEMct (ORCPT ); Mon, 5 Jun 2017 08:32:49 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:40722 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751554AbdFEMb4 (ORCPT ); Mon, 5 Jun 2017 08:31:56 -0400 From: Anju T Sudhakar To: mpe@ellerman.id.au Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, ego@linux.vnet.ibm.com, bsingharora@gmail.com, anton@samba.org, sukadev@linux.vnet.ibm.com, mikey@neuling.org, stewart@linux.vnet.ibm.com, dja@axtens.net, eranian@google.com, hemant@linux.vnet.ibm.com, maddy@linux.vnet.ibm.com, anju@linux.vnet.ibm.com Subject: [PATCH v9 06/10] powerpc/powernv: Core IMC events detection Date: Mon, 5 Jun 2017 18:00:16 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496665818-543-1-git-send-email-anju@linux.vnet.ibm.com> References: <1496665818-543-1-git-send-email-anju@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17060512-0004-0000-0000-0000020DE4AF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17060512-0005-0000-0000-00000A050551 Message-Id: <1496665818-543-6-git-send-email-anju@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-06-05_05:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=4 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1706050237 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5181 Lines: 136 From: 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 Signed-off-by: Hemant Kumar Signed-off-by: Madhavan Srinivasan --- 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 6b1d887..54784a5 100644 --- a/arch/powerpc/include/asm/imc-pmu.h +++ b/arch/powerpc/include/asm/imc-pmu.h @@ -95,10 +95,12 @@ struct imc_pmu { * Domains for IMC PMUs */ #define IMC_DOMAIN_NEST 1 +#define IMC_DOMAIN_CORE 2 #define IMC_COUNTER_ENABLE 1 #define IMC_COUNTER_DISABLE 0 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 e0c5c66..047370e 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 976ba31..463425c 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; @@ -28,6 +30,8 @@ static atomic_t nest_events; /* Used to avoid races in calling enable/disable nest-pmu units */ static DEFINE_MUTEX(imc_nest_reserve); +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 4a4a9f4..a997f83 100644 --- a/arch/powerpc/platforms/powernv/opal-imc.c +++ b/arch/powerpc/platforms/powernv/opal-imc.c @@ -35,6 +35,7 @@ #include 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; @@ -400,7 +405,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. * @@ -427,7 +432,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) { @@ -448,7 +456,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)) @@ -511,6 +522,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