From: Tingwei Zhang <tingwei@codeaurora.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Mike Leach <mike.leach@linaro.org>
Cc: tsoni@codeaurora.org,
Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
Kim Phillips <kim.phillips@arm.com>,
Mao Jinlong <jinlmao@codeaurora.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
coresight@lists.linaro.org, Randy Dunlap <rdunlap@infradead.org>,
Mian Yousaf Kaukab <ykaukab@suse.de>,
Russell King <linux@armlinux.org.uk>,
Tingwei Zhang <tingwei@codeaurora.org>,
Leo Yan <leo.yan@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 19/25] coresight: cti: Fix bug clearing sysfs links on callback
Date: Fri, 31 Jul 2020 14:40:06 +0800 [thread overview]
Message-ID: <20200731064012.8076-20-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200731064012.8076-1-tingwei@codeaurora.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>
---
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 1c34db7d1b1b..6bb06c5715db 100644
--- a/drivers/hwtracing/coresight/coresight-cti.c
+++ b/drivers/hwtracing/coresight/coresight-cti.c
@@ -608,7 +608,7 @@ 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 25578579559b..8b55383cfcf1 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -1238,8 +1238,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);
@@ -1574,6 +1572,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);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
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:[~2020-07-31 6:47 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-31 6:39 [PATCH v6 00/25] coresight: allow to build coresight as modules Tingwei Zhang
2020-07-31 6:39 ` [PATCH v6 01/25] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-08-03 16:21 ` Mike Leach
2020-07-31 6:39 ` [PATCH v6 02/25] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-07-31 6:39 ` [PATCH v6 03/25] coresight: use IS_ENABLED for CONFIGs that may be modules Tingwei Zhang
2020-07-31 6:39 ` [PATCH v6 04/25] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-07-31 6:39 ` [PATCH v6 05/25] coresight: export global symbols Tingwei Zhang
2020-08-03 17:10 ` Mike Leach
2020-07-31 6:39 ` [PATCH v6 06/25] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-08-03 17:10 ` Mike Leach
2020-07-31 6:39 ` [PATCH v6 07/25] coresight: stm: allow to build coresight-stm as a module Tingwei Zhang
2020-08-03 17:10 ` Mike Leach
2020-07-31 6:39 ` [PATCH v6 08/25] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:39 ` [PATCH v6 09/25] coresight: etm3x: allow etm3x to be built as a module Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:39 ` [PATCH v6 10/25] coresight: etm4x: allow etm4x " Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:39 ` [PATCH v6 11/25] coresight: etb: allow etb " Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:39 ` [PATCH v6 12/25] coresight: tpiu: allow tpiu " Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 13/25] coresight: tmc: allow tmc " Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 14/25] coresight: funnel: remove multiple init calls from funnel driver Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 15/25] coresight: replicator: remove multiple init calls Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 16/25] coresight: allow funnel and replicator drivers to be built as modules Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 17/25] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 18/25] coresight: cti: Fix remove sysfs link error Tingwei Zhang
2020-07-31 6:40 ` Tingwei Zhang [this message]
2020-07-31 6:40 ` [PATCH v6 20/25] coresight: cti: don't disable ect device if it's not enabled Tingwei Zhang
2020-08-03 17:13 ` Mike Leach
2020-08-04 0:21 ` Tingwei Zhang
2020-08-04 14:36 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 21/25] coresight: cti: increase reference count when enabling cti Tingwei Zhang
2020-08-03 17:13 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 22/25] coresight: cti: allow cti to be built as a module Tingwei Zhang
2020-08-03 17:11 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 23/25] coresight: tmc-etr: add function to register catu ops Tingwei Zhang
2020-08-03 17:12 ` Mike Leach
2020-07-31 6:40 ` [PATCH v6 24/25] coresight: catu: allow catu drivers to be built as modules Tingwei Zhang
2020-08-03 17:12 ` Mike Leach
2020-08-04 0:37 ` Tingwei Zhang
2020-07-31 6:40 ` [PATCH v6 25/25] coresight: allow the coresight core driver to be built as a module Tingwei Zhang
2020-08-03 17:12 ` Mike Leach
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=20200731064012.8076-20-tingwei@codeaurora.org \
--to=tingwei@codeaurora.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=coresight@lists.linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=jinlmao@codeaurora.org \
--cc=kim.phillips@arm.com \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@armlinux.org.uk \
--cc=mathieu.poirier@linaro.org \
--cc=mike.leach@linaro.org \
--cc=rdunlap@infradead.org \
--cc=saiprakash.ranjan@codeaurora.org \
--cc=suzuki.poulose@arm.com \
--cc=tsoni@codeaurora.org \
--cc=ykaukab@suse.de \
/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).