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 23/25] coresight: tmc-etr: add function to register catu ops
Date: Fri, 31 Jul 2020 14:40:10 +0800 [thread overview]
Message-ID: <20200731064012.8076-24-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200731064012.8076-1-tingwei@codeaurora.org>
From: Mian Yousaf Kaukab <ykaukab@suse.de>
Make etr_catu_buf_ops static. Instead of directly accessing it in
etr_buf_ops[], add a function to let catu driver register the ops at
runtime. Break circular dependency between tmc-etr and catu drivers.
Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
---
drivers/hwtracing/coresight/coresight-catu.c | 22 +++++++++++++++++--
drivers/hwtracing/coresight/coresight-catu.h | 2 --
.../hwtracing/coresight/coresight-tmc-etr.c | 15 +++++++++++--
drivers/hwtracing/coresight/coresight-tmc.h | 3 +++
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index 1801804a7762..47696a7d24a7 100644
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -358,7 +358,7 @@ static int catu_alloc_etr_buf(struct tmc_drvdata *tmc_drvdata,
return 0;
}
-const struct etr_buf_operations etr_catu_buf_ops = {
+static const struct etr_buf_operations etr_catu_buf_ops = {
.alloc = catu_alloc_etr_buf,
.free = catu_free_etr_buf,
.sync = catu_sync_etr_buf,
@@ -582,4 +582,22 @@ static struct amba_driver catu_driver = {
.id_table = catu_ids,
};
-builtin_amba_driver(catu_driver);
+static int __init catu_init(void)
+{
+ int ret;
+
+ ret = amba_driver_register(&catu_driver);
+ if (ret)
+ pr_info("Error registering catu driver\n");
+ tmc_etr_set_catu_ops(&etr_catu_buf_ops);
+ return ret;
+}
+
+static void __exit catu_exit(void)
+{
+ tmc_etr_remove_catu_ops();
+ amba_driver_unregister(&catu_driver);
+}
+
+module_init(catu_init);
+module_exit(catu_exit);
diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h
index 80ceee3c739c..6160c2d75a56 100644
--- a/drivers/hwtracing/coresight/coresight-catu.h
+++ b/drivers/hwtracing/coresight/coresight-catu.h
@@ -108,6 +108,4 @@ static inline bool coresight_is_catu_device(struct coresight_device *csdev)
return true;
}
-extern const struct etr_buf_operations etr_catu_buf_ops;
-
#endif
diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index ad991a37e2d2..714f9e867e5f 100644
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -794,10 +794,21 @@ static inline void tmc_etr_disable_catu(struct tmc_drvdata *drvdata)
static const struct etr_buf_operations *etr_buf_ops[] = {
[ETR_MODE_FLAT] = &etr_flat_buf_ops,
[ETR_MODE_ETR_SG] = &etr_sg_buf_ops,
- [ETR_MODE_CATU] = IS_ENABLED(CONFIG_CORESIGHT_CATU)
- ? &etr_catu_buf_ops : NULL,
+ [ETR_MODE_CATU] = NULL,
};
+void tmc_etr_set_catu_ops(const struct etr_buf_operations *catu)
+{
+ etr_buf_ops[ETR_MODE_CATU] = catu;
+}
+EXPORT_SYMBOL_GPL(tmc_etr_set_catu_ops);
+
+void tmc_etr_remove_catu_ops(void)
+{
+ etr_buf_ops[ETR_MODE_CATU] = NULL;
+}
+EXPORT_SYMBOL_GPL(tmc_etr_remove_catu_ops);
+
static inline int tmc_etr_mode_alloc_buf(int mode,
struct tmc_drvdata *drvdata,
struct etr_buf *etr_buf, int node,
diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h
index 6e8d2dc33d17..b91ec7dde7bc 100644
--- a/drivers/hwtracing/coresight/coresight-tmc.h
+++ b/drivers/hwtracing/coresight/coresight-tmc.h
@@ -326,4 +326,7 @@ tmc_sg_table_buf_size(struct tmc_sg_table *sg_table)
struct coresight_device *tmc_etr_get_catu_device(struct tmc_drvdata *drvdata);
+void tmc_etr_set_catu_ops(const struct etr_buf_operations *catu);
+void tmc_etr_remove_catu_ops(void);
+
#endif
--
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:51 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 ` [PATCH v6 19/25] coresight: cti: Fix bug clearing sysfs links on callback Tingwei Zhang
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 ` Tingwei Zhang [this message]
2020-08-03 17:12 ` [PATCH v6 23/25] coresight: tmc-etr: add function to register catu ops 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-24-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).