Re: [PATCH v2 16/20] coresight: allow cti to be built as a module

From: tingwei@codeaurora.org
To: Mike Leach <mike.leach@linaro.org>
Cc: tsoni@codeaurora.org,
	Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
	Kim Phillips <kim.phillips@arm.com>,
	Mathieu Poirier <mathieu.poirier@linaro.org>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Coresight ML <coresight@lists.linaro.org>,
	Mao Jinlong <jinlmao@codeaurora.org>,
	Mian Yousaf Kaukab <ykaukab@suse.de>,
	Russell King <linux@armlinux.org.uk>,
	Randy Dunlap <rdunlap@infradead.org>,
	Leo Yan <leo.yan@linaro.org>,
	linux-arm-kernel <linux-arm-kernel-bounces@lists.infradead.org>,
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 16/20] coresight: allow cti to be built as a module
Date: Fri, 17 Jul 2020 11:55:15 +0800	[thread overview]
Message-ID: <1bc87d16bcca21e6a2b23468ac7956c5@codeaurora.org> (raw)
In-Reply-To: <CAJ9a7Vj8O-WfD4aXcV+Tiw+k9j45bLKbRmZL8F8xnpOrU1LGCA@mail.gmail.com>

On 2020-07-16 21:30, Mike Leach wrote:
> Hi,
> 
> On Tue, 14 Jul 2020 at 06:54, Tingwei Zhang <tingwei@codeaurora.org>
> wrote:
>> 
>> 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
>> - add a MODULE_DEVICE_TABLE for autoloading on boot
>> 
>> Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
>> ---
>>  drivers/hwtracing/coresight/Kconfig                |  5 ++++-
>>  drivers/hwtracing/coresight/Makefile               |  4 ++--
>>  .../{coresight-cti.c => coresight-cti-core.c}      | 14 
>> ++++++++++++++
>>  drivers/hwtracing/coresight/coresight-platform.c   |  1 +
>>  drivers/hwtracing/coresight/coresight.c            |  1 +
>>  5 files changed, 22 insertions(+), 3 deletions(-)
>>  rename drivers/hwtracing/coresight/{coresight-cti.c =>
> coresight-cti-core.c} (98%)
>> 
>> diff --git a/drivers/hwtracing/coresight/Kconfig
> b/drivers/hwtracing/coresight/Kconfig
>> index f31778dd0b5d..b04aae2ceecc 100644
>> --- a/drivers/hwtracing/coresight/Kconfig
>> +++ b/drivers/hwtracing/coresight/Kconfig
>> @@ -136,7 +136,7 @@ config CORESIGHT_CPU_DEBUG
>>           module will be called coresight-cpu-debug.
>> 
>>  config CORESIGHT_CTI
>> -       bool "CoreSight Cross Trigger Interface (CTI) driver"
>> +       tristate "CoreSight Cross Trigger Interface (CTI) driver"
>>         depends on ARM || ARM64
>>         help
>>           This driver provides support for CoreSight CTI and CTM
> components.
>> @@ -147,6 +147,9 @@ config CORESIGHT_CTI
>>           halt compared to disabling sources and sinks normally in
> driver
>>           software.
>> 
>> +         To compile this driver as a module, choose M here: the
>> +         module will be called coresight-cti.
>> +
>>  config CORESIGHT_CTI_INTEGRATION_REGS
>>         bool "Access CTI CoreSight Integration Registers"
>>         depends on CORESIGHT_CTI
>> diff --git a/drivers/hwtracing/coresight/Makefile
> b/drivers/hwtracing/coresight/Makefile
>> index 8a7d7ddcce24..c65a153b1e1b 100644
>> --- a/drivers/hwtracing/coresight/Makefile
>> +++ b/drivers/hwtracing/coresight/Makefile
>> @@ -18,6 +18,6 @@ coresight-etm4x-y := coresight-etm4x-core.o
> coresight-etm4x-sysfs.o
>>  obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o
>>  obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o
>>  obj-$(CONFIG_CORESIGHT_CATU) += coresight-catu.o
>> -obj-$(CONFIG_CORESIGHT_CTI) += coresight-cti.o \
>> -                               coresight-cti-platform.o \
>> +obj-$(CONFIG_CORESIGHT_CTI) += coresight-cti.o
>> +coresight-cti-y := coresight-cti-core.o        
>> coresight-cti-platform.o
> \
>>                                 coresight-cti-sysfs.o
>> diff --git a/drivers/hwtracing/coresight/coresight-cti.c
> b/drivers/hwtracing/coresight/coresight-cti-core.c
>> similarity index 98%
>> rename from drivers/hwtracing/coresight/coresight-cti.c
>> rename to drivers/hwtracing/coresight/coresight-cti-core.c
>> index 2829286daed9..b31839682c9e 100644
>> --- a/drivers/hwtracing/coresight/coresight-cti.c
>> +++ b/drivers/hwtracing/coresight/coresight-cti-core.c
>> @@ -618,6 +618,14 @@ 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);
>> +
>> +       coresight_unregister(drvdata->csdev);
>> +
>> +       return 0;
>> +}
>> 
>>  static int cti_probe(struct amba_device *adev, const struct amba_id
> *id)
>>  {
>> @@ -739,6 +747,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 = {
>> @@ -747,6 +756,7 @@ static struct amba_driver cti_driver = {
>>                 .suppress_bind_attrs = true,
>>         },
>>         .probe          = cti_probe,
>> +       .remove         = cti_remove,
>>         .id_table       = cti_ids,
>>  };
>> 
>> @@ -769,3 +779,7 @@ static void __exit cti_exit(void)
>> 
>>  module_init(cti_init);
>>  module_exit(cti_exit);
>> +
>> +MODULE_AUTHOR("Mike Leach <mike.leach@linaro.org>");
>> +MODULE_DESCRIPTION("Arm CoreSight Funnel Driver");
> 
> Cut and paste error here - this module it the CTI, not the funnel.
> 
> Regards
> 
> Mike
> 

Thanks for catching this Mike.  I'll fix it in next patch set.

Thanks,
Tingwei

>> +MODULE_LICENSE("GPL v2");
>> diff --git a/drivers/hwtracing/coresight/coresight-platform.c
> b/drivers/hwtracing/coresight/coresight-platform.c
>> index 43418a2126ff..44f24683f089 100644
>> --- a/drivers/hwtracing/coresight/coresight-platform.c
>> +++ b/drivers/hwtracing/coresight/coresight-platform.c
>> @@ -76,6 +76,7 @@ coresight_find_csdev_by_fwnode(struct fwnode_handle
> *r_fwnode)
>>         }
>>         return csdev;
>>  }
>> +EXPORT_SYMBOL_GPL(coresight_find_csdev_by_fwnode);
>> 
>>  #ifdef CONFIG_OF
>>  static inline bool of_coresight_legacy_ep_is_input(struct device_node
> *ep)
>> diff --git a/drivers/hwtracing/coresight/coresight.c
> b/drivers/hwtracing/coresight/coresight.c
>> index bf8c41901016..cf7079f4b99c 100644
>> --- a/drivers/hwtracing/coresight/coresight.c
>> +++ b/drivers/hwtracing/coresight/coresight.c
>> @@ -273,6 +273,7 @@ void coresight_set_assoc_ectdev_mutex(struct
> coresight_device *csdev,
>>         csdev->ect_dev = ect_csdev;
>>         mutex_unlock(&coresight_mutex);
>>  }
>> +EXPORT_SYMBOL_GPL(coresight_set_assoc_ectdev_mutex);
>> 
>>  static int coresight_enable_sink(struct coresight_device *csdev,
>>                                  u32 mode, void *data)
>> --
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
> Forum,
>> a Linux Foundation Collaborative Project
>> 
>> 
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel