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>,
Suzuki K Poulose <Suzuki.Poulose@arm.com>,
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 v4 20/20] coresight: allow the coresight core driver to be built as a module
Date: Thu, 23 Jul 2020 12:28:02 +0800 [thread overview]
Message-ID: <20200723042802.22511-21-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200723042802.22511-1-tingwei@codeaurora.org>
Enhance coresight developer's efficiency to debug coresight drivers.
- Kconfig becomes a tristate, to allow =m
- append -core to source file name to allow module to
be called coresight by the Makefile
- modules can have only one init/exit, so we add the etm_perf
register/unregister function calls to the core init/exit
functions.
- add a MODULE_DEVICE_TABLE for autoloading on boot
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Suzuki K Poulose <Suzuki.Poulose@arm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Kim Phillips <kim.phillips@arm.com>
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
---
drivers/hwtracing/coresight/Kconfig | 5 ++-
drivers/hwtracing/coresight/Makefile | 5 ++-
.../{coresight.c => coresight-core.c} | 42 ++++++++++++++-----
.../hwtracing/coresight/coresight-etm-perf.c | 8 +++-
.../hwtracing/coresight/coresight-etm-perf.h | 3 ++
5 files changed, 48 insertions(+), 15 deletions(-)
rename drivers/hwtracing/coresight/{coresight.c => coresight-core.c} (98%)
diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig
index dfe407cde262..c1198245461d 100644
--- a/drivers/hwtracing/coresight/Kconfig
+++ b/drivers/hwtracing/coresight/Kconfig
@@ -3,7 +3,7 @@
# Coresight configuration
#
menuconfig CORESIGHT
- bool "CoreSight Tracing Support"
+ tristate "CoreSight Tracing Support"
depends on ARM || ARM64
depends on OF || ACPI
select ARM_AMBA
@@ -15,6 +15,9 @@ menuconfig CORESIGHT
specification and configure the right series of components when a
trace source gets enabled.
+ To compile this driver as a module, choose M here: the
+ module will be called coresight.
+
if CORESIGHT
config CORESIGHT_LINKS_AND_SINKS
tristate "CoreSight Link and Sink drivers"
diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile
index 0359d5a1588f..1b35b55bd420 100644
--- a/drivers/hwtracing/coresight/Makefile
+++ b/drivers/hwtracing/coresight/Makefile
@@ -2,8 +2,9 @@
#
# Makefile for CoreSight drivers.
#
-obj-$(CONFIG_CORESIGHT) += coresight.o coresight-etm-perf.o \
- coresight-platform.o coresight-sysfs.o
+obj-$(CONFIG_CORESIGHT) += coresight.o
+coresight-y := coresight-core.o coresight-etm-perf.o coresight-platform.o \
+ coresight-sysfs.o
obj-$(CONFIG_CORESIGHT_LINK_AND_SINK_TMC) += coresight-tmc.o
coresight-tmc-y := coresight-tmc-core.o coresight-tmc-etf.o \
coresight-tmc-etr.o
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight-core.c
similarity index 98%
rename from drivers/hwtracing/coresight/coresight.c
rename to drivers/hwtracing/coresight/coresight-core.c
index 16329f16ac2b..9d744b5e82d1 100644
--- a/drivers/hwtracing/coresight/coresight.c
+++ b/drivers/hwtracing/coresight/coresight-core.c
@@ -1420,16 +1420,6 @@ int coresight_timeout(void __iomem *addr, u32 offset, int position, int value)
}
EXPORT_SYMBOL_GPL(coresight_timeout);
-struct bus_type coresight_bustype = {
- .name = "coresight",
-};
-
-static int __init coresight_init(void)
-{
- return bus_register(&coresight_bustype);
-}
-postcore_initcall(coresight_init);
-
/*
* coresight_release_platform_data: Release references to the devices connected
* to the output port of this device.
@@ -1636,3 +1626,35 @@ char *coresight_alloc_device_name(struct coresight_dev_list *dict,
return name;
}
EXPORT_SYMBOL_GPL(coresight_alloc_device_name);
+
+struct bus_type coresight_bustype = {
+ .name = "coresight",
+};
+
+static int __init coresight_init(void)
+{
+ int ret;
+
+ ret = bus_register(&coresight_bustype);
+ if (ret)
+ return ret;
+
+ ret = etm_perf_init();
+ if (ret)
+ bus_unregister(&coresight_bustype);
+
+ return ret;
+}
+
+static void __exit coresight_exit(void)
+{
+ etm_perf_exit();
+ bus_unregister(&coresight_bustype);
+}
+
+module_init(coresight_init);
+module_exit(coresight_exit);
+
+MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier@linaro.org>");
+MODULE_DESCRIPTION("Arm CoreSight tracer driver");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c
index dcb0592418ae..dc4bb0906492 100644
--- a/drivers/hwtracing/coresight/coresight-etm-perf.c
+++ b/drivers/hwtracing/coresight/coresight-etm-perf.c
@@ -591,7 +591,7 @@ void etm_perf_del_symlink_sink(struct coresight_device *csdev)
csdev->ea = NULL;
}
-static int __init etm_perf_init(void)
+int __init etm_perf_init(void)
{
int ret;
@@ -618,4 +618,8 @@ static int __init etm_perf_init(void)
return ret;
}
-device_initcall(etm_perf_init);
+
+void __exit etm_perf_exit(void)
+{
+ perf_pmu_unregister(&etm_pmu);
+}
diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h
index 05f89723e282..3e4f2ad5e193 100644
--- a/drivers/hwtracing/coresight/coresight-etm-perf.h
+++ b/drivers/hwtracing/coresight/coresight-etm-perf.h
@@ -82,4 +82,7 @@ static inline void *etm_perf_sink_config(struct perf_output_handle *handle)
#endif /* CONFIG_CORESIGHT */
+int __init etm_perf_init(void);
+void __exit etm_perf_exit(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-23 4:35 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 4:27 [PATCH v4 00/20] coresight: allow to build coresight as modules Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 01/20] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 02/20] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 03/20] coresight: use IS_ENABLED for CONFIGs that may be modules Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 04/20] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 05/20] coresight: export global symbols Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 06/20] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-07-23 10:55 ` Mike Leach
2020-07-25 10:05 ` Tingwei Zhang
2020-07-25 13:51 ` Mike Leach
2020-07-26 1:32 ` Tingwei Zhang
2020-07-27 17:04 ` Mike Leach
2020-07-28 1:07 ` Tingwei Zhang
2020-07-28 10:08 ` Mike Leach
2020-07-28 11:17 ` Tingwei Zhang
2020-07-28 20:25 ` Mike Leach
2020-07-23 11:07 ` Greg Kroah-Hartman
2020-07-23 18:04 ` Mathieu Poirier
2020-07-23 18:18 ` Greg Kroah-Hartman
2020-07-23 19:15 ` Mathieu Poirier
2020-07-24 0:41 ` Tingwei Zhang
2020-07-24 7:36 ` Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 07/20] allow to build coresight-stm as a module, for ease of development Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 08/20] coresight: allow etm3x to be built as a module Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 09/20] coresight: allow etm4x " Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 10/20] coresight: allow etb " Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 11/20] coresight: allow tpiu " Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 12/20] coresight: allow tmc " Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 13/20] coresight: remove multiple init calls from funnel driver Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 14/20] coresight: remove multiple init calls from replicator driver Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 15/20] coresight: allow funnel and replicator drivers to be built as modules Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 16/20] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-07-23 4:27 ` [PATCH v4 17/20] coresight: allow cti to be built as a module Tingwei Zhang
2020-07-23 4:28 ` [PATCH v4 18/20] coresight: tmc-etr: add function to register catu ops Tingwei Zhang
2020-07-23 4:28 ` [PATCH v4 19/20] coresight: allow catu drivers to be built as modules Tingwei Zhang
2020-07-23 4:28 ` Tingwei Zhang [this message]
2020-07-23 11:03 ` [PATCH v4 00/20] coresight: allow to build coresight " Mike Leach
2020-07-24 0:37 ` 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=20200723042802.22511-21-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).