From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, coresight@lists.linaro.org,
rjw@rjwysocki.net, mathieu.poirier@linaro.org,
Suzuki K Poulose <suzuki.poulose@arm.com>
Subject: [PATCH v3 04/30] coresight: catu: Cleanup device specific data
Date: Tue, 7 May 2019 11:52:31 +0100 [thread overview]
Message-ID: <1557226378-10131-5-git-send-email-suzuki.poulose@arm.com> (raw)
In-Reply-To: <1557226378-10131-1-git-send-email-suzuki.poulose@arm.com>
Switch to using the CoreSight device instead of the real
amba device.
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
drivers/hwtracing/coresight/coresight-catu.c | 13 +++++++------
drivers/hwtracing/coresight/coresight-catu.h | 1 -
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index d948a72..63109c9 100644
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -408,13 +408,14 @@ static int catu_enable_hw(struct catu_drvdata *drvdata, void *data)
int rc;
u32 control, mode;
struct etr_buf *etr_buf = data;
+ struct device *dev = &drvdata->csdev->dev;
if (catu_wait_for_ready(drvdata))
- dev_warn(drvdata->dev, "Timeout while waiting for READY\n");
+ dev_warn(dev, "Timeout while waiting for READY\n");
control = catu_read_control(drvdata);
if (control & BIT(CATU_CONTROL_ENABLE)) {
- dev_warn(drvdata->dev, "CATU is already enabled\n");
+ dev_warn(dev, "CATU is already enabled\n");
return -EBUSY;
}
@@ -440,7 +441,7 @@ static int catu_enable_hw(struct catu_drvdata *drvdata, void *data)
catu_write_irqen(drvdata, 0);
catu_write_mode(drvdata, mode);
catu_write_control(drvdata, control);
- dev_dbg(drvdata->dev, "Enabled in %s mode\n",
+ dev_dbg(dev, "Enabled in %s mode\n",
(mode == CATU_MODE_PASS_THROUGH) ?
"Pass through" :
"Translate");
@@ -461,15 +462,16 @@ static int catu_enable(struct coresight_device *csdev, void *data)
static int catu_disable_hw(struct catu_drvdata *drvdata)
{
int rc = 0;
+ struct device *dev = &drvdata->csdev->dev;
catu_write_control(drvdata, 0);
coresight_disclaim_device_unlocked(drvdata->base);
if (catu_wait_for_ready(drvdata)) {
- dev_info(drvdata->dev, "Timeout while waiting for READY\n");
+ dev_info(dev, "Timeout while waiting for READY\n");
rc = -EAGAIN;
}
- dev_dbg(drvdata->dev, "Disabled\n");
+ dev_dbg(dev, "Disabled\n");
return rc;
}
@@ -519,7 +521,6 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id)
goto out;
}
- drvdata->dev = dev;
dev_set_drvdata(dev, drvdata);
base = devm_ioremap_resource(dev, &adev->res);
if (IS_ERR(base)) {
diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h
index 1d2ad18..80ceee3 100644
--- a/drivers/hwtracing/coresight/coresight-catu.h
+++ b/drivers/hwtracing/coresight/coresight-catu.h
@@ -61,7 +61,6 @@
#define CATU_IRQEN_OFF 0x0
struct catu_drvdata {
- struct device *dev;
void __iomem *base;
struct coresight_device *csdev;
int irq;
--
2.7.4
next prev parent reply other threads:[~2019-05-07 10:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-07 10:52 [PATCH v3 00/30] coresight: Support for ACPI bindings Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 01/30] coresight: funnel: Clean up device book keeping Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 02/30] coresight: replicator: Cleanup device tracking Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 03/30] coresight: tmc: Clean up device specific data Suzuki K Poulose
2019-05-07 10:52 ` Suzuki K Poulose [this message]
2019-05-07 10:52 ` [PATCH v3 05/30] coresight: tpiu: " Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 06/30] coresight: stm: Cleanup " Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 07/30] coresight: etm: Clean up " Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 08/30] coresight: etb10: " Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 09/30] coresight: Use coresight device names for sinks in PMU attribute Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 10/30] coresight: Rename of_coresight to coresight-platform Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 11/30] coresight: etm3x: Rearrange cp14 access detection Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 12/30] coresight: stm: Rearrange probing the stimulus area Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 13/30] coresight: tmc-etr: Rearrange probing default buffer size Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 14/30] coresight: platform: Make memory allocation helper generic Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 15/30] coresight: Make sure device uses DT for obsolete compatible check Suzuki K Poulose
2019-05-13 16:18 ` Mathieu Poirier
2019-05-07 10:52 ` [PATCH v3 16/30] coresight: Introduce generic platform data helper Suzuki K Poulose
2019-05-13 16:39 ` Mathieu Poirier
2019-05-07 10:52 ` [PATCH v3 17/30] coresight: Make device to CPU mapping generic Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 18/30] coresight: Remove cpu field from platform data Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 19/30] coresight: Remove name from platform description Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 20/30] coresight: Cleanup coresight_remove_conns Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 21/30] coresight: Reuse platform data structure for connection tracking Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 22/30] coresight: Rearrange platform data probing Suzuki K Poulose
2019-05-13 17:21 ` Mathieu Poirier
2019-05-07 10:52 ` [PATCH v3 23/30] coresight: Add support for releasing platform specific data Suzuki K Poulose
2019-05-13 22:40 ` Mathieu Poirier
2019-05-07 10:52 ` [PATCH v3 24/30] coresight: platform: Use fwnode handle for device search Suzuki K Poulose
2019-05-13 17:39 ` Mathieu Poirier
2019-05-07 10:52 ` [PATCH v3 25/30] coresight: Use fwnode handle instead of device names Suzuki K Poulose
2019-05-13 17:59 ` Mathieu Poirier
2019-05-07 10:52 ` [PATCH v3 26/30] coresight: Use platform agnostic names Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 27/30] coresight: stm: ACPI support for parsing stimulus base Suzuki K Poulose
2019-05-07 10:52 ` [PATCH v3 28/30] coresight: Support for ACPI bindings Suzuki K Poulose
2019-05-13 22:28 ` Mathieu Poirier
2019-05-07 10:52 ` [PATCH v3 29/30] coresight: acpi: Support for AMBA components Suzuki K Poulose
2019-05-13 22:33 ` Mathieu Poirier
2019-05-07 10:52 ` [PATCH v3 30/30] coresight: acpi: Support for platform devices Suzuki K Poulose
2019-05-07 10:52 ` [TEST PATCH 31/30][EDK2] edk2-platform: juno: Update ACPI CoreSight Bindings 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=1557226378-10131-5-git-send-email-suzuki.poulose@arm.com \
--to=suzuki.poulose@arm.com \
--cc=coresight@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=rjw@rjwysocki.net \
/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).