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>,
linux-kernel@vger.kernel.org,
Tingwei Zhang <tingwei@codeaurora.org>,
Leo Yan <leo.yan@linaro.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v9 21/24] coresight: cti: allow cti to be built as a module
Date: Thu, 20 Aug 2020 13:47:15 +0800 [thread overview]
Message-ID: <20200820054718.20115-22-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200820054718.20115-1-tingwei@codeaurora.org>
Allow to build coresight-cti as a module, for ease of development.
- Kconfig becomes a tristate, to allow =m
- append -core to source file name to allow module to
be called coresight-cti by the Makefile
- add an cti_remove function, for module unload
- move cti_remove_conn_xrefs to cti_remove
- add a MODULE_DEVICE_TABLE for autoloading on boot
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
Tested-by: Mike Leach <mike.leach@linaro.org>
Reviewed-by Mike Leach <mike.leach@linaro.org>
---
drivers/hwtracing/coresight/Kconfig | 5 ++++-
drivers/hwtracing/coresight/Makefile | 4 ++--
.../{coresight-cti.c => coresight-cti-core.c} | 20 ++++++++++++++++++-
.../hwtracing/coresight/coresight-platform.c | 1 +
drivers/hwtracing/coresight/coresight.c | 1 +
5 files changed, 27 insertions(+), 4 deletions(-)
rename drivers/hwtracing/coresight/{coresight-cti.c => coresight-cti-core.c} (98%)
diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig
index f31778dd0b5d..b04aae2ceecc 100644
--- a/drivers/hwtracing/coresight/Kconfig
+++ b/drivers/hwtracing/coresight/Kconfig
@@ -136,7 +136,7 @@ config CORESIGHT_CPU_DEBUG
module will be called coresight-cpu-debug.
config CORESIGHT_CTI
- bool "CoreSight Cross Trigger Interface (CTI) driver"
+ tristate "CoreSight Cross Trigger Interface (CTI) driver"
depends on ARM || ARM64
help
This driver provides support for CoreSight CTI and CTM components.
@@ -147,6 +147,9 @@ config CORESIGHT_CTI
halt compared to disabling sources and sinks normally in driver
software.
+ To compile this driver as a module, choose M here: the
+ module will be called coresight-cti.
+
config CORESIGHT_CTI_INTEGRATION_REGS
bool "Access CTI CoreSight Integration Registers"
depends on CORESIGHT_CTI
diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile
index f2a568b969c4..0359d5a1588f 100644
--- a/drivers/hwtracing/coresight/Makefile
+++ b/drivers/hwtracing/coresight/Makefile
@@ -19,6 +19,6 @@ coresight-etm4x-y := coresight-etm4x-core.o coresight-etm4x-sysfs.o
obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o
obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o
obj-$(CONFIG_CORESIGHT_CATU) += coresight-catu.o
-obj-$(CONFIG_CORESIGHT_CTI) += coresight-cti.o \
- coresight-cti-platform.o \
+obj-$(CONFIG_CORESIGHT_CTI) += coresight-cti.o
+coresight-cti-y := coresight-cti-core.o coresight-cti-platform.o \
coresight-cti-sysfs.o
diff --git a/drivers/hwtracing/coresight/coresight-cti.c b/drivers/hwtracing/coresight/coresight-cti-core.c
similarity index 98%
rename from drivers/hwtracing/coresight/coresight-cti.c
rename to drivers/hwtracing/coresight/coresight-cti-core.c
index 6bb06c5715db..1d8d7cb41937 100644
--- a/drivers/hwtracing/coresight/coresight-cti.c
+++ b/drivers/hwtracing/coresight/coresight-cti-core.c
@@ -838,7 +838,6 @@ static void cti_device_release(struct device *dev)
struct cti_drvdata *ect_item, *ect_tmp;
mutex_lock(&ect_mutex);
- cti_remove_conn_xrefs(drvdata);
cti_pm_release(drvdata);
/* remove from the list */
@@ -853,6 +852,18 @@ static void cti_device_release(struct device *dev)
if (drvdata->csdev_release)
drvdata->csdev_release(dev);
}
+static int __exit cti_remove(struct amba_device *adev)
+{
+ struct cti_drvdata *drvdata = dev_get_drvdata(&adev->dev);
+
+ mutex_lock(&ect_mutex);
+ cti_remove_conn_xrefs(drvdata);
+ mutex_unlock(&ect_mutex);
+
+ coresight_unregister(drvdata->csdev);
+
+ return 0;
+}
static int cti_probe(struct amba_device *adev, const struct amba_id *id)
{
@@ -973,6 +984,8 @@ static const struct amba_id cti_ids[] = {
{ 0, 0},
};
+MODULE_DEVICE_TABLE(amba, cti_ids);
+
static struct amba_driver cti_driver = {
.drv = {
.name = "coresight-cti",
@@ -980,6 +993,7 @@ static struct amba_driver cti_driver = {
.suppress_bind_attrs = true,
},
.probe = cti_probe,
+ .remove = cti_remove,
.id_table = cti_ids,
};
@@ -1002,3 +1016,7 @@ static void __exit cti_exit(void)
module_init(cti_init);
module_exit(cti_exit);
+
+MODULE_AUTHOR("Mike Leach <mike.leach@linaro.org>");
+MODULE_DESCRIPTION("Arm CoreSight CTI Driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c
index bfd44231d7ad..635d55c1d580 100644
--- a/drivers/hwtracing/coresight/coresight-platform.c
+++ b/drivers/hwtracing/coresight/coresight-platform.c
@@ -75,6 +75,7 @@ coresight_find_csdev_by_fwnode(struct fwnode_handle *r_fwnode)
}
return csdev;
}
+EXPORT_SYMBOL_GPL(coresight_find_csdev_by_fwnode);
#ifdef CONFIG_OF
static inline bool of_coresight_legacy_ep_is_input(struct device_node *ep)
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c
index 6c9f6930b8b8..668963b4b7d4 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight.c
@@ -288,6 +288,7 @@ void coresight_set_assoc_ectdev_mutex(struct coresight_device *csdev,
csdev->ect_dev = ect_csdev;
mutex_unlock(&coresight_mutex);
}
+EXPORT_SYMBOL_GPL(coresight_set_assoc_ectdev_mutex);
static int coresight_enable_sink(struct coresight_device *csdev,
u32 mode, void *data)
--
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-08-20 5:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 5:46 [PATCH v9 00/24] coresight: allow to build coresight as modules Tingwei Zhang
2020-08-20 5:46 ` [PATCH v9 01/24] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-08-20 5:46 ` [PATCH v9 02/24] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-08-20 5:46 ` [PATCH v9 03/24] coresight: use IS_ENABLED for CONFIGs that may be modules Tingwei Zhang
2020-08-20 5:46 ` [PATCH v9 04/24] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-08-20 5:46 ` [PATCH v9 05/24] coresight: export global symbols Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 06/24] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 07/24] coresight: stm: allow to build coresight-stm as a module Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 08/24] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 09/24] coresight: etm3x: allow etm3x to be built as a module Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 10/24] coresight: etm4x: allow etm4x " Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 11/24] coresight: etb: allow etb " Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 12/24] coresight: tpiu: allow tpiu " Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 13/24] coresight: tmc: allow tmc " Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 14/24] coresight: allow funnel driver to be built as module Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 15/24] coresight: allow replicator " Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 16/24] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 17/24] coresight: cti: Fix remove sysfs link error Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 18/24] coresight: cti: Fix bug clearing sysfs links on callback Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 19/24] coresight: cti: don't disable ect device if it's not enabled Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 20/24] coresight: cti: increase reference count when enabling cti Tingwei Zhang
2020-08-20 5:47 ` Tingwei Zhang [this message]
2020-08-20 5:47 ` [PATCH v9 22/24] coresight: tmc-etr: add function to register catu ops Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 23/24] coresight: catu: allow catu drivers to be built as modules Tingwei Zhang
2020-08-20 5:47 ` [PATCH v9 24/24] coresight: allow the coresight core driver to be built as a module Tingwei Zhang
2020-09-08 17:53 ` [PATCH v9 00/24] coresight: allow to build coresight as modules Mathieu Poirier
2020-09-09 2:54 ` Tingwei Zhang
[not found] ` <0101017470c9475d-00e296fc-1173-4afa-95cb-22ac70d85d5b-000000@us-west-2.amazonses.com>
2020-09-09 16:15 ` Mathieu Poirier
2020-09-09 20:45 ` tsoni
[not found] ` <c8737d9935a1b7a7372c41492939648d@codeaurora.org>
2020-09-09 23:56 ` 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=20200820054718.20115-22-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-kernel@vger.kernel.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).