From patchwork Mon Nov 23 18:33:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57174 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1602457lbb; Mon, 23 Nov 2015 10:34:36 -0800 (PST) X-Received: by 10.68.68.139 with SMTP id w11mr33523412pbt.91.1448303672409; Mon, 23 Nov 2015 10:34:32 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zs7si21650234pbc.125.2015.11.23.10.34.32; Mon, 23 Nov 2015 10:34:32 -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 S1755092AbbKWSe2 (ORCPT + 28 others); Mon, 23 Nov 2015 13:34:28 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:33389 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755015AbbKWSeX (ORCPT ); Mon, 23 Nov 2015 13:34:23 -0500 Received: by pabfh17 with SMTP id fh17so204847726pab.0 for ; Mon, 23 Nov 2015 10:34:22 -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=dG+GGZNLdC/SkCLy7XznWy3uhtWve3sN8B9qyQHS13+DrYDqE3UHz3wM+WGaL2tE9s XLhN0UFq9MHJ8yWDeCNYQRwUNZWp9ybG28lmjidb6U6wumuwdJxpRxoORUqRpf5IlW3F fNbg68RP1fdHO0pi+N/w8Zq/HK7bSj/9UiywVwuwUjUfWYa4nxc69DWizkVuLnYkaZ4x NrHHjBJU1XYpJInAnUy7Q2KgSj/ES0BIyG0scwgOv0frhXxBw99+mwlaVWDRuqrWKfqc Y4wZ1Okec9sDlRVvn02e+BJrwrPQNuZdw0q5ZCdf6MQ3m3TQPVNWpUdfA2J5EpR2tyW7 B4/Q== 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=NjtVJsEW8YBC/2d/XdWmn8C0bYnxXAeyskfs9JvbZ7RI5IfWSaZ3kQLtefTkxcnEpf 6FjnNRpXbGA6/cEsYiNqhvyKx6drt5gxM8nl1M08xYq4kHfRYI/CWE+mmimMIh3Fp/kB MZL8m6Ol8Vxt8oKEKDSpiMkXPGL1BsrZTIdsNbYA0Bb5v/u1g7XfZ3y/GZtaHZ7nftxT ER2x/F5gL4VQqFRwLygLRPqAr2ZAwaMEDwbeKieeV8j8e9iZurLbOdtCgEZLx6Kv/mwk mDHuQZtNR3a9iqEMYkDf7I4ysRQqkzn1OIcjrjPrlbdmV6wgVAdmA2R7OtNlac+IgS5K VgWA== X-Gm-Message-State: ALoCoQnhc+OcIUBy6mZJC+4jDewm424azs44ex4ILY/5E8IjfTRcKFG5fN/3LrF8VVYoQWvhQoDL X-Received: by 10.98.1.75 with SMTP id 72mr17682121pfb.14.1448303662541; Mon, 23 Nov 2015 10:34:22 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id r20sm10865186pfa.93.2015.11.23.10.34.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 10:34:21 -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: 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 Subject: [RESEND PATCH V4 15/26] coresight: etm3x: implementing perf_enable/disable() API Date: Mon, 23 Nov 2015 11:33:07 -0700 Message-Id: <1448303598-11249-16-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448303598-11249-1-git-send-email-mathieu.poirier@linaro.org> References: <1448303598-11249-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;