Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757365AbdDRRCY (ORCPT ); Tue, 18 Apr 2017 13:02:24 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:48139 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757223AbdDRRCQ (ORCPT ); Tue, 18 Apr 2017 13:02:16 -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, benh@kernel.crashing.org, paulus@samba.org, 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 v7 06/10] powerpc/powernv: Core IMC events detection Date: Tue, 18 Apr 2017 22:31:46 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492534910-7991-1-git-send-email-anju@linux.vnet.ibm.com> References: <1492534910-7991-1-git-send-email-anju@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17041817-0004-0000-0000-0000056AAF0F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17041817-0005-0000-0000-0000136985B4 Message-Id: <1492534910-7991-7-git-send-email-anju@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-04-18_14:,, 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-1702020001 definitions=main-1704180133 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4753 Lines: 136 From: Hemant Kumar 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 compatibility string "ibm,imc-counters-core" based on 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 | 4 +++- arch/powerpc/perf/imc-pmu.c | 3 +++ arch/powerpc/platforms/powernv/opal-imc.c | 28 +++++++++++++++++++++++++--- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/include/asm/imc-pmu.h b/arch/powerpc/include/asm/imc-pmu.h index 1478d0f..37fdd79 100644 --- a/arch/powerpc/include/asm/imc-pmu.h +++ b/arch/powerpc/include/asm/imc-pmu.h @@ -42,6 +42,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" /* * Structure to hold per chip specific memory address @@ -90,13 +91,14 @@ struct imc_pmu { * Domains for IMC PMUs */ #define IMC_DOMAIN_NEST 1 +#define IMC_DOMAIN_CORE 2 #define IMC_DOMAIN_UNKNOWN -1 #define IMC_COUNTER_ENABLE 1 #define IMC_COUNTER_DISABLE 0 - extern struct perchip_nest_info nest_perchip_info[IMC_MAX_CHIPS]; 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/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index b86ef86..6fdac40 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -24,8 +24,11 @@ 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; + /* Needed for sanity check */ extern u64 nest_max_offset; +extern u64 core_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 61f6d67..d712ef3 100644 --- a/arch/powerpc/platforms/powernv/opal-imc.c +++ b/arch/powerpc/platforms/powernv/opal-imc.c @@ -34,6 +34,7 @@ #include u64 nest_max_offset; +u64 core_max_offset; static int imc_event_prop_update(char *name, struct imc_events *events) { @@ -114,6 +115,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; @@ -357,7 +362,7 @@ static struct imc_events *imc_events_setup(struct device_node *parent, /* * 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), 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. Calls imc_events_node_parser() * to setup the individual events. @@ -386,7 +391,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain) goto free_pmu; /* 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) { @@ -407,7 +415,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; /* @@ -461,6 +472,17 @@ static void __init imc_pmu_setup(struct device_node *parent) return; pmu_count++; } + /* + * Loop through the imc-counters tree for each compatible + * "ibm,imc-counters-core", and update "struct imc_pmu". + */ + for_each_compatible_node(child, NULL, IMC_DTB_CORE_COMPAT) { + domain = IMC_DOMAIN_CORE; + rc = imc_pmu_create(child, pmu_count, domain); + if (rc) + return; + pmu_count++; + } } static int opal_imc_counters_probe(struct platform_device *pdev) -- 2.7.4