From patchwork Mon Nov 30 02:14:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57407 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1179530lbb; Sun, 29 Nov 2015 18:17:17 -0800 (PST) X-Received: by 10.98.44.193 with SMTP id s184mr67138162pfs.8.1448849837288; Sun, 29 Nov 2015 18:17:17 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rm13si5956307pab.31.2015.11.29.18.17.17; Sun, 29 Nov 2015 18:17:17 -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 S1753285AbbK3CRJ (ORCPT + 28 others); Sun, 29 Nov 2015 21:17:09 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35747 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753240AbbK3CRF (ORCPT ); Sun, 29 Nov 2015 21:17:05 -0500 Received: by pacej9 with SMTP id ej9so167984566pac.2 for ; Sun, 29 Nov 2015 18:17:04 -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=QJdKBA2Kb12KckkdZtX4dJw6ie+oA866F/Ad/EmRbA8=; b=bGD0X8CG8wEJHhok7hz+94ib5bKUeJanr4oNtcnVyhDnIG2SnnKX0YxVR1jEWndS0n t8/DBY4Q+bkyOuPgIhQS17pueU1FkqbRKqfSr2ahJBzikRfx5uWkWqDSlq50xwUZJlCn ncKZWpamQl7nX1lUvKv1fFy2XZ1XffpzBynh8zXj0AoxJNLiLorG4Qwvy/fPQV+awwQc sB1lfq4WnKcLnBpGKuuWdh2lWbeV4TpzIDrnNdO0eiMXGbAoZUivC2fb7aUViG3vm2hW 7HtS7vLidu2NpN85H7CUZmYYA1o6QS7cm/oOt4NjQ2LQNG7e7RwmbBUrNR/3r9eUSaB+ 8gCA== 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=QJdKBA2Kb12KckkdZtX4dJw6ie+oA866F/Ad/EmRbA8=; b=OEu5YRz4wj17agLlgG/RFvOVqXHT5gQ7mT4Px1iKSYYl7Y3cL90Om6pGFXPAlRhGiU YM5Efp/0Vm7VDulfzdC2bgitbMaiymDb+BDfsT9XckSLD4cnN5SjWMJQHwY2J/JgsdaD 2jOLAK7O8Im/UzmviOwm3mczlgL85bJq3X+KkhPy9sJ4Ij4tZPo2B4geLeiZYpUHEMrH poj1Z/is6XZ8RZevqLYv3tG5vj74/dNuyloEh85+o4q8aOTqS2avLgV8Np4ei7ZzYIjb Vdv2sh4tGxEZ+Ura68ksB3L8miWtu1a+gTCg22AKt1G5nCKsxjIhINwi21ulG3qdpEaG rJBQ== X-Gm-Message-State: ALoCoQnnRjILzaw/h/Hfissx34djdSaewil0He6VYVlXRGBt8EIyHdHFpWNXhoa1JqDYvh1yFovp X-Received: by 10.66.164.234 with SMTP id yt10mr63914979pab.11.1448849824059; Sun, 29 Nov 2015 18:17:04 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id n16sm47168818pfa.53.2015.11.29.18.17.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Nov 2015 18:17:03 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, alexander.shishkin@linux.intel.com 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, Mathieu Poirier Subject: [PATCH V5 15/26] coresight: etm3x: implementing perf_enable/disable() API Date: Sun, 29 Nov 2015 19:14:36 -0700 Message-Id: <1448849687-5724-16-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448849687-5724-1-git-send-email-mathieu.poirier@linaro.org> References: <1448849687-5724-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(-) -- 2.1.4 -- 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 cda28e0211f5..fbd04979e21c 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); @@ -495,6 +494,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); @@ -541,6 +552,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; } @@ -579,6 +593,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); @@ -624,6 +660,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;