coresight: allow to build coresight as modules

Provide name of cpu_debug module in Kconfig help section.

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/Kconfig | 3 +++
 1 file changed, 3 insertions(+)

drivers/hwtracing/coresight/Kconfig +3 -1

index 02dbb5ca3bcf..4663fd1bbffc 100644
@@ -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
--

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

From: Mian Yousaf Kaukab <[email protected]>

Export symbols used among coresight modules.

Signed-off-by Mian Yousaf Kaukab <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 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

index 1a3169e69bb1..dcb0592418ae 100644
@@ -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

index 82afeaf2ccc4..34d2a2d31d00 100644
@@ -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

index b29c2db94d96..ad991a37e2d2 100644
@@ -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 -1

index 310b1b825dd1..b7151c5f81b1 100644
@@ -55,6 +55,7 @@ static struct list_head *stm_path;
  */
 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)
 {

@@ -180,6 +181,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)
 {

@@ -191,6 +193,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.

@@ -209,6 +212,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)
 {

@@ -216,6 +220,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

@@ -468,6 +473,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)
 {

@@ -1377,6 +1383,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",

@@ -1553,6 +1560,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
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

When 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.

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/coresight.c | 39 +++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

drivers/hwtracing/coresight/coresight.c +34 -6

index b7151c5f81b1..1626bc885dfe 100644
@@ -640,7 +640,7 @@ struct coresight_device *coresight_get_sink_by_id(u32 id)
  * 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,10 +648,30 @@ static void coresight_grab_device(struct coresight_device *csdev)
                struct coresight_device *child;
 
                child  = csdev->pdata->conns[i].child_dev;
-               if (child && child->type == CORESIGHT_DEV_TYPE_HELPER)
+               if (child && child->type == CORESIGHT_DEV_TYPE_HELPER) {
+                       if (!try_module_get(child->dev.parent->driver->owner))
+                               goto err;
+                       get_device(child->dev.parent);
                        pm_runtime_get_sync(child->dev.parent);
+               }
        }
+       if (!try_module_get(csdev->dev.parent->driver->owner))
+               goto err;
+       get_device(csdev->dev.parent);
        pm_runtime_get_sync(csdev->dev.parent);
+       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) {
+                       pm_runtime_put(child->dev.parent);
+                       put_device(child->dev.parent);
+                       module_put(child->dev.parent->driver->owner);
+               }
+       }
+       return -ENODEV;
 }
 
 /*

@@ -663,12 +683,17 @@ static void coresight_drop_device(struct coresight_device *csdev)
        int i;
 
        pm_runtime_put(csdev->dev.parent);
+       put_device(csdev->dev.parent);
+       module_put(csdev->dev.parent->driver->owner);
        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)
+               if (child && child->type == CORESIGHT_DEV_TYPE_HELPER) {
                        pm_runtime_put(child->dev.parent);
+                       put_device(child->dev.parent);
+                       module_put(child->dev.parent->driver->owner);
+               }
        }
 }
 

@@ -687,7 +712,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;
 

@@ -721,7 +746,11 @@ static int _coresight_build_path(struct coresight_device *csdev,
        if (!node)
                return -ENOMEM;
 
-       coresight_grab_device(csdev);
+       ret = coresight_grab_device(csdev);
+       if (ret) {
+               kfree(node);
+               return ret;
+       }
        node->csdev = csdev;
        list_add(&node->link, path);
 
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

- Kconfig becomes a tristate, to allow =m
- add a stm_remove function, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot

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]>

Signed-off-by Kim Phillips <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 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

index 4663fd1bbffc..6433f835fc97 100644
@@ -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 -2

index 673d2f56ed1e..b74072e78436 100644
@@ -948,6 +948,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)
 {

@@ -980,6 +991,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",

@@ -988,7 +1001,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");
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

When 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.

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/hwtracing/coresight/coresight-etm-perf.c +2 -3

index dcb0592418ae..3728c44e5763 100644
@@ -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);
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

From: 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

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]>

Signed-off-by Kim Phillips <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/Kconfig           |  5 +++-
 drivers/hwtracing/coresight/Makefile          |  3 ++-
 ...resight-etm3x.c => coresight-etm3x-core.c} | 27 ++++++++++++++++++-
 3 files changed, 32 insertions(+), 3 deletions(-)
 rename drivers/hwtracing/coresight/{coresight-etm3x.c => coresight-etm3x-core.c} (97%)

drivers/hwtracing/coresight/Kconfig +4 -1

index 6433f835fc97..8fd9fd139cf3 100644
@@ -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

index 19497d1d92bf..d619cfd0abd8 100644
@@ -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 +26 -2

similarity index 97%
rename from drivers/hwtracing/coresight/coresight-etm3x.c
rename to drivers/hwtracing/coresight/coresight-etm3x-core.c
index bf22dcfd3327..82b333c40006 100644
@@ -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,12 @@ 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");
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

From: 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

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]>

Signed-off-by Kim Phillips <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/Kconfig           |  5 +++-
 drivers/hwtracing/coresight/Makefile          |  4 +--
 ...resight-etm4x.c => coresight-etm4x-core.c} | 26 ++++++++++++++++++-
 3 files changed, 31 insertions(+), 4 deletions(-)
 rename drivers/hwtracing/coresight/{coresight-etm4x.c => coresight-etm4x-core.c} (98%)

drivers/hwtracing/coresight/Kconfig +4 -1

index 8fd9fd139cf3..d6e107bbd30b 100644
@@ -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

index d619cfd0abd8..271dc255454f 100644
@@ -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 +25 -2

similarity index 98%
rename from drivers/hwtracing/coresight/coresight-etm4x.c
rename to drivers/hwtracing/coresight/coresight-etm4x-core.c
index 6d7d2169bfb2..8149853d5e9d 100644
@@ -1573,6 +1573,21 @@ static struct amba_cs_uci_id uci_id_etm4[] = {
        }
 };
 
+static int __exit etm4_remove(struct amba_device *adev)
+{
+       struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev);
+
+       etm_perf_symlink(drvdata->csdev, false);
+
+       etmdrvdata[drvdata->cpu] = NULL;
+       etm4_pm_clear();
+
+       coresight_unregister(drvdata->csdev);
+
+       return 0;
+}
+
+
 static const struct amba_id etm4_ids[] = {
        CS_AMBA_ID(0x000bb95d),                 /* Cortex-A53 */
        CS_AMBA_ID(0x000bb95e),                 /* Cortex-A57 */

@@ -1590,12 +1605,21 @@ static const struct amba_id etm4_ids[] = {
        {},
 };
 
+MODULE_DEVICE_TABLE(amba, etm4_ids);
+
 static struct amba_driver etm4x_driver = {
        .drv = {
                .name   = "coresight-etm4x",
+               .owner  = THIS_MODULE,
                .suppress_bind_attrs = true,
        },
        .probe          = etm4_probe,
+       .remove         = etm4_remove,
        .id_table       = etm4_ids,
 };
-builtin_amba_driver(etm4x_driver);
+module_amba_driver(etm4x_driver);
+
+MODULE_AUTHOR("Pratik Patel <[email protected]>");
+MODULE_AUTHOR("Mathieu Poirier <[email protected]>");
+MODULE_DESCRIPTION("Arm CoreSight Program Flow Trace v4 driver");
+MODULE_LICENSE("GPL v2");
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

From: 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

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]>

Signed-off-by Kim Phillips <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/Kconfig           |  5 ++++-
 drivers/hwtracing/coresight/coresight-etb10.c | 20 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

drivers/hwtracing/coresight/Kconfig +4 -1

index d6e107bbd30b..996d84a1edb8 100644
@@ -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 +19 -2

index 04ee9cda988d..b40756497c9a 100644
@@ -801,6 +801,16 @@ 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);
+
+       misc_deregister(&drvdata->miscdev);
+       coresight_unregister(drvdata->csdev);
+
+       return 0;
+}
+
 #ifdef CONFIG_PM
 static int etb_runtime_suspend(struct device *dev)
 {

@@ -835,6 +845,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 +856,12 @@ 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");
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

From: 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

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]>

Signed-off-by Kim Phillips <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/Kconfig          |  5 ++++-
 drivers/hwtracing/coresight/coresight-tpiu.c | 19 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

drivers/hwtracing/coresight/Kconfig +4 -1

index 996d84a1edb8..8fd9887fb03b 100644
@@ -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 +18 -2

index f8583e4032a6..e4ddd9801535 100644
@@ -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,12 @@ 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");
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

From: 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

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]>

Signed-off-by Kim Phillips <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/Kconfig           |  6 +++++-
 drivers/hwtracing/coresight/Makefile          |  6 +++---
 .../{coresight-tmc.c => coresight-tmc-core.c} | 19 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)
 rename drivers/hwtracing/coresight/{coresight-tmc.c => coresight-tmc-core.c} (96%)

drivers/hwtracing/coresight/Kconfig +5 -1

index 8fd9887fb03b..fc48ae086746 100644
@@ -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

index 271dc255454f..f2a568b969c4 100644
@@ -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 +18 -2

similarity index 96%
rename from drivers/hwtracing/coresight/coresight-tmc.c
rename to drivers/hwtracing/coresight/coresight-tmc-core.c
index 7040d583bed9..29d191ba7ccf 100644
@@ -561,6 +561,16 @@ 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);
+
+       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 +582,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 +592,11 @@ 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");
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

From: Mian Yousaf Kaukab <[email protected]>

Dynamic-funnel uses module_amba_driver to register. Whereas static-funnel uses builtin_platform_driver. Combine these init calls into a single module_init/exit pair in preparation to make the driver modular.

Signed-off-by Mian Yousaf Kaukab <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 .../hwtracing/coresight/coresight-funnel.c    | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

drivers/hwtracing/coresight/coresight-funnel.c +28 -3

index 900690a9f7f0..46b277ed8606 100644
@@ -341,7 +341,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)

@@ -372,4 +371,31 @@ static struct amba_driver dynamic_funnel_driver = {
        .probe          = dynamic_funnel_probe,
        .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);
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

From: Mian Yousaf Kaukab <[email protected]>

Dynamic-replicator uses module_amba_driver to register. Whereas static-replicator uses builtin_platform_driver. Combine these init calls into a single module_init/exit pair in preparation to make the driver modular.

Signed-off-by Mian Yousaf Kaukab <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 .../coresight/coresight-replicator.c          | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

drivers/hwtracing/coresight/coresight-replicator.c +28 -3

index 78acf29c49ca..6b30bcee7458 100644
@@ -360,7 +360,6 @@ static struct platform_driver static_replicator_driver = {
                .suppress_bind_attrs = true,
        },
 };
-builtin_platform_driver(static_replicator_driver);
 
 static int dynamic_replicator_probe(struct amba_device *adev,
                                    const struct amba_id *id)

@@ -383,4 +382,31 @@ static struct amba_driver dynamic_replicator_driver = {
        .probe          = dynamic_replicator_probe,
        .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);
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

From: Kim Phillips <[email protected]>

Allow to build coresight-funnel and coresight-replicator as modules, for ease of development.

- Kconfig becomes a tristate, to allow =m
- add funnel_remove and replicator_remove functions, for module unload
- add a MODULE_DEVICE_TABLE for autoloading on boot

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]>

Signed-off-by Kim Phillips <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/Kconfig           |  5 ++-
 .../hwtracing/coresight/coresight-funnel.c    | 32 ++++++++++++++++++
 .../coresight/coresight-replicator.c          | 33 +++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

drivers/hwtracing/coresight/Kconfig +4 -1

index fc48ae086746..f31778dd0b5d 100644
@@ -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-funnel.c +32 -0

index 46b277ed8606..062694ef9879 100644
@@ -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,31 @@ 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,
+       .probe          = static_funnel_remove,
        .driver         = {
                .name   = "coresight-static-funnel",
                .of_match_table = static_funnel_match,

@@ -348,6 +368,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,

@@ -361,6 +386,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",

@@ -369,6 +396,7 @@ static struct amba_driver dynamic_funnel_driver = {
                .suppress_bind_attrs = true,
        },
        .probe          = dynamic_funnel_probe,
+       .remove         = dynamic_funnel_remove,
        .id_table       = dynamic_funnel_ids,
 };
 

@@ -399,3 +427,7 @@ static void __exit funnel_exit(void)
 
 module_init(funnel_init);
 module_exit(funnel_exit);
+
+MODULE_AUTHOR("Mathieu Poirier <[email protected]>");
+MODULE_DESCRIPTION("Arm CoreSight Funnel Driver");
+MODULE_LICENSE("GPL v2");

drivers/hwtracing/coresight/coresight-replicator.c +33 -1

index 6b30bcee7458..05db434c79d0 100644
@@ -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)
 {

@@ -342,18 +357,22 @@ static const struct of_device_id static_replicator_match[] = {
        {.compatible = "arm,coresight-static-replicator"},
        {}
 };
+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,

@@ -367,19 +386,28 @@ 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,
 };
 

@@ -410,3 +438,8 @@ static void __exit replicator_exit(void)
 
 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");
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

Add 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.

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/coresight-cti.c  | 32 ++++++++++++++++++--
 drivers/hwtracing/coresight/coresight-priv.h | 14 ++++-----
 drivers/hwtracing/coresight/coresight.c      | 21 +++++++++++--
 3 files changed, 53 insertions(+), 14 deletions(-)

drivers/hwtracing/coresight/coresight-cti.c +29 -3

index 3ccc703dc940..1f470c47ba70 100644
@@ -589,7 +589,6 @@ 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.

@@ -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

index dcb8aeb6af62..6cde6cf42554 100644
@@ -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 -4

index 1626bc885dfe..25578579559b 100644
@@ -57,6 +57,20 @@ 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;

@@ -1224,7 +1238,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);

@@ -1535,8 +1550,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) {
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

If 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.

Signed-off-by Mike Leach <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/coresight.c | 11 ++++++++---
 include/linux/coresight.h               |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

drivers/hwtracing/coresight/coresight.c +0 -0

index 8b55383cfcf1..83a46cf37968 100644
@@ -245,13 +245,18 @@ coresight_control_assoc_ectdev(struct coresight_device *csdev, bool enable)
 

drivers/hwtracing/coresight/coresight.c +4 -1

+                       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 -1

index 3bb738f9a326..7d3c87e5b97c 100644
@@ -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 */
 };
 
 /*
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

Hi Tingwei,

Quoted 23 lines · Tingwei Zhang

If 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.

Signed-off-by Mike Leach <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/coresight.c | 11 ++++++++---
 include/linux/coresight.h               |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

drivers/hwtracing/coresight/coresight.c +0 -0

index 8b55383cfcf1..83a46cf37968 100644
@@ -245,13 +245,18 @@ coresight_control_assoc_ectdev(struct 
 coresight_device *csdev, bool enable)
 
        if (!ect_csdev)

drivers/hwtracing/coresight/coresight.c coresight_control_assoc_ectdev(struct · line 255

Quoted 10 lines

drivers/hwtracing/coresight/coresight.c +4 -2

                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)

Should this be:-
if (!ect_ret)

However, this problem is corrected in the next patch - so the set as tested overall works.

This needs fixing or it might be better to combine this patch and the next patch into a single patch?
Both are required because the CTI can be loaded as a module. Both adjust the same block of functionality.

Mathieu may have a view on the best solution option here.

Mike

Quoted 22 lines

drivers/hwtracing/coresight/coresight.c +4 -1

+                       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

index 3bb738f9a326..7d3c87e5b97c 100644
@@ -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 
 */
 };
 

Quoted 5 lines

/*
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

--
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK

Hi Mike,

Quoted 40 lines · Mike Leach

Hi Tingwei,

Quoted 23 lines · Tingwei Zhang

If 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.

Signed-off-by Mike Leach <[email protected]>

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/coresight.c | 11 ++++++++---
 include/linux/coresight.h               |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

drivers/hwtracing/coresight/coresight.c +0 -0

index 8b55383cfcf1..83a46cf37968 100644
@@ -245,13 +245,18 @@ coresight_control_assoc_ectdev(struct
 coresight_device *csdev, bool enable)
 
        if (!ect_csdev)

drivers/hwtracing/coresight/coresight.c coresight_control_assoc_ectdev(struct · line 255

Quoted 10 lines

drivers/hwtracing/coresight/coresight.c +4 -2

                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)

Should this be:-
if (!ect_ret)

Quoted 2 lines

However, this problem is corrected in the next patch - so the set as tested overall works.

Thanks a lot for testing this series, Mike.

Sorry for this stupid mistake. I'll address it in v7.

Quoted 1 line

Quoted 4 lines

This needs fixing or it might be better to combine this patch and the next patch into a single patch?
Both are required because the CTI can be loaded as a module. Both adjust the same block of functionality.

I separate them into two since this patch adds ect_enabled flag and next patch add module and device reference. Kind of two things in my opinion. I'm open for discusion and merge them into one path.

Thanks,
Tingwei

Quoted 40 lines

Mathieu may have a view on the best solution option here.

Mike

Quoted 22 lines

drivers/hwtracing/coresight/coresight.c +4 -1

+                       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

index 3bb738f9a326..7d3c87e5b97c 100644
@@ -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
 */
 };
 

Quoted 5 lines

/*
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

--
Mike Leach
Principal Engineer, ARM Ltd.
Manchester Design Centre. UK

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]>

---
 drivers/hwtracing/coresight/coresight.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

drivers/hwtracing/coresight/coresight.c +14 -4

index 83a46cf37968..78439b7cd8ba 100644
@@ -242,19 +242,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;
                }
        }
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

Allow to build coresight-cti as a module, for ease of development.

- Kconfig becomes a tristate, to allow =m
- append -core to source file name to allow module to be called coresight-cti by the Makefile
- add an cti_remove function, for module unload
- move cti_remove_conn_xrefs to cti_remove
- add a MODULE_DEVICE_TABLE for autoloading on boot

Signed-off-by Tingwei Zhang <[email protected]>

---
 drivers/hwtracing/coresight/Kconfig           |  5 ++++-
 drivers/hwtracing/coresight/Makefile          |  4 ++--
 .../{coresight-cti.c => coresight-cti-core.c} | 19 ++++++++++++++++++-
 .../hwtracing/coresight/coresight-platform.c  |  1 +
 drivers/hwtracing/coresight/coresight.c       |  1 +
 5 files changed, 26 insertions(+), 4 deletions(-)
 rename drivers/hwtracing/coresight/{coresight-cti.c => coresight-cti-core.c} (98%)

drivers/hwtracing/coresight/Kconfig +4 -1

index f31778dd0b5d..b04aae2ceecc 100644
@@ -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

index f2a568b969c4..0359d5a1588f 100644
@@ -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 +18 -1

similarity index 98%
rename from drivers/hwtracing/coresight/coresight-cti.c
rename to drivers/hwtracing/coresight/coresight-cti-core.c
index 6bb06c5715db..ca31da6cf1c0 100644
@@ -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)
 {

@@ -972,6 +983,7 @@ static const struct amba_id cti_ids[] = {
        CS_AMBA_UCI_ID(0x000bb9ed, uci_id_cti), /* Coresight CTI (SoC 600) */
        { 0, 0},
 };
+MODULE_DEVICE_TABLE(amba, cti_ids);
 
 static struct amba_driver cti_driver = {
        .drv = {

@@ -980,6 +992,7 @@ static struct amba_driver cti_driver = {
                .suppress_bind_attrs = true,
        },
        .probe          = cti_probe,
+       .remove         = cti_remove,
        .id_table       = cti_ids,
 };
 

@@ -1002,3 +1015,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

index bfd44231d7ad..635d55c1d580 100644
@@ -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 -1

index 78439b7cd8ba..3b4abdda1f72 100644
@@ -289,6 +289,7 @@ void coresight_set_assoc_ectdev_mutex(struct coresight_device *csdev,
        csdev->ect_dev = ect_csdev;
        mutex_unlock(&coresight_mutex);
 }
+EXPORT_SYMBOL_GPL(coresight_set_assoc_ectdev_mutex);
 
 static int coresight_enable_sink(struct coresight_device *csdev,
                                 u32 mode, void *data)
--

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project