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 09/20] coresight: allow etm4x to be built as a module
Date: Thu, 23 Jul 2020 12:27:51 +0800 [thread overview]
Message-ID: <20200723042802.22511-10-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200723042802.22511-1-tingwei@codeaurora.org>
From: Kim Phillips <kim.phillips@arm.com>
Allow to build coresight-etm4x 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-etm4x by the Makefile
- add an etm4_remove function, for module unload
- 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 | 4 +--
...resight-etm4x.c => coresight-etm4x-core.c} | 26 ++++++++++++++++++-
3 files changed, 31 insertions(+), 4 deletions(-)
rename drivers/hwtracing/coresight/{coresight-etm4x.c => coresight-etm4x-core.c} (98%)
diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig
index 8fd9fd139cf3..d6e107bbd30b 100644
--- a/drivers/hwtracing/coresight/Kconfig
+++ b/drivers/hwtracing/coresight/Kconfig
@@ -78,7 +78,7 @@ config CORESIGHT_SOURCE_ETM3X
module will be called coresight-etm3x.
config CORESIGHT_SOURCE_ETM4X
- bool "CoreSight Embedded Trace Macrocell 4.x driver"
+ tristate "CoreSight Embedded Trace Macrocell 4.x driver"
depends on ARM64
select CORESIGHT_LINKS_AND_SINKS
select PID_IN_CONTEXTIDR
@@ -88,6 +88,9 @@ config CORESIGHT_SOURCE_ETM4X
for instruction level tracing. Depending on the implemented version
data tracing may also be available.
+ To compile this driver as a module, choose M here: the
+ module will be called coresight-etm4x.
+
config CORESIGHT_STM
tristate "CoreSight System Trace Macrocell driver"
depends on (ARM && !(CPU_32v3 || CPU_32v4 || CPU_32v4T)) || ARM64
diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile
index d619cfd0abd8..271dc255454f 100644
--- a/drivers/hwtracing/coresight/Makefile
+++ b/drivers/hwtracing/coresight/Makefile
@@ -14,8 +14,8 @@ obj-$(CONFIG_CORESIGHT_LINKS_AND_SINKS) += coresight-funnel.o \
obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o
coresight-etm3x-y := coresight-etm3x-core.o coresight-etm-cp14.o \
coresight-etm3x-sysfs.o
-obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o \
- coresight-etm4x-sysfs.o
+obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o
+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
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
similarity index 98%
rename from drivers/hwtracing/coresight/coresight-etm4x.c
rename to drivers/hwtracing/coresight/coresight-etm4x-core.c
index 6d7d2169bfb2..8149853d5e9d 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -1573,6 +1573,21 @@ static struct amba_cs_uci_id uci_id_etm4[] = {
}
};
+static int __exit etm4_remove(struct amba_device *adev)
+{
+ struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev);
+
+ etm_perf_symlink(drvdata->csdev, false);
+
+ etmdrvdata[drvdata->cpu] = NULL;
+ etm4_pm_clear();
+
+ coresight_unregister(drvdata->csdev);
+
+ return 0;
+}
+
+
static const struct amba_id etm4_ids[] = {
CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */
CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */
@@ -1590,12 +1605,21 @@ static const struct amba_id etm4_ids[] = {
{},
};
+MODULE_DEVICE_TABLE(amba, etm4_ids);
+
static struct amba_driver etm4x_driver = {
.drv = {
.name = "coresight-etm4x",
+ .owner = THIS_MODULE,
.suppress_bind_attrs = true,
},
.probe = etm4_probe,
+ .remove = etm4_remove,
.id_table = etm4_ids,
};
-builtin_amba_driver(etm4x_driver);
+module_amba_driver(etm4x_driver);
+
+MODULE_AUTHOR("Pratik Patel <pratikp@codeaurora.org>");
+MODULE_AUTHOR("Mathieu Poirier <mathieu.poirier@linaro.org>");
+MODULE_DESCRIPTION("Arm CoreSight Program Flow Trace v4 driver");
+MODULE_LICENSE("GPL v2");
--
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:32 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 ` Tingwei Zhang [this message]
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 ` [PATCH v4 20/20] coresight: allow the coresight core driver to be built as a module Tingwei Zhang
2020-07-23 11:03 ` [PATCH v4 00/20] coresight: allow to build coresight as modules 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-10-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).