From: Suzuki K Poulose <suzuki.poulose@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, coresight@lists.linaro.org, mike.leach@linaro.org, robert.walker@arm.com, Suzuki K Poulose <suzuki.poulose@arm.com>, Mathieu Poirier <mathieu.poirier@linaro.org> Subject: [PATCH 09/25] coresight: catu: Cleanup device specific data Date: Wed, 20 Mar 2019 18:49:26 +0000 [thread overview] Message-ID: <1553107783-3340-10-git-send-email-suzuki.poulose@arm.com> (raw) In-Reply-To: <1553107783-3340-1-git-send-email-suzuki.poulose@arm.com> Switch to using the CoreSight device instead of the real amba device. Cc: 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 11c6f2f..671a05a 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 1b281f0..96ea8c4 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
WARNING: multiple messages have this Message-ID (diff)
From: Suzuki K Poulose <suzuki.poulose@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: Mathieu Poirier <mathieu.poirier@linaro.org>, Suzuki K Poulose <suzuki.poulose@arm.com>, coresight@lists.linaro.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, robert.walker@arm.com, mike.leach@linaro.org Subject: [PATCH 09/25] coresight: catu: Cleanup device specific data Date: Wed, 20 Mar 2019 18:49:26 +0000 [thread overview] Message-ID: <1553107783-3340-10-git-send-email-suzuki.poulose@arm.com> (raw) In-Reply-To: <1553107783-3340-1-git-send-email-suzuki.poulose@arm.com> Switch to using the CoreSight device instead of the real amba device. Cc: 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 11c6f2f..671a05a 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 1b281f0..96ea8c4 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-03-20 18:49 UTC|newest] Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-20 18:49 [PATCH 00/25] coresight: Support for ACPI bindings Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 01/25] coresight: tmc: Report DMA setup failures Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 02/25] coresight: dynamic-replicator: Clean up error handling Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 03/25] coresight: replicator: Prepare for merging with dynamic-replicator Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 04/25] coresight: dynamic-replicator: Prepare for merging with static replicator Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 05/25] coresight: Merge the static and dynamic replicator drivers Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-27 15:27 ` Mathieu Poirier 2019-03-27 15:27 ` Mathieu Poirier 2019-03-27 17:33 ` Suzuki K Poulose 2019-03-27 17:33 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 06/25] coresight: funnel: Clean up device book keeping Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 07/25] coresight: replicator: Cleanup device tracking Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 08/25] coresight: tmc: Clean up device specific data Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-26 21:53 ` Mathieu Poirier 2019-03-26 21:53 ` Mathieu Poirier 2019-03-27 11:45 ` Suzuki K Poulose 2019-03-27 11:45 ` Suzuki K Poulose 2019-03-27 14:42 ` Suzuki K Poulose 2019-03-27 14:42 ` Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose [this message] 2019-03-20 18:49 ` [PATCH 09/25] coresight: catu: Cleanup " Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 10/25] coresight: tpiu: Clean up " Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-26 21:54 ` Mathieu Poirier 2019-03-26 21:54 ` Mathieu Poirier 2019-03-27 11:52 ` Suzuki K Poulose 2019-03-27 11:52 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 11/25] coresight: stm: Cleanup " Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 12/25] coresight: etm: Clean up " Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 13/25] coresight: etb10: " Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-27 21:39 ` Mathieu Poirier 2019-03-27 21:39 ` Mathieu Poirier 2019-03-28 11:09 ` Suzuki K Poulose 2019-03-28 11:09 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 14/25] coresight: Rename of_coresight to coresight-platform Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 15/25] coresight: etm3x: Rearrange cp14 access detection Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-27 22:05 ` Mathieu Poirier 2019-03-27 22:05 ` Mathieu Poirier 2019-03-28 11:03 ` Suzuki K Poulose 2019-03-28 11:03 ` Suzuki K Poulose 2019-03-28 11:03 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 16/25] coresight: stm: Rearrange probing the stimulus area Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 17/25] coresight: tmc-etr: Rearrange probing default buffer size Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 18/25] coresight: Introduce generic platform data helper Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-27 22:57 ` Mathieu Poirier 2019-03-27 22:57 ` Mathieu Poirier 2019-03-28 10:59 ` Suzuki K Poulose 2019-03-28 10:59 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 19/25] coresight: Make device to CPU mapping generic Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 20/25] coresight: platform: Use fwnode handle for device search Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 21/25] coresight: Use fwnode handle instead of device names Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-28 17:42 ` Mathieu Poirier 2019-03-28 17:42 ` Mathieu Poirier 2019-03-28 18:42 ` Suzuki K Poulose 2019-03-28 18:42 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 22/25] coresight: Use platform agnostic names Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-28 19:43 ` Mathieu Poirier 2019-03-28 19:43 ` Mathieu Poirier 2019-03-20 18:49 ` [PATCH 23/25] coresight: stm: ACPI support for parsing stimulus base Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-28 20:41 ` Mathieu Poirier 2019-03-28 20:41 ` Mathieu Poirier 2019-04-04 11:27 ` Suzuki K Poulose 2019-04-04 11:27 ` Suzuki K Poulose 2019-03-20 18:49 ` [PATCH 24/25] coresight: Support for ACPI bindings Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-29 19:09 ` Mathieu Poirier 2019-03-29 19:09 ` Mathieu Poirier 2019-03-20 18:49 ` [PATCH 25/25] coresight: acpi: Support for components Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-20 18:49 ` [TEST PATCH 26/25] edk2-platform: juno: Update ACPI CoreSight Bindings Suzuki K Poulose 2019-03-20 18:49 ` Suzuki K Poulose 2019-03-22 10:13 ` [PATCH 00/25] coresight: Support for ACPI bindings Suzuki K Poulose 2019-03-22 10:13 ` 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=1553107783-3340-10-git-send-email-suzuki.poulose@arm.com \ --to=suzuki.poulose@arm.com \ --cc=coresight@lists.linaro.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mathieu.poirier@linaro.org \ --cc=mike.leach@linaro.org \ --cc=robert.walker@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.