linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mathieu Poirier <mathieu.poirier@linaro.org>
To: gregkh@linuxfoundation.org
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 18/25] coresight: cti: Fix bug clearing sysfs links on callback
Date: Mon, 28 Sep 2020 10:35:06 -0600	[thread overview]
Message-ID: <20200928163513.70169-19-mathieu.poirier@linaro.org> (raw)
In-Reply-To: <20200928163513.70169-1-mathieu.poirier@linaro.org>

From: Mike Leach <mike.leach@linaro.org>

During module unload, a coresight driver module will call back into
the CTI driver to remove any links between the two devices.

The current code has 2 issues:-
1) in the CTI driver the matching code is matching to the wrong device
so misses all the links.
2) The callback is called too late in the unload process resulting in a
crash.

This fixes both the issues.

Fixes: 177af8285b59 ("coresight: cti: Enable CTI associated with devices")
Reported-by: Tingwei Zhang <tingwei@codeaurora.org>
Signed-off-by: Mike Leach <mike.leach@linaro.org>
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
 drivers/hwtracing/coresight/coresight-cti.c | 2 +-
 drivers/hwtracing/coresight/coresight.c     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-cti.c b/drivers/hwtracing/coresight/coresight-cti.c
index abc8b32e79b3..38e785d913b0 100644
--- a/drivers/hwtracing/coresight/coresight-cti.c
+++ b/drivers/hwtracing/coresight/coresight-cti.c
@@ -591,7 +591,7 @@ static void cti_remove_assoc_from_csdev(struct coresight_device *csdev)
 		ctidrv = csdev_to_cti_drvdata(csdev->ect_dev);
 		ctidev = &ctidrv->ctidev;
 		list_for_each_entry(tc, &ctidev->trig_cons, node) {
-			if (tc->con_dev == csdev->ect_dev) {
+			if (tc->con_dev == csdev) {
 				cti_remove_sysfs_link(ctidrv, tc);
 				tc->con_dev = NULL;
 				break;
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 4f4485b17458..b8b0a20e93c9 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -1246,8 +1246,6 @@ static void coresight_device_release(struct device *dev)
 {
 	struct coresight_device *csdev = to_coresight_device(dev);
 
-	if (cti_assoc_ops && cti_assoc_ops->remove)
-		cti_assoc_ops->remove(csdev);
 	fwnode_handle_put(csdev->dev.fwnode);
 	kfree(csdev->refcnt);
 	kfree(csdev);
@@ -1582,6 +1580,8 @@ void coresight_unregister(struct coresight_device *csdev)
 {
 	etm_perf_del_symlink_sink(csdev);
 	/* Remove references of that device in the topology */
+	if (cti_assoc_ops && cti_assoc_ops->remove)
+		cti_assoc_ops->remove(csdev);
 	coresight_remove_conns(csdev);
 	coresight_clear_default_sink(csdev);
 	coresight_release_platform_data(csdev, csdev->pdata);
-- 
2.25.1


  parent reply	other threads:[~2020-09-28 16:36 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-28 16:34 [PATCH 00/25] coresight: Next v5.9-rc7 Mathieu Poirier
2020-09-28 16:34 ` [PATCH 01/25] coresight: cpu_debug: Add module name in Kconfig Mathieu Poirier
2020-09-28 16:34 ` [PATCH 02/25] coresight: cpu_debug: Define MODULE_DEVICE_TABLE Mathieu Poirier
2020-09-28 16:34 ` [PATCH 03/25] coresight: Use IS_ENABLED for CONFIGs that may be modules Mathieu Poirier
2020-09-28 16:34 ` [PATCH 04/25] coresight: Add coresight prefix to barrier_pkt Mathieu Poirier
2020-09-28 16:34 ` [PATCH 05/25] coresight: Export global symbols Mathieu Poirier
2020-09-28 16:34 ` [PATCH 06/25] coresight: Add try_get_module() in coresight_grab_device() Mathieu Poirier
2020-09-28 16:34 ` [PATCH 07/25] coresight: stm: Allow to build coresight-stm as a module Mathieu Poirier
2020-09-28 16:34 ` [PATCH 08/25] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Mathieu Poirier
2020-09-28 16:34 ` [PATCH 09/25] coresight: etm3x: Allow etm3x to be built as a module Mathieu Poirier
2020-09-28 16:34 ` [PATCH 10/25] coresight: etm4x: Allow etm4x " Mathieu Poirier
2020-09-28 16:34 ` [PATCH 11/25] coresight: etb: Allow etb " Mathieu Poirier
2020-09-28 16:35 ` [PATCH 12/25] coresight: tpiu: Allow tpiu " Mathieu Poirier
2020-09-28 16:35 ` [PATCH 13/25] coresight: tmc: Allow tmc " Mathieu Poirier
2020-09-28 16:35 ` [PATCH 14/25] coresight: funnel: Allow funnel driver to be built as module Mathieu Poirier
2020-09-28 16:35 ` [PATCH 15/25] coresight: replicator: Allow replicator " Mathieu Poirier
2020-09-28 16:35 ` [PATCH 16/25] coresight: cti: Add function to register cti associate ops Mathieu Poirier
2020-09-28 16:35 ` [PATCH 17/25] coresight: cti: Fix remove sysfs link error Mathieu Poirier
2020-09-28 16:35 ` Mathieu Poirier [this message]
2020-09-28 16:35 ` [PATCH 19/25] coresight: cti: Don't disable ect device if it's not enabled Mathieu Poirier
2020-09-28 16:35 ` [PATCH 20/25] coresight: cti: Increase reference count when enabling cti Mathieu Poirier
2020-09-28 16:35 ` [PATCH 21/25] coresight: cti: Allow cti to be built as a module Mathieu Poirier
2020-09-28 16:35 ` [PATCH 22/25] coresight: tmc-etr: Add function to register catu ops Mathieu Poirier
2020-09-28 16:35 ` [PATCH 23/25] coresight: catu: Allow catu drivers to be built as modules Mathieu Poirier
2020-09-28 16:35 ` [PATCH 24/25] coresight: core: Allow the coresight core driver to be built as a module Mathieu Poirier
2020-09-28 16:35 ` [PATCH 25/25] coresight: etm4x: Fix save and restore of TRCVMIDCCTLR1 register 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=20200928163513.70169-19-mathieu.poirier@linaro.org \
    --to=mathieu.poirier@linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.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).