From patchwork Wed Nov 11 22:18:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 56396 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp74992lbb; Wed, 11 Nov 2015 14:19:59 -0800 (PST) X-Received: by 10.68.108.66 with SMTP id hi2mr18092710pbb.131.1447280393238; Wed, 11 Nov 2015 14:19:53 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id px6si15228698pbc.254.2015.11.11.14.19.52; Wed, 11 Nov 2015 14:19:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753128AbbKKWTs (ORCPT + 28 others); Wed, 11 Nov 2015 17:19:48 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:33754 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753054AbbKKWTp (ORCPT ); Wed, 11 Nov 2015 17:19:45 -0500 Received: by pabfh17 with SMTP id fh17so42987788pab.0 for ; Wed, 11 Nov 2015 14:19:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RRI4lCz7Zhx0me6ojn79wCYqUpo9J/RkwAVAgGyJ31w=; b=cT+zUoNZkfTb1oPa7/xK2dHt63RL2DUNUCvOKyKoSRgRkHncI4ngcd00lIrUQtZFNP tX2u77tRIAywV7pW6MAYSkVQTkeTYPT6itA2Vjm9Zj8qLA7BGm+PXbCNZOay6e0A1O7J XFtmNTIRiIRNiJrUTSPzt4rOknJlpzgtCu2WOz0ueg+lUnGoG19xgtwqp+TqNc2pjtBn 0+Ryg6O0yOexLjk92FkBJtE8zBd1DL/8TixGEaPgW1E34Ooz44DY2LPVItzbg7T4MQLJ bFKY0f1aN77nRUx314+XAmqkexfT8RTKBMmusR3rCDxO5kHlIN+rGdxrVa3q1QGOfxTj PITg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RRI4lCz7Zhx0me6ojn79wCYqUpo9J/RkwAVAgGyJ31w=; b=WRqfwnoNUZ2YtAqdgGlIpdwFi36Q3EeZAzm93mQ5NG+2CLjn87mxh5mCmLAYVIrFSb aVLIUnSSTQ4msT8+sjczUOK1DDa0fmyxtHJILrMxLosc7KRfOtXJI2rJmdhyZmIzCnLy LqotkrdGXK3iXxxl0iTrJYBNZHTOz3yEoi/q4I5H8/YqDUr0WlEfBm2/cPCKlw4K/nH2 A6COuX96dBSSUS0uZ9hw1QIuDt3hHHXFCDFObe+qtuBdAhlyDq6SJ3Zhw5cr/hpYApHh 9+OieklBrS2S5zxsK5pdTuG/vvV0RLWB0meaiRcc4QenKkotxC4aWUdZQyJaWqDpv1Yl ipbA== X-Gm-Message-State: ALoCoQkSmVZgR5JpIdqsPcSOVLiPysdMDGWw6rBzPsQ2y+Y1ZN84hrri8x0wBpNcoQ6Ea8d0uq6w X-Received: by 10.66.145.2 with SMTP id sq2mr17821611pab.7.1447280383673; Wed, 11 Nov 2015 14:19:43 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id h10sm11156697pat.7.2015.11.11.14.19.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Nov 2015 14:19:43 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, a.p.zijlstra@chello.nl, alexander.shishkin@linux.intel.com, acme@kernel.org, mingo@redhat.com, corbet@lwn.net, nicolas.pitre@linaro.org Cc: adrian.hunter@intel.com, zhang.chunyan@linaro.org, mike.leach@arm.com, tor@ti.com, al.grant@arm.com, pawel.moll@arm.com, fainelli@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, mathieu.poirier@linaro.org Subject: [PATCH V3 15/26] coresight: etm3x: implementing perf_enable/disable() API Date: Wed, 11 Nov 2015 15:18:05 -0700 Message-Id: <1447280296-19147-16-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1447280296-19147-1-git-send-email-mathieu.poirier@linaro.org> References: <1447280296-19147-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org That way traces can be enabled and disabled automatically from the Perf subystem using the PMU abstraction. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm3x.c | 47 ++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 4 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index dd319ef0f1ac..4ff3e1419fde 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -372,8 +372,10 @@ static void etm_enable_hw(void *info) etm_set_prog(drvdata); etmcr = etm_readl(drvdata, ETMCR); - etmcr &= (ETMCR_PWD_DWN | ETMCR_ETM_PRG); + /* Clear setting from a previous run if need be */ + etmcr &= ~ETM3X_SUPPORTED_OPTIONS; etmcr |= drvdata->port_size; + etmcr |= ETMCR_ETM_EN; etm_writel(drvdata, config->ctrl | etmcr, ETMCR); etm_writel(drvdata, config->trigger_event, ETMTRIGGER); etm_writel(drvdata, config->startstop_ctrl, ETMTSSCR); @@ -413,9 +415,6 @@ static void etm_enable_hw(void *info) /* No VMID comparator value selected */ etm_writel(drvdata, 0x0, ETMVMIDCVR); - /* Ensures trace output is enabled from this ETM */ - etm_writel(drvdata, config->ctrl | ETMCR_ETM_EN | etmcr, ETMCR); - etm_clr_prog(drvdata); CS_LOCK(drvdata->base); @@ -488,6 +487,18 @@ static void etm_set_config(struct coresight_device *csdev, void *config) drvdata->config = config; } +static int etm_enable_perf(struct coresight_device *csdev) +{ + struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); + + if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) + return -EINVAL; + + etm_enable_hw(drvdata); + + return 0; +} + static int etm_enable_sysfs(struct coresight_device *csdev) { struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); @@ -534,6 +545,9 @@ static int etm_enable(struct coresight_device *csdev, u32 mode) case CS_MODE_SYSFS: ret = etm_enable_sysfs(csdev); break; + case CS_MODE_PERF: + ret = etm_enable_perf(csdev); + break; default: ret = -EINVAL; } @@ -573,6 +587,28 @@ static void etm_disable_hw(void *info) dev_dbg(drvdata->dev, "cpu: %d disable smp call done\n", drvdata->cpu); } +static void etm_disable_perf(struct coresight_device *csdev) +{ + struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); + + if (WARN_ON_ONCE(drvdata->cpu != smp_processor_id())) + return; + + CS_UNLOCK(drvdata->base); + + /* Setting the prog bit disables tracing immediately */ + etm_set_prog(drvdata); + /* Get ready for another session */ + drvdata->config = NULL; + /* + * There is no way to know when the tracer will be used again so + * power down the tracer. + */ + etm_set_pwrdwn(drvdata); + + CS_LOCK(drvdata->base); +} + static void etm_disable_sysfs(struct coresight_device *csdev) { struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); @@ -616,6 +652,9 @@ static void etm_disable(struct coresight_device *csdev) case CS_MODE_SYSFS: etm_disable_sysfs(csdev); break; + case CS_MODE_PERF: + etm_disable_perf(csdev); + break; default: WARN_ON_ONCE(mode); return;