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>
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 v3 17/20] coresight: tmc-etr: add function to register catu ops
Date: Fri, 17 Jul 2020 13:45:33 +0800 [thread overview]
Message-ID: <20200717054536.7052-18-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200717054536.7052-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 16ebf38a9f66..9d51df7d08f9 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,
@@ -585,4 +585,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 b86c76ae26b9..8f84f294d0d8 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 71de978575f3..db431e230a40 100644
--- a/drivers/hwtracing/coresight/coresight-tmc.h
+++ b/drivers/hwtracing/coresight/coresight-tmc.h
@@ -325,4 +325,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-17 5:52 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 5:45 [PATCH v3 00/20] coresight: allow to build coresight as modules Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 01/20] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 02/20] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 03/20] coresight: use IS_ENABLED for CONFIGs that may be modules Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 04/20] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 05/20] coresight: export global symbols Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 06/20] Allow to build coresight-stm as a module, for ease of development Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 07/20] coresight: allow etm3x to be built as a module Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 08/20] coresight: allow etm4x " Tingwei Zhang
2020-07-17 17:05 ` Mike Leach
2020-07-18 3:25 ` tingwei
2020-07-18 17:38 ` Mike Leach
2020-07-21 14:55 ` Mathieu Poirier
2020-07-21 23:22 ` tingwei
2020-07-20 6:58 ` Sai Prakash Ranjan
2020-07-21 7:03 ` Sai Prakash Ranjan
2020-07-17 5:45 ` [PATCH v3 09/20] coresight: allow etb " Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 10/20] coresight: allow tpiu " Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 11/20] coresight: allow tmc " Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 12/20] coresight: remove multiple init calls from funnel driver Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 13/20] coresight: remove multiple init calls from replicator driver Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 14/20] coresight: allow funnel and replicator drivers to be built as modules Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 15/20] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 16/20] coresight: allow cti to be built as a module Tingwei Zhang
2020-07-20 17:00 ` Mike Leach
2020-07-20 21:07 ` Mike Leach
2020-07-21 16:35 ` Mike Leach
2020-07-21 23:27 ` tingwei
2020-07-17 5:45 ` Tingwei Zhang [this message]
2020-07-17 5:45 ` [PATCH v3 18/20] coresight: allow catu drivers to be built as modules Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 19/20] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-07-22 10:49 ` Suzuki K Poulose
2020-07-22 10:48 ` Greg KH
2020-07-22 11:26 ` Suzuki K Poulose
2020-07-23 0:18 ` tingwei
2020-07-23 0:35 ` tingwei
2020-07-22 10:51 ` Suzuki K Poulose
2020-07-23 0:19 ` tingwei
2020-07-23 19:36 ` Mathieu Poirier
2020-07-24 1:17 ` Tingwei Zhang
2020-07-17 5:45 ` [PATCH v3 20/20] coresight: allow the coresight core driver to be built as a module Tingwei Zhang
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=20200717054536.7052-18-tingwei@codeaurora.org \
--to=tingwei@codeaurora$(echo .)org \
--cc=alexander.shishkin@linux$(echo .)intel.com \
--cc=coresight@lists$(echo .)linaro.org \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=jinlmao@codeaurora$(echo .)org \
--cc=kim.phillips@arm$(echo .)com \
--cc=leo.yan@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=mathieu.poirier@linaro$(echo .)org \
--cc=rdunlap@infradead$(echo .)org \
--cc=saiprakash.ranjan@codeaurora$(echo .)org \
--cc=suzuki.poulose@arm$(echo .)com \
--cc=tsoni@codeaurora$(echo .)org \
--cc=ykaukab@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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