coresight: allow to build coresight as modules
v10 cover coresight: allow to build coresight as modules
Allow to build coresight as modules. This gives developers the feasibility to test their code without reboot.
This series is based on below two series.
- "coresight: allow to build components as modules"
https://lkml.org/lkml/2018/6/5/989
- "coresight: make drivers modular"
https://lkml.org/lkml/2020/1/17/468
Change from v9:
Fix warning reported by kernel test robot <[email protected]> Rebase to coresight-next
Change from v8:
Protect etmdrvdata[] by modifying it on relevant CPU (Mathieu and Suzuki) Grab the device before allocating memory for the node (Mathieu) Add author of coresight core driver (Mathieu)
Change from v7:
Depends on below change for ETM hotplug (Sai)
https://lore.kernel.org/linux-arm-kernel/[email protected]/
Add mutex lock to protect etmdrvdata[] (Suzuki)
Add helper function coresight_get_ref() (Suzuki)
Reorg replicator and funnel change. Use two patches to support these two drivers. (Suzuki)
Add fix tag to "coresight: etm: perf: Fix warning caused by etm_setup_aux failure" (Suzuki)
Update author of "coresight: cti: Fix bug clearing sysfs links on callback"
Change from v6:
Correct module description for CATU (Mike) Check ect_ret equals 0 and set ect_enabled flag (Mike) Add Tested-by and Reviewed-by from Mike
Change from v5:
Add below CTI clean up change from Mike into series
-https://lists.linaro.org/pipermail/coresight/2020-July/004349.html
Increase module reference count when enabling CTI device (Mike)
Change from v4:
Fix error handling in coresight_grab_devicei() (Greg)
Add coresight: cti: Fix remove sysfs link error from Mike
-https://lists.linaro.org/pipermail/coresight/2020-July/004275.html
Move cti_remove_conn_xrefs() into cti_remove() (Mike) Align patch subject to coresight: <component>: <description> (Mike)
Change from v3:
Rebase to coresight-next (Mike and Mathieu) Reorder try_get_module() (Suzuki)
Clean up etmdrvdata[] in device remote path (Mike) Move cti_remove_conn_xrefs to cti_remove (Mike)
Change from v2:
Rebase to 5.8-rc5. Export coresight_add_sysfs_link and coresight_remove_sysfs_link
Fix one cut and paste error on MODULE_DESCRIPTION of CTI
Change from v1:
Use try_module_get() to avoid module to be unloaded when device is used in active trace session. (Mathieu P)
Change from above two series.
This series adds the support to dynamically remove module when the device in that module is enabled and used by some trace path. It disables all trace paths with that device and release the trace path.
Kim Phillips (8):
coresight: use IS_ENABLED for CONFIGs that may be modules
coresight: etm3x: allow etm3x to be built as a module
coresight: etm4x: allow etm4x to be built as a module
coresight: etb: allow etb to be built as a module
coresight: tpiu: allow tpiu to be built as a module
coresight: tmc: allow tmc to be built as a module
coresight: allow funnel driver to be built as module
coresight: allow replicator driver to be built as module
Mian Yousaf Kaukab (2):
coresight: export global symbols
coresight: tmc-etr: add function to register catu ops
Mike Leach (2):
coresight: cti: Fix remove sysfs link error
coresight: cti: Fix bug clearing sysfs links on callback
Tingwei Zhang (12):
coresight: cpu_debug: add module name in Kconfig
coresight: cpu_debug: define MODULE_DEVICE_TABLE
coresight: add coresight prefix to barrier_pkt
coresight: add try_get_module() in coresight_grab_device()
coresight: stm: allow to build coresight-stm as a module
coresight: etm: perf: Fix warning caused by etm_setup_aux failure
coresight: cti: add function to register cti associate ops
coresight: cti: don't disable ect device if it's not enabled
coresight: cti: increase reference count when enabling cti
coresight: cti: allow cti to be built as a module
coresight: catu: allow catu drivers to be built as modules
coresight: allow the coresight core driver to be built as a module
drivers/hwtracing/coresight/Kconfig | 54 ++++--
drivers/hwtracing/coresight/Makefile | 22 +--
drivers/hwtracing/coresight/coresight-catu.c | 37 ++++-
drivers/hwtracing/coresight/coresight-catu.h | 2 -
.../{coresight.c => coresight-core.c} | 154 +++++++++++++++---
.../hwtracing/coresight/coresight-cpu-debug.c | 2 +
.../{coresight-cti.c => coresight-cti-core.c} | 67 ++++++--
drivers/hwtracing/coresight/coresight-etb10.c | 28 +++-
.../hwtracing/coresight/coresight-etm-perf.c | 13 +-
.../hwtracing/coresight/coresight-etm-perf.h | 5 +-
...resight-etm3x.c => coresight-etm3x-core.c} | 28 +++-
...resight-etm4x.c => coresight-etm4x-core.c} | 84 +++++++---
.../hwtracing/coresight/coresight-funnel.c | 64 +++++++-
.../hwtracing/coresight/coresight-platform.c | 1 +
drivers/hwtracing/coresight/coresight-priv.h | 24 ++-
.../coresight/coresight-replicator.c | 65 +++++++-
drivers/hwtracing/coresight/coresight-stm.c | 20 ++-
drivers/hwtracing/coresight/coresight-sysfs.c | 2 +
.../{coresight-tmc.c => coresight-tmc-core.c} | 25 ++-
.../hwtracing/coresight/coresight-tmc-etf.c | 2 +-
.../hwtracing/coresight/coresight-tmc-etr.c | 21 ++-
drivers/hwtracing/coresight/coresight-tmc.h | 3 +
drivers/hwtracing/coresight/coresight-tpiu.c | 20 ++-
include/linux/coresight.h | 3 +-
24 files changed, 636 insertions(+), 110 deletions(-)
rename drivers/hwtracing/coresight/{coresight.c => coresight-core.c} (92%)
rename drivers/hwtracing/coresight/{coresight-cti.c => coresight-cti-core.c} (94%)
rename drivers/hwtracing/coresight/{coresight-etm3x.c => coresight-etm3x-core.c} (97%)
rename drivers/hwtracing/coresight/{coresight-etm4x.c => coresight-etm4x-core.c} (96%)
rename drivers/hwtracing/coresight/{coresight-tmc.c => coresight-tmc-core.c} (95%)Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 1/24 coresight: cpu_debug: add module name in Kconfig
Provide name of cpu_debug module in Kconfig help section.
--- drivers/hwtracing/coresight/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
drivers/hwtracing/coresight/Kconfig +3 -0
@@ -110,6 +110,9 @@ config CORESIGHT_CPU_DEBUG properly, please refer Documentation/trace/coresight/coresight-cpu-debug.rst for detailed description and the example for usage. + To compile this driver as a module, choose M here: the + module will be called coresight-cpu-debug. + config CORESIGHT_CTI bool "CoreSight Cross Trigger Interface (CTI) driver" depends on ARM || ARM64
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 2/24 coresight: cpu_debug: define MODULE_DEVICE_TABLE
In reply to Tingwei ZhangDefine a MODULE_DEVICE_TABLE for cpu_debug so module can be auto loaded on boot.
--- drivers/hwtracing/coresight/coresight-cpu-debug.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/hwtracing/coresight/coresight-cpu-debug.c +2 -0
@@ -665,6 +665,8 @@ static const struct amba_id debug_ids[] = { {}, }; +MODULE_DEVICE_TABLE (amba, debug_ids); +static struct amba_driver debug_driver = { .drv = { .name ="coresight-cpu-debug" ,
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 3/24 coresight: use IS_ENABLED for CONFIGs that may be modules
In reply to Tingwei ZhangFrom: Kim Phillips <[email protected]>
Checking for ifdef CONFIG_x fails if CONFIG_x=m. Use IS_ENABLED that is true for both built-ins and modules, instead. Required when building coresight components as modules.
--- drivers/hwtracing/coresight/coresight-etm-perf.h | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 2 +- include/linux/coresight.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight-etm-perf.h +1 -1
@@ -57,7 +57,7 @@ struct etm_event_data {struct list_head *__percpu *path; }; -#ifdef CONFIG_CORESIGHT +#if IS_ENABLED (CONFIG_CORESIGHT )int etm_perf_symlink (struct coresight_device *csdev,bool link);int etm_perf_add_symlink_sink (struct coresight_device *csdev);void etm_perf_del_symlink_sink (struct coresight_device *csdev);
drivers/hwtracing/coresight/coresight-priv.h +1 -1
@@ -165,7 +165,7 @@ int coresight_make_links(struct coresight_device *orig,void coresight_remove_links (struct coresight_device *orig,struct coresight_connection *conn); -#ifdef CONFIG_CORESIGHT_SOURCE_ETM3X +#if IS_ENABLED (CONFIG_CORESIGHT_SOURCE_ETM3X )extern int etm_readl_cp14 (u32 off,unsigned int *val);extern int etm_writel_cp14 (u32 off,u32 val);#else
include/linux/coresight.h +1 -1
@@ -324,7 +324,7 @@ struct coresight_ops {const struct coresight_ops_ect *ect_ops; }; -#ifdef CONFIG_CORESIGHT +#if IS_ENABLED (CONFIG_CORESIGHT )extern struct coresight_device *coresight_register (struct coresight_desc *desc);extern void coresight_unregister (struct coresight_device *csdev);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 4/24 coresight: add coresight prefix to barrier_pkt
In reply to Tingwei ZhangAdd coresight prefix to make it specific. It will be a export symbol.
--- drivers/hwtracing/coresight/coresight-etb10.c | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 8 ++++---- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
drivers/hwtracing/coresight/coresight-etb10.c +1 -1
@@ -525,7 +525,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev, cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt;for (i =0 ; i < to_read; i +=4 ) { buf_ptr = buf->data_pages[cur] + offset;
drivers/hwtracing/coresight/coresight-priv.h +4 -4
@@ -66,8 +66,8 @@ static DEVICE_ATTR_RO(name)#define coresight_simple_reg64 (type, name, lo_off, hi_off) \ __coresight_simple_func(type, NULL, name, lo_off, hi_off) -extern const u32 barrier_pkt[4 ]; -#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(barrier_pkt)) +extern const u32 coresight_barrier_pkt[4 ]; +#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))enum etm_addr_type {ETM_ADDR_TYPE_NONE ,
@@ -104,10 +104,10 @@ struct cs_buffers {static inline void coresight_insert_barrier_packet (void *buf) {if (buf) -memcpy (buf, barrier_pkt,CORESIGHT_BARRIER_PKT_SIZE ); +memcpy (buf, coresight_barrier_pkt, +CORESIGHT_BARRIER_PKT_SIZE ); } -static inline void CS_LOCK (void __iomem *addr) { do {
drivers/hwtracing/coresight/coresight-tmc-etf.c +1 -1
@@ -519,7 +519,7 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev, cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt;/* for every byte to read */ for (i =0 ; i < to_read; i +=4 ) {
drivers/hwtracing/coresight/coresight.c +1 -1
@@ -53,7 +53,7 @@ static struct list_head *stm_path;* beginning of the data collected in a buffer. That way the decoder knows that * it needs to look for another sync sequence. */ -const u32 barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,0x7fffffff ,0x7fffffff }; +const u32 coresight_barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,0x7fffffff ,0x7fffffff };static int coresight_id_match (struct device *dev,void *data) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 04/24] coresight: add coresight prefix to barrier_pkt
Quoted 42 lines · Tingwei Zhang
Add coresight prefix to make it specific. It will be a export symbol.
Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Suzuki K Poulose <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>--- drivers/hwtracing/coresight/coresight-etb10.c | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 8 ++++---- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)drivers/hwtracing/coresight/coresight-etb10.c +1
-1@@ -525,7 +525,7 @@ static unsigned long etb_update_buffer(struct coresight_device *csdev, cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt;for (i =0 ; i < to_read; i +=4 ) { buf_ptr = buf->data_pages[cur] + offset;drivers/hwtracing/coresight/coresight-priv.h +2
-2@@ -66,8 +66,8 @@ static DEVICE_ATTR_RO(name)#define coresight_simple_reg64 (type, name, lo_off, hi_off) \ __coresight_simple_func(type, NULL, name, lo_off, hi_off) -extern const u32 barrier_pkt[4 ]; -#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(barrier_pkt)) +extern const u32 coresight_barrier_pkt[4 ]; +#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))enum etm_addr_type {ETM_ADDR_TYPE_NONE ,
drivers/hwtracing/coresight/coresight-priv.h struct cs_buffers { · line 108
Quoted 6 lines
drivers/hwtracing/coresight/coresight-priv.h +2
-1@@ -104,10 +104,10 @@ struct cs_buffers {static inline void coresight_insert_barrier_packet (void *buf) {if (buf) -memcpy (buf, barrier_pkt,CORESIGHT_BARRIER_PKT_SIZE ); +memcpy (buf, coresight_barrier_pkt, +CORESIGHT_BARRIER_PKT_SIZE );
Didn't I comment on this before?
Quoted 36 lines
drivers/hwtracing/coresight/coresight-priv.h +0
-1} -static inline void CS_LOCK (void __iomem *addr) { do {drivers/hwtracing/coresight/coresight-tmc-etf.c +1
-1@@ -519,7 +519,7 @@ static unsigned long tmc_update_etf_buffer(struct coresight_device *csdev, cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt;/* for every byte to read */ for (i =0 ; i < to_read; i +=4 ) {drivers/hwtracing/coresight/coresight.c +1
-1@@ -53,7 +53,7 @@ static struct list_head *stm_path;* beginning of the data collected in a buffer. That way the decoder knows that * it needs to look for another sync sequence. */ -const u32 barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,0x7fffffff ,0x7fffffff }; +const u32 coresight_barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,0x7fffffff ,0x7fffffff };static int coresight_id_match (struct device *dev,void *data) {Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 04/24] coresight: add coresight prefix to barrier_pkt
Quoted 43 lines · Mathieu Poirier
Quoted 6 lines · Tingwei Zhang
Add coresight prefix to make it specific. It will be a export symbol.
Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Suzuki K Poulose <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Review
Quoted 8 lines
--- drivers/hwtracing/coresight/coresight-etb10.c | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 8 ++++---- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-etb10.cdrivers/hwtracing/coresight/coresight-etb10.c static unsigned long etb_update_buffer(struct
Quoted 4 lines
index
03e3f2590191..04ee9cda988d100644drivers/hwtracing/coresight/coresight-etb10.c +0
-0@@ -525,7 +525,7 @@ static unsigned long etb_update_buffer(struct
coresight_device*csdev,Review
Quoted 9 lines
drivers/hwtracing/coresight/coresight-etb10.c +1
-1cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt;for (i =0 ; i < to_read; i +=4 ) { buf_ptr = buf->data_pages[cur] + offset;(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-priv.hQuoted 12 lines
index
d801a2755432..dcb8aeb6af62100644drivers/hwtracing/coresight/coresight-priv.h +2
-2@@ -66,8 +66,8 @@ static DEVICE_ATTR_RO(name)#define coresight_simple_reg64 (type, name, lo_off, hi_off) \ __coresight_simple_func(type, NULL, name, lo_off, hi_off) -extern const u32 barrier_pkt[4 ]; -#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(barrier_pkt)) +extern const u32 coresight_barrier_pkt[4 ]; +#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))
Quoted 12 lines
drivers/hwtracing/coresight/coresight-priv.h struct cs_buffers { · line 108
Quoted 9 lines
drivers/hwtracing/coresight/coresight-priv.h +2
-1enum etm_addr_type {ETM_ADDR_TYPE_NONE ,@@ -104,10 +104,10 @@ struct cs_buffers {static inline void coresight_insert_barrier_packet (void *buf) {if (buf) -memcpy (buf, barrier_pkt,CORESIGHT_BARRIER_PKT_SIZE ); +memcpy (buf, coresight_barrier_pkt, +CORESIGHT_BARRIER_PKT_SIZE );Didn't I comment on this before?
Sorry for missing below comment from you, Mathieu. Indentation problem.
I'll fix it in v11.
Thanks,
Tingwei
Quoted 48 lines
Review
Quoted 7 lines
drivers/hwtracing/coresight/coresight-priv.h +0
-1} -static inline void CS_LOCK (void __iomem *addr) { do {(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-tmc-etf.cdrivers/hwtracing/coresight/coresight-tmc-etf.c static unsigned long tmc_update_etf_buffer(struct
Quoted 4 lines
index
6375504ba8b0..44402d413ebb100644drivers/hwtracing/coresight/coresight-tmc-etf.c +0
-0@@ -519,7 +519,7 @@ static unsigned long tmc_update_etf_buffer(struct
coresight_device*csdev,Review
Quoted 9 lines
drivers/hwtracing/coresight/coresight-tmc-etf.c +1
-1cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt;/* for every byte to read */ for (i =0 ; i < to_read; i +=4 ) {(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight.cdrivers/hwtracing/coresight/coresight.c static struct list_head *stm_path; · line 53
Quoted 5 lines
index
e9c90f2de34a..d515088cc47d100644drivers/hwtracing/coresight/coresight.c +0
-0@@ -53,7 +53,7 @@ static struct list_head *stm_path;* beginning of the data collected in a buffer. That way the decoder knows that
drivers/hwtracing/coresight/coresight.c static struct list_head *stm_path;
Quoted 3 lines
drivers/hwtracing/coresight/coresight.c +0
-1* it needs to look for another sync sequence. */ -const u32 barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,0x7fffffff ,
0x7fffffff};drivers/hwtracing/coresight/coresight.c static struct list_head *stm_path; · line 56
Quoted 1 line
drivers/hwtracing/coresight/coresight.c +1
-0+const u32 coresight_barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,
0x7fffffff,0x7fffffff};Quoted 5 lines
drivers/hwtracing/coresight/coresight.c +0
-1static int coresight_id_match (struct device *dev,void *data) { --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum,
Quoted 2 lines
a Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v10 04/24] coresight: add coresight prefix to barrier_pkt
In reply to Mathieu PoirierQuoted 43 lines · Mathieu Poirier
Quoted 6 lines · Tingwei Zhang
Add coresight prefix to make it specific. It will be a export symbol.
Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Suzuki K Poulose <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Review
Quoted 8 lines
--- drivers/hwtracing/coresight/coresight-etb10.c | 2 +- drivers/hwtracing/coresight/coresight-priv.h | 8 ++++---- drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- drivers/hwtracing/coresight/coresight.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-etb10.cdrivers/hwtracing/coresight/coresight-etb10.c static unsigned long etb_update_buffer(struct
Quoted 4 lines
index
03e3f2590191..04ee9cda988d100644drivers/hwtracing/coresight/coresight-etb10.c +0
-0@@ -525,7 +525,7 @@ static unsigned long etb_update_buffer(struct
coresight_device*csdev,Review
Quoted 9 lines
drivers/hwtracing/coresight/coresight-etb10.c +1
-1cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt;for (i =0 ; i < to_read; i +=4 ) { buf_ptr = buf->data_pages[cur] + offset;(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-priv.hQuoted 12 lines
index
d801a2755432..dcb8aeb6af62100644drivers/hwtracing/coresight/coresight-priv.h +2
-2@@ -66,8 +66,8 @@ static DEVICE_ATTR_RO(name)#define coresight_simple_reg64 (type, name, lo_off, hi_off) \ __coresight_simple_func(type, NULL, name, lo_off, hi_off) -extern const u32 barrier_pkt[4 ]; -#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(barrier_pkt)) +extern const u32 coresight_barrier_pkt[4 ]; +#define CORESIGHT_BARRIER_PKT_SIZE (sizeof(coresight_barrier_pkt))
Quoted 12 lines
drivers/hwtracing/coresight/coresight-priv.h struct cs_buffers { · line 108
Quoted 9 lines
drivers/hwtracing/coresight/coresight-priv.h +2
-1enum etm_addr_type {ETM_ADDR_TYPE_NONE ,@@ -104,10 +104,10 @@ struct cs_buffers {static inline void coresight_insert_barrier_packet (void *buf) {if (buf) -memcpy (buf, barrier_pkt,CORESIGHT_BARRIER_PKT_SIZE ); +memcpy (buf, coresight_barrier_pkt, +CORESIGHT_BARRIER_PKT_SIZE );Didn't I comment on this before?
Sorry for missing below comment from you, Mathieu. Indentation problem.
I'll fix it in v11.
Thanks,
Tingwei
Quoted 40 lines
Review
Quoted 7 lines
drivers/hwtracing/coresight/coresight-priv.h +0
-1} -static inline void CS_LOCK (void __iomem *addr) { do {(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-tmc-etf.cdrivers/hwtracing/coresight/coresight-tmc-etf.c static unsigned long tmc_update_etf_buffer(struct
Quoted 4 lines
index
6375504ba8b0..44402d413ebb100644drivers/hwtracing/coresight/coresight-tmc-etf.c +0
-0@@ -519,7 +519,7 @@ static unsigned long tmc_update_etf_buffer(struct
coresight_device*csdev,Review
Quoted 9 lines
drivers/hwtracing/coresight/coresight-tmc-etf.c +1
-1cur = buf->cur; offset = buf->offset; - barrier = barrier_pkt; + barrier = coresight_barrier_pkt;/* for every byte to read */ for (i =0 ; i < to_read; i +=4 ) {(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight.cdrivers/hwtracing/coresight/coresight.c static struct list_head *stm_path; · line 53
Quoted 5 lines
index
e9c90f2de34a..d515088cc47d100644drivers/hwtracing/coresight/coresight.c +0
-0@@ -53,7 +53,7 @@ static struct list_head *stm_path;* beginning of the data collected in a buffer. That way the decoder knows that
drivers/hwtracing/coresight/coresight.c static struct list_head *stm_path;
Quoted 3 lines
drivers/hwtracing/coresight/coresight.c +0
-1* it needs to look for another sync sequence. */ -const u32 barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,0x7fffffff ,
0x7fffffff};drivers/hwtracing/coresight/coresight.c static struct list_head *stm_path; · line 56
Quoted 1 line
drivers/hwtracing/coresight/coresight.c +1
-0+const u32 coresight_barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,
0x7fffffff,0x7fffffff};Quoted 5 lines
drivers/hwtracing/coresight/coresight.c +0
-1static int coresight_id_match (struct device *dev,void *data) { --The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Quoted 8 lines
Forum,
Quoted 2 lines
a Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v10 5/24 coresight: export global symbols
In reply to Tingwei ZhangFrom: Mian Yousaf Kaukab <[email protected]>
Export symbols used among coresight modules.
--- drivers/hwtracing/coresight/coresight-etm-perf.c | 1 + drivers/hwtracing/coresight/coresight-sysfs.c | 2 ++ drivers/hwtracing/coresight/coresight-tmc-etr.c | 6 ++++++ drivers/hwtracing/coresight/coresight.c | 8 ++++++++ 4 files changed, 17 insertions(+)
drivers/hwtracing/coresight/coresight-etm-perf.c +1 -0
@@ -517,6 +517,7 @@ int etm_perf_symlink(struct coresight_device *csdev, bool link)return 0 ; } +EXPORT_SYMBOL_GPL (etm_perf_symlink); static ssize_t etm_perf_sink_name_show(struct device *dev, struct device_attribute *dattr,
drivers/hwtracing/coresight/coresight-sysfs.c +2 -0
@@ -102,6 +102,7 @@ int coresight_add_sysfs_link(struct coresight_sysfs_link *info)return ret; } +EXPORT_SYMBOL_GPL (coresight_add_sysfs_link);void coresight_remove_sysfs_link (struct coresight_sysfs_link *info) {
@@ -122,6 +123,7 @@ void coresight_remove_sysfs_link(struct coresight_sysfs_link *info) info->orig->nr_links--; info->target->nr_links--; } +EXPORT_SYMBOL_GPL (coresight_remove_sysfs_link);/* * coresight_make_links: Make a link for a connection from a @orig
drivers/hwtracing/coresight/coresight-tmc-etr.c +6 -0
@@ -255,6 +255,7 @@ void tmc_free_sg_table(struct tmc_sg_table *sg_table)tmc_free_table_pages (sg_table);tmc_free_data_pages (sg_table); } +EXPORT_SYMBOL_GPL (tmc_free_sg_table);/* * Alloc pages for the table. Since this will be used by the device,
@@ -340,6 +341,7 @@ struct tmc_sg_table *tmc_alloc_sg_table(struct device *dev,return sg_table; } +EXPORT_SYMBOL_GPL (tmc_alloc_sg_table);/* * tmc_sg_table_sync_data_range: Sync the data buffer written
@@ -360,6 +362,7 @@ void tmc_sg_table_sync_data_range(struct tmc_sg_table *table, PAGE_SIZE, DMA_FROM_DEVICE); } } +EXPORT_SYMBOL_GPL (tmc_sg_table_sync_data_range);/* tmc_sg_sync_table: Sync the page table */ void tmc_sg_table_sync_table (struct tmc_sg_table *sg_table)
@@ -372,6 +375,7 @@ void tmc_sg_table_sync_table(struct tmc_sg_table *sg_table)dma_sync_single_for_device (real_dev, table_pages->daddrs[i],PAGE_SIZE ,DMA_TO_DEVICE ); } +EXPORT_SYMBOL_GPL (tmc_sg_table_sync_table);/* * tmc_sg_table_get_data: Get the buffer pointer for data @offset
@@ -401,6 +405,7 @@ ssize_t tmc_sg_table_get_data(struct tmc_sg_table *sg_table, *bufpp =page_address (data_pages->pages[pg_idx]) + pg_offset;return len; } +EXPORT_SYMBOL_GPL (tmc_sg_table_get_data);#ifdef ETR_SG_DEBUG /* Map a dma address to virtual address */
@@ -766,6 +771,7 @@ tmc_etr_get_catu_device(struct tmc_drvdata *drvdata)return NULL ; } +EXPORT_SYMBOL_GPL (tmc_etr_get_catu_device);static inline int tmc_etr_enable_catu (struct tmc_drvdata *drvdata,struct etr_buf *etr_buf)
drivers/hwtracing/coresight/coresight.c +8 -0
@@ -54,6 +54,7 @@ static struct list_head *stm_path;* it needs to look for another sync sequence. */ const u32 coresight_barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,0x7fffffff ,0x7fffffff }; +EXPORT_SYMBOL_GPL (coresight_barrier_pkt);static int coresight_id_match (struct device *dev,void *data) {
@@ -179,6 +180,7 @@ int coresight_claim_device_unlocked(void __iomem *base)coresight_clear_claim_tags (base);return -EBUSY ; } +EXPORT_SYMBOL_GPL (coresight_claim_device_unlocked);int coresight_claim_device (void __iomem *base) {
@@ -190,6 +192,7 @@ int coresight_claim_device(void __iomem *base)return rc; } +EXPORT_SYMBOL_GPL (coresight_claim_device);/* * coresight_disclaim_device_unlocked : Clear the claim tags for the device.
@@ -208,6 +211,7 @@ void coresight_disclaim_device_unlocked(void __iomem *base)*/ WARN_ON_ONCE (1 ); } +EXPORT_SYMBOL_GPL (coresight_disclaim_device_unlocked);void coresight_disclaim_device (void __iomem *base) {
@@ -215,6 +219,7 @@ void coresight_disclaim_device(void __iomem *base)coresight_disclaim_device_unlocked (base);CS_LOCK (base); } +EXPORT_SYMBOL_GPL (coresight_disclaim_device);/* enable or disable an associated CTI device of the supplied CS device */ static int
@@ -467,6 +472,7 @@ void coresight_disable_path(struct list_head *path) {coresight_disable_path_from (path,NULL ); } +EXPORT_SYMBOL_GPL (coresight_disable_path);int coresight_enable_path (struct list_head *path,u32 mode,void *sink_data) {
@@ -1376,6 +1382,7 @@ int coresight_timeout(void __iomem *addr, u32 offset, int position, int value)return -EAGAIN ; } +EXPORT_SYMBOL_GPL (coresight_timeout);struct bus_type coresight_bustype = { .name ="coresight" ,
@@ -1552,6 +1559,7 @@ bool coresight_loses_context_with_cpu(struct device *dev)return fwnode_property_present (dev_fwnode (dev),"arm,coresight-loses-context-with-cpu" ); } +EXPORT_SYMBOL_GPL (coresight_loses_context_with_cpu);/* * coresight_alloc_device_name - Get an index for a given device in the
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 6/24 coresight: add try_get_module() in coresight_grab_device()
In reply to Tingwei ZhangWhen coresight device is in an active session, driver module of that device should not be removed. Use try_get_module() in coresight_grab_device() to prevent module to be unloaded. Use get_device()/put_device() to protect device data in the middle of active session.
--- drivers/hwtracing/coresight/coresight.c | 60 ++++++++++++++++++++++--- 1 file changed, 53 insertions(+), 7 deletions(-)
drivers/hwtracing/coresight/coresight.c +53 -7
@@ -633,13 +633,45 @@ struct coresight_device *coresight_get_sink_by_id(u32 id)return dev ?to_coresight_device (dev) :NULL ; } +/** +* coresight_get_ref- Helper function to increase reference count to module +* and device. +* Return true in successful case and power up the device. +* Return false when failed to get reference of module. +*/ +static inline bool coresight_get_ref (struct coresight_device *csdev) +{ +struct device *dev = csdev->dev.parent; + +/* Make sure the driver can't be removed */ +if (!try_module_get (dev->driver->owner)) +return false; +/* Make sure the device can't go away */ +get_device (dev); +pm_runtime_get_sync (dev); +return true; +} + +/** +* coresight_put_ref- Helper function to decrease reference count to module +* and device. Power off the device. +*/ +static inline void coresight_put_ref (struct coresight_device *csdev) +{ +struct device *dev = csdev->dev.parent; + +pm_runtime_put (dev); +put_device (dev); +module_put (dev->driver->owner); +} +/* * coresight_grab_device - Power up this device and any of the helper * devices connected to it for trace operation. Since the helper devices * don't appear on the trace path, they should be handled along with the * the master device. */ -static void coresight_grab_device (struct coresight_device *csdev) +static int coresight_grab_device (struct coresight_device *csdev) {int i;
@@ -648,9 +680,20 @@ static void coresight_grab_device(struct coresight_device *csdev) child = csdev->pdata->conns[i].child_dev;if (child && child->type ==CORESIGHT_DEV_TYPE_HELPER ) -pm_runtime_get_sync (child->dev.parent); +if (!coresight_get_ref (child)) + goto err; + } +if (coresight_get_ref (csdev)) +return 0 ; +err: +for (i--; i >=0 ; i--) { +struct coresight_device *child; + + child = csdev->pdata->conns[i].child_dev; +if (child && child->type ==CORESIGHT_DEV_TYPE_HELPER ) +coresight_put_ref (child); } -pm_runtime_get_sync (csdev->dev.parent); +return -ENODEV ; }/*
@@ -661,13 +704,13 @@ static void coresight_drop_device(struct coresight_device *csdev) {int i; -pm_runtime_put (csdev->dev.parent); +coresight_put_ref (csdev);for (i =0 ; i < csdev->pdata->nr_outport; i++) {struct coresight_device *child; child = csdev->pdata->conns[i].child_dev;if (child && child->type ==CORESIGHT_DEV_TYPE_HELPER ) -pm_runtime_put (child->dev.parent); +coresight_put_ref (child); } }
@@ -686,7 +729,7 @@ static int _coresight_build_path(struct coresight_device *csdev,struct coresight_device *sink, struct list_head *path) { - int i; + int i, ret;bool found = false;struct coresight_node *node;
@@ -716,11 +759,14 @@ static int _coresight_build_path(struct coresight_device *csdev,* is tell the PM runtime core we need this element and add a node * for it. */ + ret =coresight_grab_device (csdev); +if (ret) +return ret; + node =kzalloc (sizeof (struct coresight_node ),GFP_KERNEL );if (!node)return -ENOMEM ; -coresight_grab_device (csdev); node->csdev = csdev;list_add (&node->link, path);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 7/24 coresight: stm: allow to build coresight-stm as a module
In reply to Tingwei Zhang- Kconfig becomes a tristate, to allow =m
- add a stm_remove function, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot
--- drivers/hwtracing/coresight/Kconfig | 5 ++++- drivers/hwtracing/coresight/coresight-stm.c | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/Kconfig +4 -1
@@ -86,7 +86,7 @@ config CORESIGHT_SOURCE_ETM4X data tracing may also be available. config CORESIGHT_STM - bool "CoreSight System Trace Macrocell driver" + tristate "CoreSight System Trace Macrocell driver" depends on (ARM && !(CPU_32v3 || CPU_32v4 || CPU_32v4T)) || ARM64 select CORESIGHT_LINKS_AND_SINKS select STM
@@ -96,6 +96,9 @@ config CORESIGHT_STM logging useful software events or data coming from various entities in the system, possibly running different OSs + To compile this driver as a module, choose M here: the + module will be called coresight-stm. + config CORESIGHT_CPU_DEBUG tristate "CoreSight CPU Debug driver" depends on ARM || ARM64
drivers/hwtracing/coresight/coresight-stm.c +19 -1
@@ -951,6 +951,17 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)return ret; } +static int __exit stm_remove(struct amba_device *adev) +{ +struct stm_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +coresight_unregister (drvdata->csdev); + +stm_unregister_device (&drvdata->stm); + +return 0 ; +} +#ifdef CONFIG_PM static int stm_runtime_suspend (struct device *dev) {
@@ -983,6 +994,8 @@ static const struct amba_id stm_ids[] = { { 0, 0}, }; +MODULE_DEVICE_TABLE(amba, stm_ids); + static struct amba_driver stm_driver = { .drv = { .name = "coresight-stm",
@@ -991,7 +1004,12 @@ static struct amba_driver stm_driver = { .suppress_bind_attrs = true, }, .probe = stm_probe, + .remove = stm_remove, .id_table = stm_ids, }; -builtin_amba_driver (stm_driver); +module_amba_driver (stm_driver); + +MODULE_AUTHOR ("Pratik Patel <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight System Trace Macrocell driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 8/24 coresight: etm: perf: Fix warning caused by etm_setup_aux failure
In reply to Tingwei ZhangWhen coresight_build_path() fails on all the cpus, etm_setup_aux calls etm_free_aux() to free allocated event_data. WARN_ON(cpumask_empty(mask) will be triggered since cpu mask is empty. Check event_data->snk_config is not NULL first to avoid this warning.
--- drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-etm-perf.c +2 -2
@@ -126,10 +126,10 @@ static void free_sink_buffer(struct etm_event_data *event_data)cpumask_t *mask = &event_data->mask;struct coresight_device *sink; -if (WARN_ON (cpumask_empty (mask))) +if (!event_data->snk_config)return ; -if (!event_data->snk_config) +if (WARN_ON (cpumask_empty (mask)))return ; cpu =cpumask_first (mask);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 08/24] coresight: etm: perf: Fix warning caused by etm_setup_aux failure
Quoted 10 lines · Tingwei Zhang
When
coresight_build_path()fails on all the cpus,etm_setup_auxcallsetm_free_aux()to free allocatedevent_data. WARN_ON(cpumask_empty(mask) will be triggered since cpu mask is empty. Checkevent_data->snk_configis not NULL first to avoid this warning.Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Mike Leach <[email protected]>Reviewed-by Suzuki K Poulose <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>
What happend to the Fixed tag that was in V8? This is casting doubts on the reset of this set.
Quoted 25 lines
--- drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/hwtracing/coresight/coresight-etm-perf.c +2
-2@@ -126,10 +126,10 @@ static void free_sink_buffer(struct etm_event_data *event_data)cpumask_t *mask = &event_data->mask;struct coresight_device *sink; -if (WARN_ON (cpumask_empty (mask))) +if (!event_data->snk_config)return ; -if (!event_data->snk_config) +if (WARN_ON (cpumask_empty (mask)))return ; cpu =cpumask_first (mask);Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 08/24] coresight: etm: perf: Fix warning caused by etm_setup_aux failure
Quoted 7 lines · Mathieu Poirier
Quoted 6 lines · Tingwei Zhang
When
coresight_build_path()fails on all the cpus,etm_setup_auxcallsetm_free_aux()to free allocatedevent_data. WARN_ON(cpumask_empty(mask) will be triggered since cpu mask is empty. Checkevent_data->snk_configis not NULL first to avoid this warning.
Quoted 9 lines
Quoted 4 lines
Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Mike Leach <[email protected]>Reviewed-by Suzuki K Poulose <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>What happend to the Fixed tag that was in V8? This is casting doubts on the
reset of this set.
Hi Mathieu,
Sorry about the mess here. I pushed the change to Android mainline and missed fix tag when making V10.
To make sure there's no other missing, I compared all V8 and V10 patches and rechecked all comments on V8.
Two issues were found.
1. Reviewed-by from you on [patch 5/24] should not be added.
2. MODULE_LICENSE("GPL v2") was missed in V10.
I'll fix all issues on V11.
Shall I send V11 when it's ready or wait for your comments on other patches?
Thanks,
Tingwei
Quoted 28 lines
Review
Quoted 5 lines
--- drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-etm-perf.cdrivers/hwtracing/coresight/coresight-etm-perf.c static void free_sink_buffer(struct etm_event_data
Quoted 4 lines
index
dcb0592418ae..3728c44e5763100644drivers/hwtracing/coresight/coresight-etm-perf.c +0
-0@@ -126,10 +126,10 @@ static void free_sink_buffer(struct etm_event_data
*event_data)Quoted 14 lines
drivers/hwtracing/coresight/coresight-etm-perf.c +2
-2cpumask_t *mask = &event_data->mask;struct coresight_device *sink; -if (WARN_ON (cpumask_empty (mask))) +if (!event_data->snk_config)return ; -if (!event_data->snk_config) +if (WARN_ON (cpumask_empty (mask)))return ; cpu =cpumask_first (mask);Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code AuroraForum,
Quoted 2 lines
a Linux Foundation Collaborative Project
Re: [PATCH v10 08/24] coresight: etm: perf: Fix warning caused by etm_setup_aux failure
In reply to Mathieu PoirierQuoted 7 lines · Mathieu Poirier
Quoted 6 lines · Tingwei Zhang
When
coresight_build_path()fails on all the cpus,etm_setup_auxcallsetm_free_aux()to free allocatedevent_data. WARN_ON(cpumask_empty(mask) will be triggered since cpu mask is empty. Checkevent_data->snk_configis not NULL first to avoid this warning.
Quoted 9 lines
Quoted 4 lines
Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Mike Leach <[email protected]>Reviewed-by Suzuki K Poulose <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>What happend to the Fixed tag that was in V8? This is casting doubts on the
reset of this set.
Hi Mathieu,
Sorry about the mess here. I pushed the change to Android mainline and missed fix tag when making V10.
To make sure there's no other missing, I compared all V8 and V10 patches and rechecked all comments on V8.
Two issues were found.
1. Reviewed-by from you on [patch 5/24] should not be added.
2. MODULE_LICENSE("GPL v2") was missed in V10.
I'll fix all issues on V11.
Shall I send V11 when it's ready or wait for your comments on other patches?
Thanks,
Tingwei
Quoted 18 lines
Review
Quoted 5 lines
--- drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-etm-perf.cdrivers/hwtracing/coresight/coresight-etm-perf.c static void free_sink_buffer(struct etm_event_data
Quoted 4 lines
index
dcb0592418ae..3728c44e5763100644drivers/hwtracing/coresight/coresight-etm-perf.c +0
-0@@ -126,10 +126,10 @@ static void free_sink_buffer(struct etm_event_data
*event_data)Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm-perf.c +1
-1cpumask_t *mask = &event_data->mask;struct coresight_device *sink; -if (WARN_ON (cpumask_empty (mask))) +if (!event_data->snk_config)return ;
Quoted 10 lines
Quoted 7 lines
drivers/hwtracing/coresight/coresight-etm-perf.c +1
-1-if (!event_data->snk_config) +if (WARN_ON (cpumask_empty (mask)))return ; cpu =cpumask_first (mask);Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code AuroraForum,
Quoted 2 lines
a Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v10 9/24 coresight: etm3x: allow etm3x to be built as a module
In reply to Tingwei ZhangFrom: Kim Phillips <[email protected]>
Allow to build coresight-etm3x 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-etm3x by the Makefile
- add an etm_remove function, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot
---
drivers/hwtracing/coresight/Kconfig | 5 +++-
drivers/hwtracing/coresight/Makefile | 3 +-
...resight-etm3x.c => coresight-etm3x-core.c} | 28 ++++++++++++++++++-
3 files changed, 33 insertions(+), 3 deletions(-)
rename drivers/hwtracing/coresight/{coresight-etm3x.c => coresight-etm3x-core.c} (97%)drivers/hwtracing/coresight/Kconfig +4 -1
@@ -65,7 +65,7 @@ config CORESIGHT_SINK_ETBV10 special enhancement or added features. config CORESIGHT_SOURCE_ETM3X - bool "CoreSight Embedded Trace Macrocell 3.x driver" + tristate "CoreSight Embedded Trace Macrocell 3.x driver" depends on !ARM64 select CORESIGHT_LINKS_AND_SINKS help
@@ -74,6 +74,9 @@ config CORESIGHT_SOURCE_ETM3X This is primarily useful for instruction level tracing. Depending the ETM version data tracing may also be available. + To compile this driver as a module, choose M here: the + module will be called coresight-etm3x. + config CORESIGHT_SOURCE_ETM4X bool "CoreSight Embedded Trace Macrocell 4.x driver" depends on ARM64
drivers/hwtracing/coresight/Makefile +2 -1
@@ -11,7 +11,8 @@ obj-$(CONFIG_CORESIGHT_SINK_TPIU) += coresight-tpiu.o obj-$(CONFIG_CORESIGHT_SINK_ETBV10) += coresight-etb10.o obj-$(CONFIG_CORESIGHT_LINKS_AND_SINKS) += coresight-funnel.o \ coresight-replicator.o -obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o coresight-etm-cp14.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
drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +27 -1
@@ -895,6 +895,23 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)return ret; } +static int __exit etm_remove(struct amba_device *adev) +{ +struct etm_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +etm_perf_symlink (drvdata->csdev, false); + +if (--etm_count ==0 ) { +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING ); +if (hp_online) +cpuhp_remove_state_nocalls (hp_online); + } + +coresight_unregister (drvdata->csdev); + +return 0 ; +} +#ifdef CONFIG_PM static int etm_runtime_suspend (struct device *dev) {
@@ -937,6 +954,8 @@ static const struct amba_id etm_ids[] = { { 0, 0}, }; +MODULE_DEVICE_TABLE(amba, etm_ids); + static struct amba_driver etm_driver = { .drv = { .name = "coresight-etm3x",
@@ -945,6 +964,13 @@ static struct amba_driver etm_driver = { .suppress_bind_attrs = true, }, .probe = etm_probe, + .remove = etm_remove, .id_table = etm_ids, }; -builtin_amba_driver (etm_driver); + +module_amba_driver (etm_driver); + +MODULE_AUTHOR ("Pratik Patel <[email protected]>" ); +MODULE_AUTHOR ("Mathieu Poirier <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight Program Flow Trace driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Suzuki K Poulose
maintainerRe: [PATCH v10 09/24] coresight: etm3x: allow etm3x to be built as a module
Quoted 40 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-etm3x as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-etm3x by theMakefile
- add anetm_removefunction, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Mike Leach <[email protected]>drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +7
-0@@ -895,6 +895,23 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)return ret; } +static int __exit etm_remove(struct amba_device *adev) +{ +struct etm_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +etm_perf_symlink (drvdata->csdev, false); + +if (--etm_count ==0 ) {
drivers/hwtracing/coresight/coresight-etm3x-core.c static int etm_probe(struct amba_device *adev, const struct amba_id *id) · line 914
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +10
-0+cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING ); +if (hp_online) +cpuhp_remove_state_nocalls (hp_online); + } + +coresight_unregister (drvdata->csdev); + +return 0 ; +} +
Don't we need to fix the races like we did for ETMv4 ?
Suzuki
Re: [PATCH v10 09/24] coresight: etm3x: allow etm3x to be built as a module
Quoted 56 lines · Suzuki K Poulose
Quoted 22 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-etm3x as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-etm3x by theMakefile
- add anetm_removefunction, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Mike Leach <[email protected]>Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-etm3x-core.cdrivers/hwtracing/coresight/coresight-etm3x-core.c static int etm_probe(struct amba_device *adev,
Quoted 7 lines
similarity index 97%
rename fromdrivers/hwtracing/coresight/coresight-etm3x.crename todrivers/hwtracing/coresight/coresight-etm3x-core.cindexbf22dcfd3327..ba9c86497acb100644drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +0
-0@@ -895,6 +895,23 @@ static int etm_probe(struct amba_device *adev,const struct
amba_id*id)drivers/hwtracing/coresight/coresight-etm3x-core.c static int etm_probe(struct amba_device *adev, const struct amba_id *id) · line 909
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +8
-0return ret; } +static int __exit etm_remove(struct amba_device *adev) +{ +struct etm_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +etm_perf_symlink (drvdata->csdev, false); + +if (--etm_count ==0 ) { +
cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING);drivers/hwtracing/coresight/coresight-etm3x-core.c static int etm_probe(struct amba_device *adev, const struct amba_id *id) · line 914
Quoted 9 lines
drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +9
-0+if (hp_online) +cpuhp_remove_state_nocalls (hp_online); + } + +coresight_unregister (drvdata->csdev); + +return 0 ; +} +Don't we need to fix the races like we did for ETMv4 ?
Quoted 2 lines
Suzuki
Yes, we need that. Unfortunately, I don't have ETMv3 devie to verify the change. Mathieu has been very kind to offer his help to take care of ETMv3.
Thanks,
Tingwei
Quoted 4 lines
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v10 09/24] coresight: etm3x: allow etm3x to be built as a module
Quoted 57 lines · Tingwei Zhang
Quoted 56 lines · Suzuki K Poulose
Quoted 22 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-etm3x as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-etm3x by theMakefile
- add anetm_removefunction, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Mike Leach <[email protected]>Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-etm3x-core.cdrivers/hwtracing/coresight/coresight-etm3x-core.c static int etm_probe(struct amba_device *adev,
Quoted 7 lines
similarity index 97%
rename fromdrivers/hwtracing/coresight/coresight-etm3x.crename todrivers/hwtracing/coresight/coresight-etm3x-core.cindexbf22dcfd3327..ba9c86497acb100644drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +0
-0@@ -895,6 +895,23 @@ static int etm_probe(struct amba_device *adev,const struct
amba_id*id)drivers/hwtracing/coresight/coresight-etm3x-core.c static int etm_probe(struct amba_device *adev, const struct amba_id *id) · line 909
Quoted 10 lines
drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +8
-0return ret; } +static int __exit etm_remove(struct amba_device *adev) +{ +struct etm_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +etm_perf_symlink (drvdata->csdev, false); + +if (--etm_count ==0 ) { +
cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING);drivers/hwtracing/coresight/coresight-etm3x-core.c static int etm_probe(struct amba_device *adev, const struct amba_id *id) · line 914
Quoted 9 lines
drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +9
-0+if (hp_online) +cpuhp_remove_state_nocalls (hp_online); + } + +coresight_unregister (drvdata->csdev); + +return 0 ; +} +Don't we need to fix the races like we did for ETMv4 ?
Quoted 5 lines
Quoted 2 lines
Suzuki
Yes, we need that. Unfortunately, I don't have ETMv3 devie to verify the change. Mathieu has been very kind to offer his help to take care of ETMv3.
Correct - I will do the testing but the implementation still has to come from you.
Quoted 7 lines
Thanks,
TingweiQuoted 4 lines
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v10 09/24] coresight: etm3x: allow etm3x to be built as a module
In reply to Suzuki K PouloseQuoted 44 lines · Suzuki K Poulose
Quoted 43 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-etm3x as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-etm3x by theMakefile
- add anetm_removefunction, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reviewed-by Mike Leach <[email protected]>drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +11
-0@@ -895,6 +895,23 @@ static int etm_probe(struct amba_device *adev, const struct amba_id *id)return ret; } +static int __exit etm_remove(struct amba_device *adev) +{ +struct etm_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +etm_perf_symlink (drvdata->csdev, false); + +if (--etm_count ==0 ) { +cpuhp_remove_state_nocalls (CPUHP_AP_ARM_CORESIGHT_STARTING ); +if (hp_online) +cpuhp_remove_state_nocalls (hp_online); + }
Quoted 8 lines
drivers/hwtracing/coresight/coresight-etm3x-core.c static int etm_probe(struct amba_device *adev, const struct amba_id *id) · line 914
Quoted 6 lines
drivers/hwtracing/coresight/coresight-etm3x-core.c renamed from drivers/hwtracing/coresight/coresight-etm3x.c +6
-0+ +coresight_unregister (drvdata->csdev); + +return 0 ; +} +Don't we need to fix the races like we did for ETMv4 ?
This is one of the things I wanted to get back to but Suzuki beat me to it.
I am now done reviewing this set.
Thanks,
Mathieu
Quoted 2 lines
Suzuki
PATCH v10 10/24 coresight: etm4x: allow etm4x to be built as a module
In reply to Tingwei ZhangFrom: Kim Phillips <[email protected]>
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
- delay advertising the per-cpu etmdrvdata
- protect etmdrvdata[] by modifying it on relevant CPU
---
drivers/hwtracing/coresight/Kconfig | 5 +-
drivers/hwtracing/coresight/Makefile | 4 +-
...resight-etm4x.c => coresight-etm4x-core.c} | 84 ++++++++++++++-----
3 files changed, 69 insertions(+), 24 deletions(-)
rename drivers/hwtracing/coresight/{coresight-etm4x.c => coresight-etm4x-core.c} (96%)drivers/hwtracing/coresight/Kconfig +4 -1
@@ -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
drivers/hwtracing/coresight/Makefile +2 -2
@@ -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
drivers/hwtracing/coresight/coresight-etm4x-core.c renamed from drivers/hwtracing/coresight/coresight-etm4x.c +63 -21
144 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 10/24] coresight: etm4x: allow etm4x to be built as a module
Quoted 23 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-etm4x as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-etm4x by theMakefile
- add anetm4_removefunction, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on boot
- delay advertising the per-cpu etmdrvdata
- protect etmdrvdata[] by modifying it on relevant CPUCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>Suggested-by Suzuki K Poulose <[email protected]>
Quoted 1 line
---
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v10 10/24] coresight: etm4x: allow etm4x to be built as a module
In reply to Tingwei ZhangQuoted 23 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-etm4x as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-etm4x by theMakefile
- add anetm4_removefunction, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on boot
- delay advertising the per-cpu etmdrvdata
- protect etmdrvdata[] by modifying it on relevant CPUCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>Suggested-by Suzuki K Poulose <[email protected]>
Quoted 1 line
---
PATCH v10 11/24 coresight: etb: allow etb to be built as a module
In reply to Tingwei ZhangFrom: Kim Phillips <[email protected]>
Allow to build coresight-etb10 as a module, for ease of development.
- Kconfig becomes a tristate, to allow =m
- add an etb_remove function, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot
--- drivers/hwtracing/coresight/Kconfig | 5 +++- drivers/hwtracing/coresight/coresight-etb10.c | 26 ++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/Kconfig +4 -1
@@ -57,13 +57,16 @@ config CORESIGHT_SINK_TPIU the on-board coresight memory can handle. config CORESIGHT_SINK_ETBV10 - bool "Coresight ETBv1.0 driver" + tristate "Coresight ETBv1.0 driver" depends on CORESIGHT_LINKS_AND_SINKS help This enables support for the Embedded Trace Buffer version 1.0 driver that complies with the generic implementation of the component without special enhancement or added features. + To compile this driver as a module, choose M here: the + module will be called coresight-etb10. + config CORESIGHT_SOURCE_ETM3X tristate "CoreSight Embedded Trace Macrocell 3.x driver" depends on !ARM64
drivers/hwtracing/coresight/coresight-etb10.c +25 -1
@@ -801,6 +801,21 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)return ret; } +static int __exit etb_remove(struct amba_device *adev) +{ +struct etb_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +/* +* Since misc_open() holds a refcount on the f_ops, which is +* etb fops in this case, device is there until last file +* handler to this device is closed. +*/ +misc_deregister (&drvdata->miscdev); +coresight_unregister (drvdata->csdev); + +return 0 ; +} +#ifdef CONFIG_PM static int etb_runtime_suspend (struct device *dev) {
@@ -835,6 +850,8 @@ static const struct amba_id etb_ids[] = { { 0, 0}, }; +MODULE_DEVICE_TABLE(amba, etb_ids); + static struct amba_driver etb_driver = { .drv = { .name = "coresight-etb10",
@@ -844,6 +861,13 @@ static struct amba_driver etb_driver = { }, .probe = etb_probe, + .remove = etb_remove, .id_table = etb_ids, }; -builtin_amba_driver (etb_driver); + +module_amba_driver (etb_driver); + +MODULE_AUTHOR ("Pratik Patel <[email protected]>" ); +MODULE_AUTHOR ("Mathieu Poirier <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight Embedded Trace Buffer driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 12/24 coresight: tpiu: allow tpiu to be built as a module
In reply to Tingwei ZhangFrom: Kim Phillips <[email protected]>
Allow to build coresight-tpiu as a module, for ease of development.
- Kconfig becomes a tristate, to allow =m
- add a tpiu_remove function, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot
--- drivers/hwtracing/coresight/Kconfig | 5 ++++- drivers/hwtracing/coresight/coresight-tpiu.c | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/Kconfig +4 -1
@@ -46,7 +46,7 @@ config CORESIGHT_CATU mode where the address is not translated. config CORESIGHT_SINK_TPIU - bool "Coresight generic TPIU driver" + tristate "Coresight generic TPIU driver" depends on CORESIGHT_LINKS_AND_SINKS help This enables support for the Trace Port Interface Unit driver,
@@ -56,6 +56,9 @@ config CORESIGHT_SINK_TPIU connected to an external host for use case capturing more traces than the on-board coresight memory can handle. + To compile this driver as a module, choose M here: the + module will be called coresight-tpiu. + config CORESIGHT_SINK_ETBV10 tristate "Coresight ETBv1.0 driver" depends on CORESIGHT_LINKS_AND_SINKS
drivers/hwtracing/coresight/coresight-tpiu.c +19 -1
@@ -173,6 +173,15 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)return PTR_ERR (drvdata->csdev); } +static int __exit tpiu_remove(struct amba_device *adev) +{ +struct tpiu_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +coresight_unregister (drvdata->csdev); + +return 0 ; +} +#ifdef CONFIG_PM static int tpiu_runtime_suspend (struct device *dev) {
@@ -216,6 +225,8 @@ static const struct amba_id tpiu_ids[] = { { 0, 0}, }; +MODULE_DEVICE_TABLE(amba, tpiu_ids); + static struct amba_driver tpiu_driver = { .drv = { .name = "coresight-tpiu",
@@ -224,6 +235,13 @@ static struct amba_driver tpiu_driver = { .suppress_bind_attrs = true, }, .probe = tpiu_probe, + .remove = tpiu_remove, .id_table = tpiu_ids, }; -builtin_amba_driver (tpiu_driver); + +module_amba_driver (tpiu_driver); + +MODULE_AUTHOR ("Pratik Patel <[email protected]>" ); +MODULE_AUTHOR ("Mathieu Poirier <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight TPIU (Trace Port Interface Unit) driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 13/24 coresight: tmc: allow tmc to be built as a module
In reply to Tingwei ZhangFrom: Kim Phillips <[email protected]>
Allow to build coresight-tmc 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-tmc by the Makefile
- add an tmc_remove function, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot
---
drivers/hwtracing/coresight/Kconfig | 6 ++++-
drivers/hwtracing/coresight/Makefile | 6 ++---
.../{coresight-tmc.c => coresight-tmc-core.c} | 25 ++++++++++++++++++-
3 files changed, 32 insertions(+), 5 deletions(-)
rename drivers/hwtracing/coresight/{coresight-tmc.c => coresight-tmc-core.c} (95%)drivers/hwtracing/coresight/Kconfig +5 -1
@@ -25,7 +25,8 @@ config CORESIGHT_LINKS_AND_SINKS entity at run time to form a complete trace path. config CORESIGHT_LINK_AND_SINK_TMC - bool "Coresight generic TMC driver" + tristate "Coresight generic TMC driver" + depends on CORESIGHT_LINKS_AND_SINKS help This enables support for the Trace Memory Controller driver.
@@ -34,6 +35,9 @@ config CORESIGHT_LINK_AND_SINK_TMC complies with the generic implementation of the component without special enhancement or added features. + To compile this driver as a module, choose M here: the + module will be called coresight-tmc. + config CORESIGHT_CATU bool "Coresight Address Translation Unit (CATU) driver" depends on CORESIGHT_LINK_AND_SINK_TMC
drivers/hwtracing/coresight/Makefile +3 -3
@@ -4,9 +4,9 @@ # obj-$(CONFIG_CORESIGHT) += coresight.o coresight-etm-perf.o \ coresight-platform.o coresight-sysfs.o -obj-$(CONFIG_CORESIGHT_LINK_AND_SINK_TMC) += coresight-tmc.o \ - coresight-tmc-etf.o \ - coresight-tmc-etr.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 obj-$(CONFIG_CORESIGHT_SINK_TPIU) += coresight-tpiu.o obj-$(CONFIG_CORESIGHT_SINK_ETBV10) += coresight-etb10.o obj-$(CONFIG_CORESIGHT_LINKS_AND_SINKS) += coresight-funnel.o \
drivers/hwtracing/coresight/coresight-tmc-core.c renamed from drivers/hwtracing/coresight/coresight-tmc.c +24 -1
@@ -561,6 +561,21 @@ static void tmc_shutdown(struct amba_device *adev)spin_unlock_irqrestore (&drvdata->spinlock, flags); } +static int __exit tmc_remove(struct amba_device *adev) +{ +struct tmc_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +/* +* Since misc_open() holds a refcount on the f_ops, which is +* etb fops in this case, device is there until last file +* handler to this device is closed. +*/ +misc_deregister (&drvdata->miscdev); +coresight_unregister (drvdata->csdev); + +return 0 ; +} +static const struct amba_id tmc_ids[] = {CS_AMBA_ID (0x000bb961 ),/* Coresight SoC 600 TMC-ETR/ETS */
@@ -572,6 +587,8 @@ static const struct amba_id tmc_ids[] = { { 0, 0}, }; +MODULE_DEVICE_TABLE(amba, tmc_ids); + static struct amba_driver tmc_driver = { .drv = { .name = "coresight-tmc",
@@ -580,6 +597,12 @@ static struct amba_driver tmc_driver = { }, .probe = tmc_probe, .shutdown = tmc_shutdown, + .remove = tmc_remove, .id_table = tmc_ids, }; -builtin_amba_driver (tmc_driver); + +module_amba_driver (tmc_driver); + +MODULE_AUTHOR ("Pratik Patel <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight Trace Memory Controller driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 13/24] coresight: tmc: allow tmc to be built as a module
Quoted 22 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-tmc as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-tmc by theMakefile
- add antmc_removefunction, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Suzuki K Poulose <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>
Quoted 1 line
---
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v10 14/24 coresight: allow funnel driver to be built as module
In reply to Tingwei ZhangFrom: Kim Phillips <[email protected]>
Allow to build coresight-funnel as module, for ease of development.
- combine static and dynamic funnel init into single module_init/exit call
- add funnel_remove functions, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot
--- .../hwtracing/coresight/coresight-funnel.c | 64 ++++++++++++++++++- 1 file changed, 62 insertions(+), 2 deletions(-)
drivers/hwtracing/coresight/coresight-funnel.c +62 -2
@@ -274,6 +274,15 @@ static int funnel_probe(struct device *dev, struct resource *res)return ret; } +static int __exit funnel_remove(struct device *dev) +{ +struct funnel_drvdata *drvdata =dev_get_drvdata (dev); + +coresight_unregister (drvdata->csdev); + +return 0 ; +} +#ifdef CONFIG_PM static int funnel_runtime_suspend (struct device *dev) {
@@ -319,20 +328,32 @@ static int static_funnel_probe(struct platform_device *pdev)return ret; } +static int __exit static_funnel_remove(struct platform_device *pdev) +{ +funnel_remove (&pdev->dev); +pm_runtime_disable (&pdev->dev); +return 0 ; +} +static const struct of_device_id static_funnel_match[] = { {.compatible ="arm,coresight-static-funnel" }, {} }; +MODULE_DEVICE_TABLE (of, static_funnel_match); +#ifdef CONFIG_ACPI static const struct acpi_device_id static_funnel_ids[] = { {"ARMHC9FE" ,0 }, {}, }; + +MODULE_DEVICE_TABLE (acpi, static_funnel_ids);#endif static struct platform_driver static_funnel_driver = { .probe = static_funnel_probe, + .remove = static_funnel_remove, .driver = { .name ="coresight-static-funnel" , .of_match_table = static_funnel_match,
@@ -341,7 +362,6 @@ static struct platform_driver static_funnel_driver = { .suppress_bind_attrs = true, }, }; -builtin_platform_driver (static_funnel_driver);static int dynamic_funnel_probe (struct amba_device *adev,const struct amba_id *id)
@@ -349,6 +369,11 @@ static int dynamic_funnel_probe(struct amba_device *adev,return funnel_probe (&adev->dev, &adev->res); } +static int __exit dynamic_funnel_remove(struct amba_device *adev) +{ +return funnel_remove (&adev->dev); +} +static const struct amba_id dynamic_funnel_ids[] = { { .id =0x000bb908 ,
@@ -362,6 +387,8 @@ static const struct amba_id dynamic_funnel_ids[] = { { 0, 0}, }; +MODULE_DEVICE_TABLE(amba, dynamic_funnel_ids); + static struct amba_driver dynamic_funnel_driver = { .drv = { .name = "coresight-dynamic-funnel",
@@ -370,6 +397,39 @@ static struct amba_driver dynamic_funnel_driver = { .suppress_bind_attrs = true, }, .probe = dynamic_funnel_probe, + .remove = dynamic_funnel_remove, .id_table = dynamic_funnel_ids, }; -builtin_amba_driver (dynamic_funnel_driver); + +static int __init funnel_init (void ) +{ +int ret; + + ret =platform_driver_register (&static_funnel_driver); +if (ret) { +pr_info ("Error registering platform driver\n" ); +return ret; + } + + ret =amba_driver_register (&dynamic_funnel_driver); +if (ret) { +pr_info ("Error registering amba driver\n" ); +platform_driver_unregister (&static_funnel_driver); + } + +return ret; +} + +static void __exit funnel_exit(void) +{ +platform_driver_unregister (&static_funnel_driver); +amba_driver_unregister (&dynamic_funnel_driver); +} + +module_init (funnel_init); +module_exit (funnel_exit); + +MODULE_AUTHOR ("Pratik Patel <[email protected]>" ); +MODULE_AUTHOR ("Mathieu Poirier <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight Funnel Driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 14/24] coresight: allow funnel driver to be built as module
Quoted 23 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-funnel as module, for ease of development.
- combine static and dynamic funnel init into single module_init/exit call
- addfunnel_removefunctions, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Co-developed-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reported-by kernel test robot <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>
Quoted 1 line
---
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v10 14/24] coresight: allow funnel driver to be built as module
In reply to Tingwei ZhangQuoted 9 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-funnel as module, for ease of development.
- combine static and dynamic funnel init into single module_init/exit call
- addfunnel_removefunctions, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on boot
Quoted 14 lines
Cc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Co-developed-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reported-by kernel test robot <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>
Re: [PATCH v10 14/24] coresight: allow funnel driver to be built as module
In reply to Tingwei ZhangQuoted 70 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-funnel as module, for ease of development.
- combine static and dynamic funnel init into single module_init/exit call
- addfunnel_removefunctions, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Co-developed-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reported-by kernel test robot <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>--- .../hwtracing/coresight/coresight-funnel.c | 64 ++++++++++++++++++- 1 file changed, 62 insertions(+), 2 deletions(-)drivers/hwtracing/coresight/coresight-funnel.c +18
-0@@ -274,6 +274,15 @@ static int funnel_probe(struct device *dev, struct resource *res)return ret; } +static int __exit funnel_remove(struct device *dev) +{ +struct funnel_drvdata *drvdata =dev_get_drvdata (dev); + +coresight_unregister (drvdata->csdev); + +return 0 ; +} +#ifdef CONFIG_PM static int funnel_runtime_suspend (struct device *dev) {@@ -319,20 +328,32 @@ static int static_funnel_probe(struct platform_device *pdev)return ret; } +static int __exit static_funnel_remove(struct platform_device *pdev) +{ +funnel_remove (&pdev->dev); +pm_runtime_disable (&pdev->dev); +return 0 ; +} +static const struct of_device_id static_funnel_match[] = { {.compatible ="arm,coresight-static-funnel" }, {} }; +MODULE_DEVICE_TABLE (of, static_funnel_match); +#ifdef CONFIG_ACPI static const struct acpi_device_id static_funnel_ids[] = { {"ARMHC9FE" ,0 }, {}, };
drivers/hwtracing/coresight/coresight-funnel.c static int static_funnel_probe(struct platform_device *pdev) · line 359
Quoted 10 lines
drivers/hwtracing/coresight/coresight-funnel.c +3
-0+ +MODULE_DEVICE_TABLE (acpi, static_funnel_ids);#endif static struct platform_driver static_funnel_driver = { .probe = static_funnel_probe, + .remove = static_funnel_remove, .driver = { .name ="coresight-static-funnel" , .of_match_table = static_funnel_match,
Sorry missed this. Please set the owner field here. With that :
Re: [PATCH v10 14/24] coresight: allow funnel driver to be built as module
Quoted 83 lines · Suzuki K Poulose
Quoted 23 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-funnel as module, for ease of development.
- combine static and dynamic funnel init into single module_init/exit call
- addfunnel_removefunctions, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Co-developed-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Reported-by kernel test robot <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>Review
Quoted 5 lines
--- .../hwtracing/coresight/coresight-funnel.c | 64 ++++++++++++++++++- 1 file changed, 62 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-funnel.cdrivers/hwtracing/coresight/coresight-funnel.c static int funnel_probe(struct device *dev, struct
Quoted 4 lines
index
900690a9f7f0..07bc20391fac100644drivers/hwtracing/coresight/coresight-funnel.c +0
-0@@ -274,6 +274,15 @@ static int funnel_probe(struct device *dev, structresource *res)
drivers/hwtracing/coresight/coresight-funnel.c static int static_funnel_probe(struct
Quoted 15 lines
drivers/hwtracing/coresight/coresight-funnel.c +9
-0return ret; } +static int __exit funnel_remove(struct device *dev) +{ +struct funnel_drvdata *drvdata =dev_get_drvdata (dev); + +coresight_unregister (drvdata->csdev); + +return 0 ; +} +#ifdef CONFIG_PM static int funnel_runtime_suspend (struct device *dev) {@@ -319,20 +328,32 @@ static int static_funnel_probe(struct
platform_device*pdev)Quoted 19 lines
drivers/hwtracing/coresight/coresight-funnel.c +9
-0return ret; } +static int __exit static_funnel_remove(struct platform_device *pdev) +{ +funnel_remove (&pdev->dev); +pm_runtime_disable (&pdev->dev); +return 0 ; +} +static const struct of_device_id static_funnel_match[] = { {.compatible ="arm,coresight-static-funnel" }, {} }; +MODULE_DEVICE_TABLE (of, static_funnel_match); +#ifdef CONFIG_ACPI static const struct acpi_device_id static_funnel_ids[] = { {"ARMHC9FE" ,0 }, {},drivers/hwtracing/coresight/coresight-funnel.c static int static_funnel_probe(struct platform_device *pdev) · line 359
Quoted 10 lines
drivers/hwtracing/coresight/coresight-funnel.c +3
-0}; + +MODULE_DEVICE_TABLE (acpi, static_funnel_ids);#endif static struct platform_driver static_funnel_driver = { .probe = static_funnel_probe, + .remove = static_funnel_remove, .driver = { .name ="coresight-static-funnel" , .of_match_table = static_funnel_match,Sorry missed this. Please set the owner field here. With that :
Quoted 2 lines
Reviewed-by Suzuki K Poulose <[email protected]>
Thanks, Suzuki. I'll add owner in v11.
Thanks,
Tingwei
Quoted 4 lines
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v10 15/24 coresight: allow replicator driver to be built as module
In reply to Tingwei ZhangFrom: Kim Phillips <[email protected]>
Allow to build coresight-replicator as modules, for ease of development.
- Kconfig becomes a tristate, to allow =m
- combine static and dynamic replicator init into single module_init/exit call
- add replicator_remove functions, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot
--- drivers/hwtracing/coresight/Kconfig | 5 +- .../coresight/coresight-replicator.c | 65 ++++++++++++++++++- 2 files changed, 67 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/Kconfig +4 -1
@@ -17,13 +17,16 @@ menuconfig CORESIGHT if CORESIGHT config CORESIGHT_LINKS_AND_SINKS - bool "CoreSight Link and Sink drivers" + tristate "CoreSight Link and Sink drivers" help This enables support for CoreSight link and sink drivers that are responsible for transporting and collecting the trace data respectively. Link and sinks are dynamically aggregated with a trace entity at run time to form a complete trace path. + To compile these drivers as modules, choose M here: the + modules will be called coresight-funnel and coresight-replicator. + config CORESIGHT_LINK_AND_SINK_TMC tristate "Coresight generic TMC driver"
drivers/hwtracing/coresight/coresight-replicator.c +63 -2
118 lines not on this page · raw message
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 15/24] coresight: allow replicator driver to be built as module
Quoted 22 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-replicator as modules, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- combine static and dynamic replicator init into single module_init/exit call
- addreplicator_removefunctions, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Co-developed-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>
Quoted 1 line
---
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v10 15/24] coresight: allow replicator driver to be built as module
In reply to Tingwei ZhangQuoted 22 lines · Tingwei Zhang
From: Kim Phillips <[email protected]>
Allow to build coresight-replicator as modules, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- combine static and dynamic replicator init into single module_init/exit call
- addreplicator_removefunctions, for module unload
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Co-developed-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Mian Yousaf Kaukab <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>
Quoted 4 lines
--- drivers/hwtracing/coresight/Kconfig | 5 +- .../coresight/coresight-replicator.c | 65 ++++++++++++++++++- 2 files changed, 67 insertions(+), 3 deletions(-)
Quoted 153 lines
drivers/hwtracing/coresight/Kconfig +4
-1@@ -17,13 +17,16 @@ menuconfig CORESIGHT if CORESIGHT config CORESIGHT_LINKS_AND_SINKS - bool "CoreSight Link and Sink drivers" + tristate "CoreSight Link and Sink drivers" help This enables support for CoreSight link and sink drivers that are responsible for transporting and collecting the trace data respectively. Link and sinks are dynamically aggregated with a trace entity at run time to form a complete trace path. + To compile these drivers as modules, choose M here: the + modules will be called coresight-funnel and coresight-replicator. + config CORESIGHT_LINK_AND_SINK_TMC tristate "Coresight generic TMC driver"drivers/hwtracing/coresight/coresight-replicator.c +63
-2@@ -291,6 +291,14 @@ static int replicator_probe(struct device *dev, struct resource *res)return ret; } +static int __exit replicator_remove(struct device *dev) +{ +struct replicator_drvdata *drvdata =dev_get_drvdata (dev); + +coresight_unregister (drvdata->csdev); +return 0 ; +} +static int static_replicator_probe (struct platform_device *pdev) {int ret;@@ -310,6 +318,13 @@ static int static_replicator_probe(struct platform_device *pdev)return ret; } +static int __exit static_replicator_remove(struct platform_device *pdev) +{ +replicator_remove (&pdev->dev); +pm_runtime_disable (&pdev->dev); +return 0 ; +} +#ifdef CONFIG_PM static int replicator_runtime_suspend (struct device *dev) {@@ -343,24 +358,29 @@ static const struct of_device_id static_replicator_match[] = { {} }; +MODULE_DEVICE_TABLE (of, static_replicator_match); +#ifdef CONFIG_ACPI static const struct acpi_device_id static_replicator_acpi_ids[] = { {"ARMHC985" ,0 },/* ARM CoreSight Static Replicator */ {} }; + +MODULE_DEVICE_TABLE (acpi, static_replicator_acpi_ids);#endif static struct platform_driver static_replicator_driver = { .probe = static_replicator_probe, + .remove = static_replicator_remove, .driver = { .name ="coresight-static-replicator" , + .owner =THIS_MODULE , .of_match_table =of_match_ptr (static_replicator_match), .acpi_match_table =ACPI_PTR (static_replicator_acpi_ids), .pm = &replicator_dev_pm_ops, .suppress_bind_attrs = true, }, }; -builtin_platform_driver (static_replicator_driver);static int dynamic_replicator_probe (struct amba_device *adev,const struct amba_id *id)@@ -368,19 +388,60 @@ static int dynamic_replicator_probe(struct amba_device *adev,return replicator_probe (&adev->dev, &adev->res); } +static int __exit dynamic_replicator_remove(struct amba_device *adev) +{ +return replicator_remove (&adev->dev); +} +static const struct amba_id dynamic_replicator_ids[] = {CS_AMBA_ID (0x000bb909 ),CS_AMBA_ID (0x000bb9ec ),/* Coresight SoC-600 */ {}, }; +MODULE_DEVICE_TABLE (amba, dynamic_replicator_ids); +static struct amba_driver dynamic_replicator_driver = { .drv = { .name ="coresight-dynamic-replicator" , .pm = &replicator_dev_pm_ops, + .owner =THIS_MODULE , .suppress_bind_attrs = true, }, .probe = dynamic_replicator_probe, + .remove = dynamic_replicator_remove, .id_table = dynamic_replicator_ids, }; -builtin_amba_driver (dynamic_replicator_driver); + +static int __init replicator_init (void ) +{ +int ret; + + ret =platform_driver_register (&static_replicator_driver); +if (ret) { +pr_info ("Error registering platform driver\n" ); +return ret; + } + + ret =amba_driver_register (&dynamic_replicator_driver); +if (ret) { +pr_info ("Error registering amba driver\n" ); +platform_driver_unregister (&static_replicator_driver); + } + +return ret; +} + +static void __exit replicator_exit(void) +{ +platform_driver_unregister (&static_replicator_driver); +amba_driver_unregister (&dynamic_replicator_driver); +} + +module_init (replicator_init); +module_exit (replicator_exit); + +MODULE_AUTHOR ("Pratik Patel <[email protected]>" ); +MODULE_AUTHOR ("Mathieu Poirier <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight Replicator Driver" ); +MODULE_LICENSE ("GPL v2" );Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 16/24 coresight: cti: add function to register cti associate ops
In reply to Tingwei ZhangAdd static cti_assoc_ops to coresight core driver. Let cti driver register the add_assoc and remove_assoc call back. Avoid coresight core driver to depend on cti driver.
--- drivers/hwtracing/coresight/coresight-cti.c | 36 +++++++++++++++++--- drivers/hwtracing/coresight/coresight-priv.h | 14 ++++---- drivers/hwtracing/coresight/coresight.c | 21 ++++++++++-- 3 files changed, 55 insertions(+), 16 deletions(-)
drivers/hwtracing/coresight/coresight-cti.c +31 -5
@@ -556,7 +556,7 @@ cti_match_fixup_csdev(struct cti_device *ctidev, const char *node_name,* This will set the association if CTI declared before the CS device. * (called from coresight_register() with coresight_mutex locked). */ -void cti_add_assoc_to_csdev (struct coresight_device *csdev) +static void cti_add_assoc_to_csdev (struct coresight_device *csdev) {struct cti_drvdata *ect_item;struct cti_device *ctidev;
@@ -589,13 +589,12 @@ void cti_add_assoc_to_csdev(struct coresight_device *csdev) cti_add_done:mutex_unlock (&ect_mutex); } -EXPORT_SYMBOL_GPL (cti_add_assoc_to_csdev);/* * Removing the associated devices is easier. * A CTI will not have a value for csdev->ect_dev. */ -void cti_remove_assoc_from_csdev (struct coresight_device *csdev) +static void cti_remove_assoc_from_csdev (struct coresight_device *csdev) {struct cti_drvdata *ctidrv;struct cti_trig_con *tc;
@@ -616,7 +615,15 @@ void cti_remove_assoc_from_csdev(struct coresight_device *csdev) }mutex_unlock (&ect_mutex); } -EXPORT_SYMBOL_GPL (cti_remove_assoc_from_csdev); + +/* +* Operations to add and remove associated CTI. +* Register to coresight core driver as call back function. +*/ +static struct cti_assoc_op cti_assoc_ops = { + .add = cti_add_assoc_to_csdev, + .remove = cti_remove_assoc_from_csdev +};/* * Update the cross references where the associated device was found
@@ -972,4 +979,23 @@ static struct amba_driver cti_driver = { .probe = cti_probe, .id_table = cti_ids, }; -builtin_amba_driver (cti_driver); + +static int __init cti_init (void ) +{ +int ret; + + ret =amba_driver_register (&cti_driver); +if (ret) +pr_info ("Error registering cti driver\n" ); +coresight_set_cti_ops (&cti_assoc_ops); +return ret; +} + +static void __exit cti_exit(void) +{ +coresight_remove_cti_ops (); +amba_driver_unregister (&cti_driver); +} + +module_init (cti_init); +module_exit (cti_exit);
drivers/hwtracing/coresight/coresight-priv.h +6 -8
@@ -173,15 +173,13 @@ static inline int etm_readl_cp14(u32 off, unsigned int *val) { return 0; }static inline int etm_writel_cp14 (u32 off,u32 val) {return 0 ; }#endif -#ifdef CONFIG_CORESIGHT_CTI -extern void cti_add_assoc_to_csdev (struct coresight_device *csdev); -extern void cti_remove_assoc_from_csdev (struct coresight_device *csdev); +struct cti_assoc_op { +void (*add)(struct coresight_device *csdev); +void (*remove)(struct coresight_device *csdev); +}; -#else -static inline void cti_add_assoc_to_csdev (struct coresight_device *csdev) {} -static inline void -cti_remove_assoc_from_csdev (struct coresight_device *csdev) {} -#endif +extern void coresight_set_cti_ops (const struct cti_assoc_op *cti_op); +extern void coresight_remove_cti_ops (void );/* * Macros and inline functions to handle CoreSight UCI data and driver
drivers/hwtracing/coresight/coresight.c +18 -3
@@ -56,6 +56,20 @@ static struct list_head *stm_path;const u32 coresight_barrier_pkt[4 ] = {0x7fffffff ,0x7fffffff ,0x7fffffff ,0x7fffffff };EXPORT_SYMBOL_GPL (coresight_barrier_pkt); +static const struct cti_assoc_op *cti_assoc_ops; + +void coresight_set_cti_ops (const struct cti_assoc_op *cti_op) +{ + cti_assoc_ops = cti_op; +} +EXPORT_SYMBOL_GPL (coresight_set_cti_ops); + +void coresight_remove_cti_ops (void ) +{ + cti_assoc_ops =NULL ; +} +EXPORT_SYMBOL_GPL (coresight_remove_cti_ops); +static int coresight_id_match (struct device *dev,void *data) {int trace_id, i_trace_id;
@@ -1240,7 +1254,8 @@ static void coresight_device_release(struct device *dev) {struct coresight_device *csdev =to_coresight_device (dev); -cti_remove_assoc_from_csdev (csdev); +if (cti_assoc_ops && cti_assoc_ops->remove) + cti_assoc_ops->remove (csdev);fwnode_handle_put (csdev->dev.fwnode);kfree (csdev->refcnt);kfree (csdev);
@@ -1551,8 +1566,8 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) ret =coresight_fixup_device_conns (csdev);if (!ret) ret =coresight_fixup_orphan_conns (csdev); -if (!ret) -cti_add_assoc_to_csdev (csdev); +if (!ret && cti_assoc_ops && cti_assoc_ops->add) + cti_assoc_ops->add (csdev);mutex_unlock (&coresight_mutex);if (ret) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 17/24 coresight: cti: Fix remove sysfs link error
In reply to Tingwei ZhangFrom: Mike Leach <[email protected]>
CTI code to remove sysfs link to other devices on shutdown, incorrectly tries to remove a single ended link when these are all double ended. This implementation leaves elements in the link info structure undefined which results in a crash in recent tests for driver module unload.
This patch corrects the link removal code.
--- drivers/hwtracing/coresight/coresight-cti.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight-cti.c +6 -3
@@ -511,12 +511,15 @@ static bool cti_add_sysfs_link(struct cti_drvdata *drvdata,return !link_err; } -static void cti_remove_sysfs_link (struct cti_trig_con *tc) +static void cti_remove_sysfs_link (struct cti_drvdata *drvdata, +struct cti_trig_con *tc) {struct coresight_sysfs_link link_info; + link_info.orig = drvdata->csdev; link_info.orig_name = tc->con_dev_name; link_info.target = tc->con_dev; + link_info.target_name =dev_name (&drvdata->csdev->dev);coresight_remove_sysfs_link (&link_info); }
@@ -606,7 +609,7 @@ static void cti_remove_assoc_from_csdev(struct coresight_device *csdev) ctidev = &ctidrv->ctidev;list_for_each_entry (tc, &ctidev->trig_cons, node) {if (tc->con_dev == csdev->ect_dev) { -cti_remove_sysfs_link (tc); +cti_remove_sysfs_link (ctidrv, tc); tc->con_dev =NULL ;break ; }
@@ -658,7 +661,7 @@ static void cti_remove_conn_xrefs(struct cti_drvdata *drvdata)if (tc->con_dev) {coresight_set_assoc_ectdev_mutex (tc->con_dev,NULL ); -cti_remove_sysfs_link (tc); +cti_remove_sysfs_link (drvdata, tc); tc->con_dev =NULL ; } }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 18/24 coresight: cti: Fix bug clearing sysfs links on callback
In reply to Tingwei ZhangFrom: Mike Leach <[email protected]>
During module unload, a coresight driver module will call back into the CTI driver to remove any links between the two devices.
The current code has 2 issues:-
1) in the CTI driver the matching code is matching to the wrong device so misses all the links.
2) The callback is called too late in the unload process resulting in a crash.
This fixes both the issues.
--- drivers/hwtracing/coresight/coresight-cti.c | 2 +- drivers/hwtracing/coresight/coresight.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight-cti.c +1 -1
@@ -608,7 +608,7 @@ static void cti_remove_assoc_from_csdev(struct coresight_device *csdev) ctidrv =csdev_to_cti_drvdata (csdev->ect_dev); ctidev = &ctidrv->ctidev;list_for_each_entry (tc, &ctidev->trig_cons, node) { -if (tc->con_dev == csdev->ect_dev) { +if (tc->con_dev == csdev) {cti_remove_sysfs_link (ctidrv, tc); tc->con_dev =NULL ;break ;
drivers/hwtracing/coresight/coresight.c +2 -2
@@ -1254,8 +1254,6 @@ static void coresight_device_release(struct device *dev) {struct coresight_device *csdev =to_coresight_device (dev); -if (cti_assoc_ops && cti_assoc_ops->remove) - cti_assoc_ops->remove (csdev);fwnode_handle_put (csdev->dev.fwnode);kfree (csdev->refcnt);kfree (csdev);
@@ -1590,6 +1588,8 @@ void coresight_unregister(struct coresight_device *csdev) {etm_perf_del_symlink_sink (csdev);/* Remove references of that device in the topology */ +if (cti_assoc_ops && cti_assoc_ops->remove) + cti_assoc_ops->remove (csdev);coresight_remove_conns (csdev);coresight_clear_default_sink (csdev);coresight_release_platform_data (csdev, csdev->pdata);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 18/24] coresight: cti: Fix bug clearing sysfs links on callback
Quoted 11 lines · Tingwei Zhang
From: Mike Leach <[email protected]>
During module unload, a coresight driver module will call back into the CTI driver to remove any links between the two devices.
The current code has 2 issues:-
1) in the CTI driver the matching code is matching to the wrong device so misses all the links.
2) The callback is called too late in the unload process resulting in a crash.
Quoted 7 lines
This fixes both the issues.
Fixes 177af8285b59 ("coresight: cti: Enable CTI associated with devices")Reported-by Tingwei Zhang <[email protected]>Signed-off-by Mike Leach <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Acked-by Suzuki K Poulose <[email protected]>
Quoted 44 lines
--- drivers/hwtracing/coresight/coresight-cti.c | 2 +- drivers/hwtracing/coresight/coresight.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/hwtracing/coresight/coresight-cti.c +1
-1@@ -608,7 +608,7 @@ static void cti_remove_assoc_from_csdev(struct coresight_device *csdev) ctidrv =csdev_to_cti_drvdata (csdev->ect_dev); ctidev = &ctidrv->ctidev;list_for_each_entry (tc, &ctidev->trig_cons, node) { -if (tc->con_dev == csdev->ect_dev) { +if (tc->con_dev == csdev) {cti_remove_sysfs_link (ctidrv, tc); tc->con_dev =NULL ;break ;drivers/hwtracing/coresight/coresight.c +2
-2@@ -1254,8 +1254,6 @@ static void coresight_device_release(struct device *dev) {struct coresight_device *csdev =to_coresight_device (dev); -if (cti_assoc_ops && cti_assoc_ops->remove) - cti_assoc_ops->remove (csdev);fwnode_handle_put (csdev->dev.fwnode);kfree (csdev->refcnt);kfree (csdev);@@ -1590,6 +1588,8 @@ void coresight_unregister(struct coresight_device *csdev) {etm_perf_del_symlink_sink (csdev);/* Remove references of that device in the topology */ +if (cti_assoc_ops && cti_assoc_ops->remove) + cti_assoc_ops->remove (csdev);coresight_remove_conns (csdev);coresight_clear_default_sink (csdev);coresight_release_platform_data (csdev, csdev->pdata);Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 19/24 coresight: cti: don't disable ect device if it's not enabled
In reply to Tingwei ZhangIf associated ect device is not enabled at first place, disable routine should not be called. Add ect_enabled flag to check whether ect device is enabled. Fix the issue in below case. Ect device is not available when associated coresight device enabled and the association is established after coresight device is enabled.
--- drivers/hwtracing/coresight/coresight.c | 11 ++++++++--- include/linux/coresight.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight.c +8 -3
@@ -244,13 +244,18 @@ coresight_control_assoc_ectdev(struct coresight_device *csdev, bool enable)if (!ect_csdev)return 0 ; +if ((!ect_ops (ect_csdev)->enable) || (!ect_ops (ect_csdev)->disable)) +return 0 ;if (enable) { -if (ect_ops (ect_csdev)->enable) - ect_ret =ect_ops (ect_csdev)->enable (ect_csdev); + ect_ret =ect_ops (ect_csdev)->enable (ect_csdev); +if (!ect_ret) + csdev->ect_enabled = true; }else { -if (ect_ops (ect_csdev)->disable) +if (csdev->ect_enabled) { ect_ret =ect_ops (ect_csdev)->disable (ect_csdev); + csdev->ect_enabled = false; + } }/* output warning if ECT enable is preventing trace operation */
include/linux/coresight.h +1 -0
@@ -208,6 +208,7 @@ struct coresight_device {/* sysfs links between components */ int nr_links;bool has_conns_grp; +bool ect_enabled;/* true only if associated ect device is enabled */ };/*
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 19/24] coresight: cti: don't disable ect device if it's not enabled
Quoted 9 lines · Tingwei Zhang
If associated ect device is not enabled at first place, disable routine should not be called. Add
ect_enabledflag to check whether ect device is enabled. Fix the issue in below case. Ect device is not available when associated coresight device enabled and the association is established after coresight device is enabled.Signed-off-by Mike Leach <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>---
Quoted 46 lines
drivers/hwtracing/coresight/coresight.c | 11 ++++++++--- include/linux/coresight.h | 1 + 2 files changed, 9 insertions(+), 3 deletions(-)drivers/hwtracing/coresight/coresight.c +8
-3@@ -244,13 +244,18 @@ coresight_control_assoc_ectdev(struct coresight_device *csdev, bool enable)if (!ect_csdev)return 0 ; +if ((!ect_ops (ect_csdev)->enable) || (!ect_ops (ect_csdev)->disable)) +return 0 ;if (enable) { -if (ect_ops (ect_csdev)->enable) - ect_ret =ect_ops (ect_csdev)->enable (ect_csdev); + ect_ret =ect_ops (ect_csdev)->enable (ect_csdev); +if (!ect_ret) + csdev->ect_enabled = true; }else { -if (ect_ops (ect_csdev)->disable) +if (csdev->ect_enabled) { ect_ret =ect_ops (ect_csdev)->disable (ect_csdev); + csdev->ect_enabled = false; + } }/* output warning if ECT enable is preventing trace operation */ include/linux/coresight.h +1
-0@@ -208,6 +208,7 @@ struct coresight_device {/* sysfs links between components */ int nr_links;bool has_conns_grp; +bool ect_enabled;/* true only if associated ect device is enabled */ };/* Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 20/24 coresight: cti: increase reference count when enabling cti
In reply to Tingwei ZhangCTI device is enabled when associated coresight device is enabled. Increase the module and device reference count for CTI device when it's enabled. This can prevent CTI device be removed or module be unloaded when CTI device is enabled by an active trace session.
--- drivers/hwtracing/coresight/coresight.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
drivers/hwtracing/coresight/coresight.c +14 -3
@@ -241,19 +241,30 @@ coresight_control_assoc_ectdev(struct coresight_device *csdev, bool enable) {int ect_ret =0 ;struct coresight_device *ect_csdev = csdev->ect_dev; +struct module *mod;if (!ect_csdev)return 0 ;if ((!ect_ops (ect_csdev)->enable) || (!ect_ops (ect_csdev)->disable))return 0 ; + mod = ect_csdev->dev.parent->driver->owner;if (enable) { - ect_ret =ect_ops (ect_csdev)->enable (ect_csdev); -if (!ect_ret) - csdev->ect_enabled = true; +if (try_module_get (mod)) { + ect_ret =ect_ops (ect_csdev)->enable (ect_csdev); +if (ect_ret) { +module_put (mod); + }else { +get_device (ect_csdev->dev.parent); + csdev->ect_enabled = true; + } + }else + ect_ret = -ENODEV ; }else {if (csdev->ect_enabled) { ect_ret =ect_ops (ect_csdev)->disable (ect_csdev); +put_device (ect_csdev->dev.parent); +module_put (mod); csdev->ect_enabled = false; } }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 20/24] coresight: cti: increase reference count when enabling cti
Quoted 9 lines · Tingwei Zhang
CTI device is enabled when associated coresight device is enabled. Increase the module and device reference count for CTI device when it's enabled. This can prevent CTI device be removed or module be unloaded when CTI device is enabled by an active trace session.
Signed-off-by Mike Leach <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>---
Quoted 45 lines
drivers/hwtracing/coresight/coresight.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)drivers/hwtracing/coresight/coresight.c +14
-3@@ -241,19 +241,30 @@ coresight_control_assoc_ectdev(struct coresight_device *csdev, bool enable) {int ect_ret =0 ;struct coresight_device *ect_csdev = csdev->ect_dev; +struct module *mod;if (!ect_csdev)return 0 ;if ((!ect_ops (ect_csdev)->enable) || (!ect_ops (ect_csdev)->disable))return 0 ; + mod = ect_csdev->dev.parent->driver->owner;if (enable) { - ect_ret =ect_ops (ect_csdev)->enable (ect_csdev); -if (!ect_ret) - csdev->ect_enabled = true; +if (try_module_get (mod)) { + ect_ret =ect_ops (ect_csdev)->enable (ect_csdev); +if (ect_ret) { +module_put (mod); + }else { +get_device (ect_csdev->dev.parent); + csdev->ect_enabled = true; + } + }else + ect_ret = -ENODEV ; }else {if (csdev->ect_enabled) { ect_ret =ect_ops (ect_csdev)->disable (ect_csdev); +put_device (ect_csdev->dev.parent); +module_put (mod); csdev->ect_enabled = false; } }Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v10 21/24 coresight: cti: allow cti to be built as a module
In reply to Tingwei ZhangAllow 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
Reviewed-by Mike Leach <[email protected]>
---
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%)drivers/hwtracing/coresight/Kconfig +4 -1
@@ -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
drivers/hwtracing/coresight/Makefile +2 -2
@@ -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
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +19 -1
@@ -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 <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight CTI Driver" ); +MODULE_LICENSE ("GPL v2" );
drivers/hwtracing/coresight/coresight-platform.c +1 -0
@@ -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)
drivers/hwtracing/coresight/coresight.c +1 -0
@@ -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)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 21/24] coresight: cti: allow cti to be built as a module
Quoted 77 lines · Tingwei Zhang
Allow to build coresight-cti as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-cti by theMakefile
- add ancti_removefunction, for module unload
- movecti_remove_conn_xrefstocti_remove
- add aMODULE_DEVICE_TABLEfor autoloading on bootSigned-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Mike Leach <[email protected]>
--- 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%)drivers/hwtracing/coresight/Kconfig +4
-1@@ -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_CTIdrivers/hwtracing/coresight/Makefile +2
-2@@ -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.odrivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +1
-1@@ -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)
drivers/hwtracing/coresight/coresight-cti-core.c static void cti_device_release(struct device *dev) · line 865
Quoted 10 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +10
-0+{ +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 ;
Once again my recommendations from V8 were not followed.
Quoted 57 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +8
-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 <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight CTI Driver" ); +MODULE_LICENSE ("GPL v2" );drivers/hwtracing/coresight/coresight-platform.c +1
-0@@ -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)drivers/hwtracing/coresight/coresight.c +1
-0@@ -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)Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 21/24] coresight: cti: allow cti to be built as a module
Quoted 88 lines · Mathieu Poirier
Quoted 12 lines · Tingwei Zhang
Allow to build coresight-cti as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-cti by theMakefile
- add ancti_removefunction, for module unload
- movecti_remove_conn_xrefstocti_remove
- add aMODULE_DEVICE_TABLEfor autoloading on bootSigned-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Mike Leach <[email protected]>
Quoted 8 lines
--- 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%)Review
Quoted 2 lines
(quoted diff) +0
-0b/drivers/hwtracing/coresight/Kconfig
drivers/hwtracing/coresight/Kconfig config CORESIGHT_CPU_DEBUG · line 142
Quoted 12 lines
index
f31778dd0b5d..b04aae2ceecc100644drivers/hwtracing/coresight/Kconfig +1
-1@@ -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 CTMcomponents.
Review
Quoted 11 lines
drivers/hwtracing/coresight/Kconfig +3
-0@@ -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(quoted diff) +0
-0b/drivers/hwtracing/coresight/Makefile
drivers/hwtracing/coresight/Makefile coresight-etm4x-y := coresight-etm4x-core.o
Quoted 4 lines
index
f2a568b969c4..0359d5a1588f100644drivers/hwtracing/coresight/Makefile +0
-0@@ -19,6 +19,6 @@ coresight-etm4x-y := coresight-etm4x-core.ocoresight-etm4x-sysfs.o
Review
Quoted 9 lines
drivers/hwtracing/coresight/Makefile +2
-2obj-$(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(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-cti-core.cQuoted 23 lines
similarity index 98%
rename fromdrivers/hwtracing/coresight/coresight-cti.crename todrivers/hwtracing/coresight/coresight-cti-core.cindexec286d617b73..d6d5419ec21c100644drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +5
-1@@ -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);
Quoted 9 lines
drivers/hwtracing/coresight/coresight-cti-core.c static void cti_device_release(struct device *dev) · line 865
Quoted 6 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +6
-0+cti_remove_conn_xrefs (drvdata); +mutex_unlock (&ect_mutex); + +coresight_unregister (drvdata->csdev); + +return 0 ;Once again my recommendations from V8 were not followed.
Sorry for missing your comment. I'll add reason for above change in commit message in V11.
Thanks,
Tingwei
Quoted 64 lines
drivers/hwtracing/coresight/coresight-cti-core.c static void cti_device_release(struct device *dev)
Quoted 3 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +1
-0+} static int cti_probe(struct amba_device *adev, const struct amba_id*id)
Review
Quoted 27 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +7
-0{@@ -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 <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight CTI Driver" ); +MODULE_LICENSE ("GPL v2" );(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-platform.cdrivers/hwtracing/coresight/coresight-platform.c coresight_find_csdev_by_fwnode(struct fwnode_handle
Quoted 4 lines
index
227e234a2470..3629b7885aca100644drivers/hwtracing/coresight/coresight-platform.c +0
-0@@ -75,6 +75,7 @@ coresight_find_csdev_by_fwnode(struct fwnode_handle
*r_fwnode)drivers/hwtracing/coresight/coresight-platform.c coresight_find_csdev_by_fwnode(struct fwnode_handle *r_fwnode)
Quoted 7 lines
drivers/hwtracing/coresight/coresight-platform.c +1
-0}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)
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight.cdrivers/hwtracing/coresight/coresight.c void coresight_set_assoc_ectdev_mutex(struct
Quoted 4 lines
index
6c9f6930b8b8..668963b4b7d4100644drivers/hwtracing/coresight/coresight.c +0
-0@@ -288,6 +288,7 @@ void coresight_set_assoc_ectdev_mutex(struct
coresight_device*csdev,Quoted 9 lines
drivers/hwtracing/coresight/coresight.c +1
-0csdev->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)Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code AuroraForum,
Quoted 2 lines
a Linux Foundation Collaborative Project
Re: [PATCH v10 21/24] coresight: cti: allow cti to be built as a module
In reply to Mathieu PoirierQuoted 88 lines · Mathieu Poirier
Quoted 12 lines · Tingwei Zhang
Allow to build coresight-cti as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-cti by theMakefile
- add ancti_removefunction, for module unload
- movecti_remove_conn_xrefstocti_remove
- add aMODULE_DEVICE_TABLEfor autoloading on bootSigned-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Mike Leach <[email protected]>
Quoted 8 lines
--- 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%)Review
Quoted 2 lines
(quoted diff) +0
-0b/drivers/hwtracing/coresight/Kconfig
drivers/hwtracing/coresight/Kconfig config CORESIGHT_CPU_DEBUG · line 142
Quoted 12 lines
index
f31778dd0b5d..b04aae2ceecc100644drivers/hwtracing/coresight/Kconfig +1
-1@@ -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 CTMcomponents.
Review
Quoted 11 lines
drivers/hwtracing/coresight/Kconfig +3
-0@@ -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(quoted diff) +0
-0b/drivers/hwtracing/coresight/Makefile
drivers/hwtracing/coresight/Makefile coresight-etm4x-y := coresight-etm4x-core.o
Quoted 4 lines
index
f2a568b969c4..0359d5a1588f100644drivers/hwtracing/coresight/Makefile +0
-0@@ -19,6 +19,6 @@ coresight-etm4x-y := coresight-etm4x-core.ocoresight-etm4x-sysfs.o
Review
Quoted 9 lines
drivers/hwtracing/coresight/Makefile +2
-2obj-$(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(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-cti-core.cQuoted 23 lines
similarity index 98%
rename fromdrivers/hwtracing/coresight/coresight-cti.crename todrivers/hwtracing/coresight/coresight-cti-core.cindexec286d617b73..d6d5419ec21c100644drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +5
-1@@ -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);
Quoted 9 lines
drivers/hwtracing/coresight/coresight-cti-core.c static void cti_device_release(struct device *dev) · line 865
Quoted 6 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +6
-0+cti_remove_conn_xrefs (drvdata); +mutex_unlock (&ect_mutex); + +coresight_unregister (drvdata->csdev); + +return 0 ;Once again my recommendations from V8 were not followed.
Sorry for missing your comment. I'll add reason for above change in commit message in V11.
Thanks,
Tingwei
Quoted 57 lines
drivers/hwtracing/coresight/coresight-cti-core.c static void cti_device_release(struct device *dev)
Quoted 3 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +1
-0+} static int cti_probe(struct amba_device *adev, const struct amba_id*id)
Review
Quoted 27 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +7
-0{@@ -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 <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight CTI Driver" ); +MODULE_LICENSE ("GPL v2" );(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-platform.cdrivers/hwtracing/coresight/coresight-platform.c coresight_find_csdev_by_fwnode(struct fwnode_handle
Quoted 4 lines
index
227e234a2470..3629b7885aca100644drivers/hwtracing/coresight/coresight-platform.c +0
-0@@ -75,6 +75,7 @@ coresight_find_csdev_by_fwnode(struct fwnode_handle
*r_fwnode)drivers/hwtracing/coresight/coresight-platform.c coresight_find_csdev_by_fwnode(struct fwnode_handle *r_fwnode)
Quoted 7 lines
drivers/hwtracing/coresight/coresight-platform.c +1
-0}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)
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight.cdrivers/hwtracing/coresight/coresight.c void coresight_set_assoc_ectdev_mutex(struct
Quoted 4 lines
index
6c9f6930b8b8..668963b4b7d4100644drivers/hwtracing/coresight/coresight.c +0
-0@@ -288,6 +288,7 @@ void coresight_set_assoc_ectdev_mutex(struct
coresight_device*csdev,Quoted 5 lines
drivers/hwtracing/coresight/coresight.c +1
-0csdev->ect_dev = ect_csdev;mutex_unlock (&coresight_mutex); } +EXPORT_SYMBOL_GPL (coresight_set_assoc_ectdev_mutex);
Quoted 7 lines
Quoted 4 lines
drivers/hwtracing/coresight/coresight.c +0
-0static int coresight_enable_sink (struct coresight_device *csdev,u32 mode,void *data)Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code AuroraForum,
Quoted 2 lines
a Linux Foundation Collaborative Project
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
A message that is not in the archive (sent off-list or not yet received): 010101747b1340f9-b0542779-88d7-4193-b53b-5b5bfab5d6a3-000000@us-west-2.amazonses.com
Re: [PATCH v10 21/24] coresight: cti: allow cti to be built as a module
Quoted 99 lines · Tingwei Zhang
Quoted 88 lines · Mathieu Poirier
Quoted 12 lines · Tingwei Zhang
Allow to build coresight-cti as a module, for ease of development.
-
Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-cti by theMakefile
- add ancti_removefunction, for module unload
- movecti_remove_conn_xrefstocti_remove
- add aMODULE_DEVICE_TABLEfor autoloading on bootSigned-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Mike Leach <[email protected]>
Quoted 8 lines
--- 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%)Review
Quoted 2 lines
(quoted diff) +0
-0b/drivers/hwtracing/coresight/Kconfig
drivers/hwtracing/coresight/Kconfig config CORESIGHT_CPU_DEBUG · line 142
Quoted 12 lines
index
f31778dd0b5d..b04aae2ceecc100644drivers/hwtracing/coresight/Kconfig +1
-1@@ -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 CTMcomponents.
Review
Quoted 11 lines
drivers/hwtracing/coresight/Kconfig +3
-0@@ -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(quoted diff) +0
-0b/drivers/hwtracing/coresight/Makefile
drivers/hwtracing/coresight/Makefile coresight-etm4x-y := coresight-etm4x-core.o
Quoted 4 lines
index
f2a568b969c4..0359d5a1588f100644drivers/hwtracing/coresight/Makefile +0
-0@@ -19,6 +19,6 @@ coresight-etm4x-y := coresight-etm4x-core.ocoresight-etm4x-sysfs.o
Review
Quoted 9 lines
drivers/hwtracing/coresight/Makefile +2
-2obj-$(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(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-cti-core.cQuoted 23 lines
similarity index 98%
rename fromdrivers/hwtracing/coresight/coresight-cti.crename todrivers/hwtracing/coresight/coresight-cti-core.cindexec286d617b73..d6d5419ec21c100644drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +5
-1@@ -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);Quoted 9 lines
drivers/hwtracing/coresight/coresight-cti-core.c static void cti_device_release(struct device *dev) · line 865
Quoted 6 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +6
-0+cti_remove_conn_xrefs (drvdata); +mutex_unlock (&ect_mutex); + +coresight_unregister (drvdata->csdev); + +return 0 ;Once again my recommendations from V8 were not followed.
Quoted 3 lines
Sorry for missing your comment. I'll add reason for above change in commit message in V11.
I have a couple more things to check on this set - please hold off on V11. I will let you know when I'm done.
Quoted 67 lines
Thanks,
TingweiQuoted 64 lines
drivers/hwtracing/coresight/coresight-cti-core.c static void cti_device_release(struct device *dev)
Quoted 3 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +1
-0+} static int cti_probe(struct amba_device *adev, const struct amba_id*id)
Review
Quoted 27 lines
drivers/hwtracing/coresight/coresight-cti-core.c renamed from drivers/hwtracing/coresight/coresight-cti.c +7
-0{@@ -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 <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight CTI Driver" ); +MODULE_LICENSE ("GPL v2" );(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight-platform.cdrivers/hwtracing/coresight/coresight-platform.c coresight_find_csdev_by_fwnode(struct fwnode_handle
Quoted 4 lines
index
227e234a2470..3629b7885aca100644drivers/hwtracing/coresight/coresight-platform.c +0
-0@@ -75,6 +75,7 @@ coresight_find_csdev_by_fwnode(struct fwnode_handle
*r_fwnode)drivers/hwtracing/coresight/coresight-platform.c coresight_find_csdev_by_fwnode(struct fwnode_handle *r_fwnode)
Quoted 7 lines
drivers/hwtracing/coresight/coresight-platform.c +1
-0}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)
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/hwtracing/coresight/coresight.cdrivers/hwtracing/coresight/coresight.c void coresight_set_assoc_ectdev_mutex(struct
Quoted 4 lines
index
6c9f6930b8b8..668963b4b7d4100644drivers/hwtracing/coresight/coresight.c +0
-0@@ -288,6 +288,7 @@ void coresight_set_assoc_ectdev_mutex(struct
coresight_device*csdev,Quoted 9 lines
drivers/hwtracing/coresight/coresight.c +1
-0csdev->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)Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code AuroraForum,
Quoted 2 lines
a Linux Foundation Collaborative Project
PATCH v10 22/24 coresight: tmc-etr: add function to register catu ops
In reply to Tingwei ZhangFrom: Mian Yousaf Kaukab <[email protected]>
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.
--- 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(-)
drivers/hwtracing/coresight/coresight-catu.c +20 -2
@@ -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);
drivers/hwtracing/coresight/coresight-catu.h +0 -2
@@ -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
drivers/hwtracing/coresight/coresight-tmc-etr.c +13 -2
@@ -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,
drivers/hwtracing/coresight/coresight-tmc.h +3 -0
@@ -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
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 23/24 coresight: catu: allow catu drivers to be built as modules
In reply to Tingwei ZhangAllow to build coresight-catu as modules, for ease of development.
- Kconfig becomes a tristate, to allow =m
- add catu_remove functions, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot
--- drivers/hwtracing/coresight/Kconfig | 5 ++++- drivers/hwtracing/coresight/coresight-catu.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/hwtracing/coresight/Kconfig +4 -1
@@ -42,7 +42,7 @@ config CORESIGHT_LINK_AND_SINK_TMC module will be called coresight-tmc. config CORESIGHT_CATU - bool "Coresight Address Translation Unit (CATU) driver" + tristate "Coresight Address Translation Unit (CATU) driver" depends on CORESIGHT_LINK_AND_SINK_TMC help Enable support for the Coresight Address Translation Unit (CATU).
@@ -52,6 +52,9 @@ config CORESIGHT_CATU by looking up the provided table. CATU can also be used in pass-through mode where the address is not translated. + To compile this driver as a module, choose M here: the + module will be called coresight-catu. + config CORESIGHT_SINK_TPIU tristate "Coresight generic TPIU driver" depends on CORESIGHT_LINKS_AND_SINKS
drivers/hwtracing/coresight/coresight-catu.c +15 -0
@@ -567,11 +567,21 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id)return ret; } +static int __exit catu_remove(struct amba_device *adev) +{ +struct catu_drvdata *drvdata =dev_get_drvdata (&adev->dev); + +coresight_unregister (drvdata->csdev); +return 0 ; +} +static struct amba_id catu_ids[] = {CS_AMBA_ID (0x000bb9ee ), {}, }; +MODULE_DEVICE_TABLE (amba, catu_ids); +static struct amba_driver catu_driver = { .drv = { .name ="coresight-catu" ,
@@ -579,6 +589,7 @@ static struct amba_driver catu_driver = { .suppress_bind_attrs = true, }, .probe = catu_probe, + .remove = catu_remove, .id_table = catu_ids, };
@@ -601,3 +612,7 @@ static void __exit catu_exit(void)module_init (catu_init);module_exit (catu_exit); + +MODULE_AUTHOR ("Suzuki K Poulose <[email protected]>" ); +MODULE_DESCRIPTION ("Arm CoreSight Address Translation Unit (CATU) Driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v10 24/24 coresight: allow the coresight core driver to be built as a module
In reply to Tingwei ZhangEnhance 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
---
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%)drivers/hwtracing/coresight/Kconfig +4 -1
@@ -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"
drivers/hwtracing/coresight/Makefile +3 -2
@@ -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
drivers/hwtracing/coresight/coresight-core.c renamed from drivers/hwtracing/coresight/coresight.c +32 -10
51 lines not on this page · raw message
drivers/hwtracing/coresight/coresight-etm-perf.c +6 -2
@@ -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); +}
drivers/hwtracing/coresight/coresight-etm-perf.h +3 -0
@@ -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
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Re: [PATCH v10 24/24] coresight: allow the coresight core driver to be built as a module
Quoted 21 lines · Tingwei Zhang
Enhance coresight developer's efficiency to debug coresight drivers.
-Kconfigbecomes a tristate, to allow =m
- append -core to source file name to allow module to
be called coresight by theMakefile
- modules can have only one init/exit, so we add theetm_perfregister/unregister function calls to the core init/exit functions.
- add aMODULE_DEVICE_TABLEfor autoloading on bootCc Mathieu Poirier <[email protected]>Cc Leo Yan <[email protected]>Cc Alexander Shishkin <[email protected]>Cc Randy Dunlap <[email protected]>Cc Suzuki K Poulose <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Russell King <[email protected]>Signed-off-by Kim Phillips <[email protected]>Signed-off-by Tingwei Zhang <[email protected]>Tested-by Mike Leach <[email protected]>Reviewed-by Suzuki K Poulose <[email protected]>Reviewed-by Mathieu Poirier <[email protected]>
Quoted 1 line
---
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation