From patchwork Thu May 4 14:19:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anju T Sudhakar X-Patchwork-Id: 758583 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wJcht0HKhz9s2Q for ; Fri, 5 May 2017 00:23:58 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wJchs6dnhzDqKJ for ; Fri, 5 May 2017 00:23:57 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wJcdd0T87zDqFS for ; Fri, 5 May 2017 00:21:08 +1000 (AEST) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v44EJDoS099634 for ; Thu, 4 May 2017 10:21:07 -0400 Received: from e23smtp09.au.ibm.com (e23smtp09.au.ibm.com [202.81.31.142]) by mx0b-001b2d01.pphosted.com with ESMTP id 2a85m4h75c-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 04 May 2017 10:21:06 -0400 Received: from localhost by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 5 May 2017 00:21:04 +1000 Received: from d23relay08.au.ibm.com (202.81.31.227) by e23smtp09.au.ibm.com (202.81.31.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 5 May 2017 00:21:01 +1000 Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay08.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v44EKrPv6881636 for ; Fri, 5 May 2017 00:21:01 +1000 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v44EKMd7012287 for ; Fri, 5 May 2017 00:20:23 +1000 Received: from xenial-xerus.in.ibm.com ([9.79.251.158]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v44EKBtm011327; Fri, 5 May 2017 00:20:19 +1000 From: Anju T Sudhakar To: mpe@ellerman.id.au Subject: [PATCH v8 02/10] powerpc/powernv: Autoload IMC device driver module Date: Thu, 4 May 2017 19:49:48 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493907596-11425-1-git-send-email-anju@linux.vnet.ibm.com> References: <1493907596-11425-1-git-send-email-anju@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17050414-0052-0000-0000-00000239641A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17050414-0053-0000-0000-00000814808A Message-Id: <1493907596-11425-3-git-send-email-anju@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-04_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705040227 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stewart@linux.vnet.ibm.com, ego@linux.vnet.ibm.com, mikey@neuling.org, maddy@linux.vnet.ibm.com, hemant@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, eranian@google.com, anju@linux.vnet.ibm.com, anton@samba.org, sukadev@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org, dja@axtens.net Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" This patch does three things : - Enables "opal.c" to create a platform device for the IMC interface according to the appropriate compatibility string. - Find the reserved-memory region details from the system device tree and get the base address of HOMER (Reserved memory) region address for each chip. - We also get the Nest PMU counter data offsets (in the HOMER region) and their sizes. The offsets for the counters' data are fixed and won't change from chip to chip. The device tree parsing logic is separated from the PMU creation functions (which is done in subsequent patches). Patch also adds a CONFIG_HV_PERF_IMC_CTRS for the IMC driver. Signed-off-by: Anju T Sudhakar Signed-off-by: Hemant Kumar Signed-off-by: Madhavan Srinivasan --- arch/powerpc/platforms/powernv/Kconfig | 10 +++ arch/powerpc/platforms/powernv/Makefile | 1 + arch/powerpc/platforms/powernv/opal-imc.c | 140 ++++++++++++++++++++++++++++++ arch/powerpc/platforms/powernv/opal.c | 18 ++++ 4 files changed, 169 insertions(+) create mode 100644 arch/powerpc/platforms/powernv/opal-imc.c diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig index 3a07e4d..1b90a98 100644 --- a/arch/powerpc/platforms/powernv/Kconfig +++ b/arch/powerpc/platforms/powernv/Kconfig @@ -27,3 +27,13 @@ config OPAL_PRD help This enables the opal-prd driver, a facility to run processor recovery diagnostics on OpenPower machines + +config HV_PERF_IMC_CTRS + bool "Hypervisor supplied In Memory Collection PMU events (Nest & Core)" + default y + depends on PERF_EVENTS && PPC_POWERNV + help + Enable access to hypervisor supplied in-memory collection counters + in perf. IMC counters are available from Power9 systems. + + If unsure, select Y. diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile index b5d98cb..715e531 100644 --- a/arch/powerpc/platforms/powernv/Makefile +++ b/arch/powerpc/platforms/powernv/Makefile @@ -12,3 +12,4 @@ obj-$(CONFIG_PPC_SCOM) += opal-xscom.o obj-$(CONFIG_MEMORY_FAILURE) += opal-memory-errors.o obj-$(CONFIG_TRACEPOINTS) += opal-tracepoints.o obj-$(CONFIG_OPAL_PRD) += opal-prd.o +obj-$(CONFIG_HV_PERF_IMC_CTRS) += opal-imc.o diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c new file mode 100644 index 0000000..3a87000 --- /dev/null +++ b/arch/powerpc/platforms/powernv/opal-imc.c @@ -0,0 +1,140 @@ +/* + * OPAL IMC interface detection driver + * Supported on POWERNV platform + * + * Copyright (C) 2017 Madhavan Srinivasan, IBM Corporation. + * (C) 2017 Anju T Sudhakar, IBM Corporation. + * (C) 2017 Hemant K Shaw, IBM Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct perchip_nest_info nest_perchip_info[IMC_MAX_CHIPS]; + +/* + * imc_pmu_setup : Setup the IMC PMUs (children of "parent"). + */ +static void __init imc_pmu_setup(struct device_node *parent) +{ + if (!parent) + return; +} + +static int opal_imc_counters_probe(struct platform_device *pdev) +{ + struct device_node *imc_dev, *dn, *rm_node = NULL; + struct perchip_nest_info *pcni; + u32 pages, nest_offset, nest_size, chip_id; + int i = 0; + const __be32 *addrp; + u64 reg_addr, reg_size; + + if (!pdev || !pdev->dev.of_node) + return -ENODEV; + + /* + * Check whether this is kdump kernel. If yes, just return. + */ + if (is_kdump_kernel()) + return -ENODEV; + + imc_dev = pdev->dev.of_node; + + /* + * Nest counter data are saved in a reserved memory called HOMER. + * "imc-nest-offset" identifies the counter data location within HOMER. + * size : size of the entire nest-counters region + */ + if (of_property_read_u32(imc_dev, "imc-nest-offset", &nest_offset)) + goto err; + + if (of_property_read_u32(imc_dev, "imc-nest-size", &nest_size)) + goto err; + + /* Sanity check */ + if ((nest_size/PAGE_SIZE) > IMC_NEST_MAX_PAGES) + goto err; + + /* Find the "HOMER region" for each chip */ + rm_node = of_find_node_by_path("/reserved-memory"); + if (!rm_node) + goto err; + + /* + * We need to look for the "ibm,homer-image" node in the + * "/reserved-memory" node. + */ + for (dn = of_find_node_by_name(rm_node, "ibm,homer-image"); dn; + dn = of_find_node_by_name(dn, "ibm,homer-image")) { + + /* Get the chip id to which the above homer region belongs to */ + if (of_property_read_u32(dn, "ibm,chip-id", &chip_id)) + goto err; + + pcni = &nest_perchip_info[chip_id]; + addrp = of_get_address(dn, 0, ®_size, NULL); + if (!addrp) + goto err; + + /* Fetch the homer region base address */ + reg_addr = of_read_number(addrp, 2); + pcni->pbase = reg_addr; + /* Add the nest IMC Base offset */ + pcni->pbase = pcni->pbase + nest_offset; + /* Fetch the size of the homer region */ + pcni->size = nest_size; + + for (i = 0; i < (pcni->size / PAGE_SIZE); i++) { + pages = PAGE_SIZE * i; + pcni->vbase[i] = (u64)phys_to_virt(pcni->pbase + pages); + } + } + + imc_pmu_setup(imc_dev); + + return 0; +err: + return -ENODEV; +} + +static const struct of_device_id opal_imc_match[] = { + { .compatible = IMC_DTB_COMPAT }, + {}, +}; + +static struct platform_driver opal_imc_driver = { + .driver = { + .name = "opal-imc-counters", + .of_match_table = opal_imc_match, + }, + .probe = opal_imc_counters_probe, +}; + +MODULE_DEVICE_TABLE(of, opal_imc_match); +module_platform_driver(opal_imc_driver); +MODULE_DESCRIPTION("PowerNV OPAL IMC driver"); +MODULE_LICENSE("GPL"); diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index e0f856b..b06f896 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -30,6 +31,7 @@ #include #include #include +#include #include "powernv.h" @@ -631,6 +633,17 @@ static void opal_pdev_init(const char *compatible) of_platform_device_create(np, NULL, NULL); } +#ifdef CONFIG_HV_PERF_IMC_CTRS +static void __init opal_imc_init_dev(void) +{ + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, IMC_DTB_COMPAT); + if (np) + of_platform_device_create(np, NULL, NULL); +} +#endif + static int kopald(void *unused) { unsigned long timeout = msecs_to_jiffies(opal_heartbeat) + 1; @@ -704,6 +717,11 @@ static int __init opal_init(void) /* Setup a heatbeat thread if requested by OPAL */ opal_init_heartbeat(); +#ifdef CONFIG_HV_PERF_IMC_CTRS + /* Detect IMC pmu counters support and create PMUs */ + opal_imc_init_dev(); +#endif + /* Create leds platform devices */ leds = of_find_node_by_path("/ibm,opal/leds"); if (leds) {