From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, robert.walker@arm.com,
mike.leach@arm.com
Subject: Re: [PATCH 03/13] coresight: tmc-etb/etf: Prepare to handle errors enabling
Date: Wed, 15 Aug 2018 13:22:46 -0600 [thread overview]
Message-ID: <20180815192246.GA11625@xps15> (raw)
In-Reply-To: <1533562915-21558-4-git-send-email-suzuki.poulose@arm.com>
On Mon, Aug 06, 2018 at 02:41:45PM +0100, Suzuki K Poulose wrote:
> Prepare to handle errors in enabling the hardware and
> report it back to the core driver.
>
> Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
> ---
> drivers/hwtracing/coresight/coresight-tmc-etf.c | 71 +++++++++++++++----------
> 1 file changed, 44 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-tmc-etf.c b/drivers/hwtracing/coresight/coresight-tmc-etf.c
> index 4156c95..ceb4b30 100644
> --- a/drivers/hwtracing/coresight/coresight-tmc-etf.c
> +++ b/drivers/hwtracing/coresight/coresight-tmc-etf.c
> @@ -15,7 +15,7 @@
> static int tmc_set_etf_buffer(struct coresight_device *csdev,
> struct perf_output_handle *handle);
>
> -static void tmc_etb_enable_hw(struct tmc_drvdata *drvdata)
> +static void __tmc_etb_enable_hw(struct tmc_drvdata *drvdata)
> {
> CS_UNLOCK(drvdata->base);
>
> @@ -34,6 +34,12 @@ static void tmc_etb_enable_hw(struct tmc_drvdata *drvdata)
> CS_LOCK(drvdata->base);
> }
>
> +static int tmc_etb_enable_hw(struct tmc_drvdata *drvdata)
> +{
> + __tmc_etb_enable_hw(drvdata);
> + return 0;
> +}
> +
> static void tmc_etb_dump_hw(struct tmc_drvdata *drvdata)
> {
> char *bufp;
> @@ -76,7 +82,7 @@ static void tmc_etb_disable_hw(struct tmc_drvdata *drvdata)
> CS_LOCK(drvdata->base);
> }
>
> -static void tmc_etf_enable_hw(struct tmc_drvdata *drvdata)
> +static void __tmc_etf_enable_hw(struct tmc_drvdata *drvdata)
> {
> CS_UNLOCK(drvdata->base);
>
> @@ -92,6 +98,12 @@ static void tmc_etf_enable_hw(struct tmc_drvdata *drvdata)
> CS_LOCK(drvdata->base);
> }
>
> +static int tmc_etf_enable_hw(struct tmc_drvdata *drvdata)
> +{
> + __tmc_etf_enable_hw(drvdata);
> + return 0;
> +}
> +
> static void tmc_etf_disable_hw(struct tmc_drvdata *drvdata)
> {
> CS_UNLOCK(drvdata->base);
> @@ -174,8 +186,12 @@ static int tmc_enable_etf_sink_sysfs(struct coresight_device *csdev)
> drvdata->buf = buf;
> }
>
> - drvdata->mode = CS_MODE_SYSFS;
> - tmc_etb_enable_hw(drvdata);
> + ret = tmc_etb_enable_hw(drvdata);
> + if (!ret)
> + drvdata->mode = CS_MODE_SYSFS;
> + else
> + /* Free up the buffer if we failed to enable */
> + used = false;
> out:
> spin_unlock_irqrestore(&drvdata->spinlock, flags);
>
> @@ -194,27 +210,25 @@ static int tmc_enable_etf_sink_perf(struct coresight_device *csdev, void *data)
> struct perf_output_handle *handle = data;
>
> spin_lock_irqsave(&drvdata->spinlock, flags);
> - if (drvdata->reading) {
> + do {
> ret = -EINVAL;
> - goto out;
> - }
> + if (drvdata->reading)
> + break;
> + /*
> + * In Perf mode there can be only one writer per sink. There
> + * is also no need to continue if the ETB/ETF is already
> + * operated from sysFS.
> + */
> + if (drvdata->mode != CS_MODE_DISABLED)
> + break;
>
> - /*
> - * In Perf mode there can be only one writer per sink. There
> - * is also no need to continue if the ETB/ETR is already operated
> - * from sysFS.
> - */
> - if (drvdata->mode != CS_MODE_DISABLED) {
> - ret = -EINVAL;
> - goto out;
> - }
> -
> - ret = tmc_set_etf_buffer(csdev, handle);
> - if (!ret) {
> - drvdata->mode = CS_MODE_PERF;
> - tmc_etb_enable_hw(drvdata);
> - }
> -out:
> + ret = tmc_set_etf_buffer(csdev, handle);
> + if (ret)
> + break;
> + ret = tmc_etb_enable_hw(drvdata);
> + if (!ret)
> + drvdata->mode = CS_MODE_PERF;
> + } while (0);
> spin_unlock_irqrestore(&drvdata->spinlock, flags);
>
> return ret;
> @@ -271,6 +285,7 @@ static void tmc_disable_etf_sink(struct coresight_device *csdev)
> static int tmc_enable_etf_link(struct coresight_device *csdev,
> int inport, int outport)
> {
> + int ret;
> unsigned long flags;
> struct tmc_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
>
> @@ -280,11 +295,13 @@ static int tmc_enable_etf_link(struct coresight_device *csdev,
> return -EBUSY;
> }
>
> - tmc_etf_enable_hw(drvdata);
> - drvdata->mode = CS_MODE_SYSFS;
> + ret = tmc_etf_enable_hw(drvdata);
> + if (!ret)
> + drvdata->mode = CS_MODE_SYSFS;
> spin_unlock_irqrestore(&drvdata->spinlock, flags);
>
> - dev_dbg(drvdata->dev, "TMC-ETF enabled\n");
> + if (!ret)
> + dev_dbg(drvdata->dev, "TMC-ETF enabled\n");
> return 0;
We need to tell the caller if an error as occured:
return ret;
> }
>
> @@ -579,7 +596,7 @@ int tmc_read_unprepare_etb(struct tmc_drvdata *drvdata)
> * can't be NULL.
> */
> memset(drvdata->buf, 0, drvdata->size);
> - tmc_etb_enable_hw(drvdata);
> + __tmc_etb_enable_hw(drvdata);
> } else {
> /*
> * The ETB/ETF is not tracing and the buffer was just read.
> --
> 2.7.4
>
next prev parent reply other threads:[~2018-08-15 19:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-06 13:41 [PATCH 00/13] coresight: Implement device claim protocol Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 01/13] coresight: tmc-etr: Refactor for handling errors Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 02/13] coresight: tmc-etr: Handle errors enabling CATU Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 03/13] coresight: tmc-etb/etf: Prepare to handle errors enabling Suzuki K Poulose
2018-08-15 19:22 ` Mathieu Poirier [this message]
2018-08-16 14:47 ` Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 04/13] coresight: etm4x: Add support for handling errors Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 05/13] coresight: etm3: " Suzuki K Poulose
2018-08-15 19:34 ` Mathieu Poirier
2018-08-16 15:45 ` Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 06/13] coresight: etb10: Handle errors enabling the device Suzuki K Poulose
2018-08-14 17:40 ` Mathieu Poirier
2018-08-15 19:38 ` Mathieu Poirier
2018-08-16 15:46 ` Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 07/13] coresight: dynamic-replicator: Handle multiple connections Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 08/13] coresight: Add support for CLAIM tag protocol Suzuki K Poulose
2018-08-14 23:20 ` Mathieu Poirier
2018-08-16 15:47 ` Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 09/13] coresight: etmx: Claim devices before use Suzuki K Poulose
2018-08-14 23:43 ` Mathieu Poirier
2018-08-06 13:41 ` [PATCH 10/13] coresight: funnel: " Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 11/13] coresight: catu: Claim device " Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 12/13] coresight: dynamic-replicator: Claim device for use Suzuki K Poulose
2018-08-06 13:41 ` [PATCH 13/13] coreisght: tmc: Claim device before use Suzuki K Poulose
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=20180815192246.GA11625@xps15 \
--to=mathieu.poirier@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mike.leach@arm.com \
--cc=robert.walker@arm.com \
--cc=suzuki.poulose@arm.com \
/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).