From patchwork Sun Oct 18 18:24:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 7431831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9610FBEEA4 for ; Sun, 18 Oct 2015 18:30:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9B4C62061B for ; Sun, 18 Oct 2015 18:29:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9BB4D20571 for ; Sun, 18 Oct 2015 18:29:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Znsh1-0007pY-No; Sun, 18 Oct 2015 18:28:27 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Znsey-000537-Ch for linux-arm-kernel@bombadil.infradead.org; Sun, 18 Oct 2015 18:26:20 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by merlin.infradead.org with esmtps (Exim 4.85 #2 (Red Hat Linux)) id 1Znsev-00017u-JQ for linux-arm-kernel@lists.infradead.org; Sun, 18 Oct 2015 18:26:19 +0000 Received: by pasz6 with SMTP id z6so6765564pas.2 for ; Sun, 18 Oct 2015 11:25:55 -0700 (PDT) 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=jrZ+GgpyH6zDsJCBANPRvArv84TnZKd71d25FLfjSDo=; b=fvTwISTOhpBsQxo11rIDHtI6gy9ZK9QiNnkfEtmV18YVAFY58JXQYjbpoS1UkLfGSX cynRYGEcMUTIeMjdi4mknRIg4Pu7t3FIF/+bPzBDN8MaRCjTNW0xca/oUR0coXoghmjv Dvfd0v+LGzbNhECRp8ug/QFmRX0qbKkuu9k914lEn2EHzBWyhnCv0AetO8qO5M6QdmR5 LzxekeOFDhgjeiAtNA2Pr2onR754q1sF9t8AvK6CVnbV1U/EpfHjfbfu2U6hzQ/h2EiE m21bebeFA0MObK1BNO4btP8Fa/bkwaZNTnZ/dGT2mWOV5ijsfIfsvC6O8UuQ/SY7bo6G 5jZA== X-Gm-Message-State: ALoCoQm9bDrR76qLrpqRFux12rG9ic/bkAJ2Go1UMdAr1Bh7srU6fYSsbc3d9jyuCC7ox4uI85Li X-Received: by 10.66.227.72 with SMTP id ry8mr30397801pac.105.1445192755248; Sun, 18 Oct 2015 11:25:55 -0700 (PDT) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [184.64.168.246]) by smtp.gmail.com with ESMTPSA id hq1sm20402076pbb.43.2015.10.18.11.25.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Oct 2015 11:25:54 -0700 (PDT) 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 Subject: [PATCH V2 13/30] coresight: etm3x: implementing perf_enable/disable() API Date: Sun, 18 Oct 2015 12:24:30 -0600 Message-Id: <1445192687-24112-14-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445192687-24112-1-git-send-email-mathieu.poirier@linaro.org> References: <1445192687-24112-1-git-send-email-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151018_142617_703495_D04F9A74 X-CRM114-Status: GOOD ( 17.22 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: al.grant@arm.com, mathieu.poirier@linaro.org, pawel.moll@arm.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, tor@ti.com, mike.leach@arm.com, zhang.chunyan@linaro.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP That way traces can be enable and disabled automatically from the Perf subystem using the PMU abstraction. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm3x.c | 50 ++++++++++++++++++++++++--- include/linux/coresight.h | 4 +++ 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index 0994bf0a8334..f565554744fe 100644 --- a/drivers/hwtracing/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c @@ -369,8 +369,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); @@ -410,9 +412,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); @@ -485,6 +484,47 @@ static void perf_etm_set_config(struct coresight_device *csdev, void *config) drvdata->config = config; } +static int perf_etm_enable(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; + + if (local_cmpxchg(&drvdata->state, + ETM_STATE_DISABLED, ETM_STATE_PERF)) + return -EBUSY; + + etm_enable_hw(drvdata); + + return 0; +} + +static int perf_etm_disable(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; + + 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); + local_set(&drvdata->state, ETM_STATE_DISABLED); + + CS_LOCK(drvdata->base); + + return 0; +} + static int sysfs_etm_enable(struct coresight_device *csdev) { struct etm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); @@ -587,6 +627,8 @@ static const struct coresight_ops_source etm_source_ops = { .trace_id = etm_trace_id, .perf_get_config = perf_etm_get_config, .perf_set_config = perf_etm_set_config, + .perf_enable = perf_etm_enable, + .perf_disable = perf_etm_disable, .sysfs_enable = sysfs_etm_enable, .sysfs_disable = sysfs_etm_disable, }; diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 32463da877eb..b853d722346b 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -211,6 +211,8 @@ struct coresight_ops_link { to the HW. * @perf_get_config: builds the ETM configuration after event' specifics. * @perf_set_config: associate a tracer with a configuration.. + * @perf_enable: enables tracing for a source, from Perf. + * @perf_disable: disables tracing for a source, from Perf. * @sysfs_enable: enables tracing for a source, from sysFS. * @sysfs_disable: disables tracing for a source, from sysFS. */ @@ -220,6 +222,8 @@ struct coresight_ops_source { void *(*perf_get_config)(struct coresight_device *csdev, struct perf_event *event); void (*perf_set_config)(struct coresight_device *csdev, void *config); + int (*perf_enable)(struct coresight_device *csdev); + int (*perf_disable)(struct coresight_device *csdev); int (*sysfs_enable)(struct coresight_device *csdev); void (*sysfs_disable)(struct coresight_device *csdev); };