From: mathieu.poirier@linaro.org (Mathieu Poirier)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/27] coresight: tmc: re-implementing tmc_read_prepare/unprepare() functions
Date: Tue, 3 May 2016 11:33:46 -0600 [thread overview]
Message-ID: <1462296841-12327-13-git-send-email-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <1462296841-12327-1-git-send-email-mathieu.poirier@linaro.org>
In their current implementation the tmc_read_prepare/unprepare()
are a lump of if/else that is difficult to read. This patch is
alleviating that by using a switch statement. The latter also
allows for a better control on the error path.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
drivers/hwtracing/coresight/coresight-tmc.c | 56 ++++++++++++++++++-----------
1 file changed, 36 insertions(+), 20 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c
index 66fa7736d12f..d211aeec49f8 100644
--- a/drivers/hwtracing/coresight/coresight-tmc.c
+++ b/drivers/hwtracing/coresight/coresight-tmc.c
@@ -431,7 +431,7 @@ static const struct coresight_ops tmc_etf_cs_ops = {
static int tmc_read_prepare(struct tmc_drvdata *drvdata)
{
- int ret;
+ int ret = 0;
unsigned long flags;
enum tmc_mode mode;
@@ -439,25 +439,31 @@ static int tmc_read_prepare(struct tmc_drvdata *drvdata)
if (!drvdata->enable)
goto out;
- if (drvdata->config_type == TMC_CONFIG_TYPE_ETB) {
+ switch (drvdata->config_type) {
+ case TMC_CONFIG_TYPE_ETB:
tmc_etb_disable_hw(drvdata);
- } else if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) {
- tmc_etr_disable_hw(drvdata);
- } else {
+ break;
+ case TMC_CONFIG_TYPE_ETF:
+ /* There is no point in reading a TMC in HW FIFO mode */
mode = readl_relaxed(drvdata->base + TMC_MODE);
- if (mode == TMC_MODE_CIRCULAR_BUFFER) {
- tmc_etb_disable_hw(drvdata);
- } else {
- ret = -ENODEV;
+ if (mode != TMC_MODE_CIRCULAR_BUFFER) {
+ ret = -EINVAL;
goto err;
}
+
+ tmc_etb_disable_hw(drvdata);
+ break;
+ case TMC_CONFIG_TYPE_ETR:
+ tmc_etr_disable_hw(drvdata);
+ break;
+ default:
+ ret = -EINVAL;
+ goto err;
}
+
out:
drvdata->reading = true;
- spin_unlock_irqrestore(&drvdata->spinlock, flags);
-
dev_info(drvdata->dev, "TMC read start\n");
- return 0;
err:
spin_unlock_irqrestore(&drvdata->spinlock, flags);
return ret;
@@ -472,20 +478,30 @@ static void tmc_read_unprepare(struct tmc_drvdata *drvdata)
if (!drvdata->enable)
goto out;
- if (drvdata->config_type == TMC_CONFIG_TYPE_ETB) {
+ switch (drvdata->config_type) {
+ case TMC_CONFIG_TYPE_ETB:
tmc_etb_enable_hw(drvdata);
- } else if (drvdata->config_type == TMC_CONFIG_TYPE_ETR) {
- tmc_etr_enable_hw(drvdata);
- } else {
+ break;
+ case TMC_CONFIG_TYPE_ETF:
+ /* Make sure we don't re-enable a TMC in HW FIFO mode */
mode = readl_relaxed(drvdata->base + TMC_MODE);
- if (mode == TMC_MODE_CIRCULAR_BUFFER)
- tmc_etb_enable_hw(drvdata);
+ if (mode != TMC_MODE_CIRCULAR_BUFFER)
+ goto err;
+
+ tmc_etb_enable_hw(drvdata);
+ break;
+ case TMC_CONFIG_TYPE_ETR:
+ tmc_etr_disable_hw(drvdata);
+ break;
+ default:
+ goto err;
}
+
out:
drvdata->reading = false;
- spin_unlock_irqrestore(&drvdata->spinlock, flags);
-
dev_info(drvdata->dev, "TMC read end\n");
+err:
+ spin_unlock_irqrestore(&drvdata->spinlock, flags);
}
static int tmc_open(struct inode *inode, struct file *file)
--
2.5.0
next prev parent reply other threads:[~2016-05-03 17:33 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-03 17:33 [PATCH 00/27] coresight: next v4.6-rc6 Mathieu Poirier
2016-05-03 17:33 ` [PATCH 01/27] coresight: no need to do the forced type conversion Mathieu Poirier
2016-05-03 21:58 ` Greg KH
2016-05-03 17:33 ` [PATCH 02/27] coresight: etm4x: modify q_support type Mathieu Poirier
2016-05-03 17:33 ` [PATCH 03/27] stm class: Support devices that override software assigned masters Mathieu Poirier
2016-05-03 17:33 ` [PATCH 04/27] coresight: adding path for STM device Mathieu Poirier
2016-05-03 17:33 ` [PATCH 05/27] coresight: stm: Bindings for System Trace Macrocell Mathieu Poirier
2016-05-03 17:33 ` [PATCH 06/27] coresight: stm: adding driver for CoreSight STM component Mathieu Poirier
2016-05-03 17:33 ` [PATCH 07/27] coresight: etb10: fixing the right amount of words to read Mathieu Poirier
2016-05-03 17:33 ` [PATCH 08/27] coresight: etm4x: add tracer ID for A72 Maia processor Mathieu Poirier
2016-05-03 17:33 ` [PATCH 09/27] coresight: tmc: adding sysFS management entries Mathieu Poirier
2016-05-03 17:33 ` [PATCH 10/27] coresight: tmc: modifying naming convention Mathieu Poirier
2016-05-03 17:33 ` [PATCH 11/27] coresight: tmc: waiting for TMCReady bit before programming Mathieu Poirier
2016-05-03 17:33 ` Mathieu Poirier [this message]
2016-05-03 17:33 ` [PATCH 13/27] coresight: tmc: clearly define number of transfers per burst Mathieu Poirier
2016-05-03 17:33 ` [PATCH 14/27] coresight: tmc: introducing new header file Mathieu Poirier
2016-05-03 17:33 ` [PATCH 15/27] coresight: tmc: cleaning up " Mathieu Poirier
2016-05-03 17:33 ` [PATCH 16/27] coresight: tmc: splitting driver in ETB/ETF and ETR components Mathieu Poirier
2016-05-03 17:33 ` [PATCH 17/27] coresight: tmc: making prepare/unprepare functions generic Mathieu Poirier
2016-05-03 17:33 ` [PATCH 18/27] coresight: tmc: allocating memory when needed Mathieu Poirier
2016-05-03 17:33 ` [PATCH 19/27] coresight: tmc: getting rid of multiple read access Mathieu Poirier
2016-05-03 17:33 ` [PATCH 20/27] coresight: tmc: adding mode of operation for link/sinks Mathieu Poirier
2016-05-03 17:33 ` [PATCH 21/27] coresight: tmc: dump system memory content only when needed Mathieu Poirier
2016-05-03 17:33 ` [PATCH 22/27] coresight: tmc: make sysFS and Perf mode mutually exclusive Mathieu Poirier
2016-05-03 17:33 ` [PATCH 23/27] coresight: tmc: keep track of memory width Mathieu Poirier
2016-05-03 17:33 ` [PATCH 24/27] coresight: moving struct cs_buffers to header file Mathieu Poirier
2016-05-03 17:33 ` [PATCH 25/27] coresight: tmc: implementing TMC-ETF AUX space API Mathieu Poirier
2016-05-03 17:34 ` [PATCH 26/27] coresight: configuring ETF in FIFO mode when acting as link Mathieu Poirier
2016-05-03 17:34 ` [PATCH 27/27] coresight: etb10: adjust read pointer only when needed Mathieu Poirier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462296841-12327-13-git-send-email-mathieu.poirier@linaro.org \
--to=mathieu.poirier@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).