From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D6EDC4727E for ; Wed, 23 Sep 2020 00:23:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B53492085B for ; Wed, 23 Sep 2020 00:23:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="pPLlCCLx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727068AbgIWAXY (ORCPT ); Tue, 22 Sep 2020 20:23:24 -0400 Received: from z5.mailgun.us ([104.130.96.5]:14081 "EHLO z5.mailgun.us" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727034AbgIWAXX (ORCPT ); Tue, 22 Sep 2020 20:23:23 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1600820602; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Cc: To: From: Date: Sender; bh=mQ0U9Uw4rabv6fVsy5OHo/pp4yJFu3/Nag2DHSBEkm4=; b=pPLlCCLx5cT4d5SAMsFyY4VeEwm4YnyJ1BS26DQ1oXoFWfBQ3FFLWvq2MpcOv1yCimhesP5F rIF3NX9kt32RNmOfOL3y+lhCborlL2lAxGvGWnTBsugxho0syTy/kFcH4D2abWgj6XjwJ4jH kOrIGLFBEpkmyyEkGHEz/3Q7PKM= X-Mailgun-Sending-Ip: 104.130.96.5 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n04.prod.us-west-2.postgun.com with SMTP id 5f6a957aefb844e00369c636 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Wed, 23 Sep 2020 00:23:22 GMT Sender: tingweiz=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id E9736C433FF; Wed, 23 Sep 2020 00:23:21 +0000 (UTC) Received: from codeaurora.org (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: tingwei) by smtp.codeaurora.org (Postfix) with ESMTPSA id 3E9D1C433C8; Wed, 23 Sep 2020 00:23:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3E9D1C433C8 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=tingweiz@codeaurora.org Date: Wed, 23 Sep 2020 08:23:05 +0800 From: Tingwei Zhang To: Mathieu Poirier Cc: Tingwei Zhang , Suzuki K Poulose , Alexander Shishkin , Mike Leach , Kim Phillips , Greg Kroah-Hartman , Leo Yan , Randy Dunlap , Russell King , Mian Yousaf Kaukab , tsoni@codeaurora.org, Sai Prakash Ranjan , Mao Jinlong , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v11 09/24] coresight: etm3x: allow etm3x to be built as a module Message-ID: <20200923002305.GA31116@codeaurora.org> References: <20200915104116.16789-1-tingwei@codeaurora.org> <20200915104116.16789-10-tingwei@codeaurora.org> <20200915180918.GA3665622@xps15> <20200922214208.GA933713@xps15> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200922214208.GA933713@xps15> User-Agent: Mutt/1.5.24 (2015-08-30) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 23, 2020 at 05:42:08AM +0800, Mathieu Poirier wrote: > On Tue, Sep 15, 2020 at 12:09:18PM -0600, Mathieu Poirier wrote: > > On Tue, Sep 15, 2020 at 06:41:01PM +0800, Tingwei Zhang wrote: > > > From: Kim Phillips > > > > > > 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 > > > - delay advertising the per-cpu etmdrvdata > > > - protect etmdrvdata[] by modifying it on relevant CPU > > > > > > Cc: Mathieu Poirier > > > Cc: Leo Yan > > > Cc: Alexander Shishkin > > > Cc: Randy Dunlap > > > Cc: Suzuki K Poulose > > > Cc: Greg Kroah-Hartman > > > Cc: Russell King > > > Signed-off-by: Kim Phillips > > > Signed-off-by: Tingwei Zhang > > > Reviewed-by: Mike Leach > > > --- > > > drivers/hwtracing/coresight/Kconfig | 5 +- > > > drivers/hwtracing/coresight/Makefile | 5 +- > > > ...resight-etm3x.c => coresight-etm3x-core.c} | 148 > ++++++++++++++---- > > > 3 files changed, 122 insertions(+), 36 deletions(-) > > > rename drivers/hwtracing/coresight/{coresight-etm3x.c => > coresight-etm3x-core.c} (90%) > > > > > I got tired of waiting for a V12 and Mike has based his work on complex > configuration on your patchset. So I did the corrections and applied > this set to my tree. With a little luck Greg won't mind the late > submission and > things will work out fine. > > You owe me a beer. If Greg accepts my pull request, you owe him one too. > > Mathieu > Really appreciated it, Mathieu. I definitely owe you and Greg one. I was waiting for other comments. Thanks Tingwei > > > diff --git a/drivers/hwtracing/coresight/Kconfig > b/drivers/hwtracing/coresight/Kconfig > > > index 6433f835fc97..8fd9fd139cf3 100644 > > > --- a/drivers/hwtracing/coresight/Kconfig > > > +++ b/drivers/hwtracing/coresight/Kconfig > > > @@ -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 > > > diff --git a/drivers/hwtracing/coresight/Makefile > b/drivers/hwtracing/coresight/Makefile > > > index 19497d1d92bf..86b4648844b4 100644 > > > --- a/drivers/hwtracing/coresight/Makefile > > > +++ b/drivers/hwtracing/coresight/Makefile > > > @@ -11,8 +11,9 @@ 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 \ > > > - coresight-etm3x-sysfs.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_STM) += coresight-stm.o > > > diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c > b/drivers/hwtracing/coresight/coresight-etm3x-core.c > > > similarity index 90% > > > rename from drivers/hwtracing/coresight/coresight-etm3x.c > > > rename to drivers/hwtracing/coresight/coresight-etm3x-core.c > > > index bf22dcfd3327..56eba0b5c71f 100644 > > > --- a/drivers/hwtracing/coresight/coresight-etm3x.c > > > +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c > > > @@ -782,6 +782,42 @@ static void etm_init_trace_id(struct etm_drvdata > *drvdata) > > > drvdata->traceid = coresight_get_trace_id(drvdata->cpu); > > > } > > > > > > +static int __init etm_hp_setup(void) > > > +{ > > > + int ret; > > > + > > > + ret = > cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ARM_CORESIGHT_STARTING, > > > + "arm/coresight:starting", > > > + etm_starting_cpu, > etm_dying_cpu); > > > > Indentation problem. > > > > > + > > > + if (ret) > > > + return ret; > > > + > > > + ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN, > > > + "arm/coresight:online", > > > + etm_online_cpu, NULL); > > > + > > > + /* HP dyn state ID returned in ret on success */ > > > + if (ret > 0) { > > > + hp_online = ret; > > > + return 0; > > > + } > > > + > > > + /* failed dyn state - remove others */ > > > + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); > > > + > > > + return ret; > > > +} > > > + > > > +static void etm_hp_clear(void) > > > +{ > > > + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); > > > + if (hp_online) { > > > + cpuhp_remove_state_nocalls(hp_online); > > > + hp_online = 0; > > > + } > > > +} > > > + > > > static int etm_probe(struct amba_device *adev, const struct amba_id > *id) > > > { > > > int ret; > > > @@ -824,38 +860,23 @@ static int etm_probe(struct amba_device *adev, > const struct amba_id *id) > > > return -ENOMEM; > > > > > > cpus_read_lock(); > > > > Locking is no longer needed. > > > > > - etmdrvdata[drvdata->cpu] = drvdata; > > > > > > if (smp_call_function_single(drvdata->cpu, > > > etm_init_arch_data, drvdata, 1)) > > > dev_err(dev, "ETM arch init failed\n"); > > > > > > - if (!etm_count++) { > > > - > cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ARM_CORESIGHT_STARTING, > > > - > "arm/coresight:starting", > > > - etm_starting_cpu, > etm_dying_cpu); > > > - ret = > cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN, > > > - > "arm/coresight:online", > > > - etm_online_cpu, > NULL); > > > - if (ret < 0) > > > - goto err_arch_supported; > > > - hp_online = ret; > > > - } > > > cpus_read_unlock(); > > > > > > - if (etm_arch_supported(drvdata->arch) == false) { > > > - ret = -EINVAL; > > > - goto err_arch_supported; > > > - } > > > + if (etm_arch_supported(drvdata->arch) == false) > > > + return -EINVAL; > > > > > > etm_init_trace_id(drvdata); > > > etm_set_default(&drvdata->config); > > > > > > pdata = coresight_get_platform_data(dev); > > > - if (IS_ERR(pdata)) { > > > - ret = PTR_ERR(pdata); > > > - goto err_arch_supported; > > > - } > > > + if (IS_ERR(pdata)) > > > + return PTR_ERR(pdata); > > > + > > > adev->dev.platform_data = pdata; > > > > > > desc.type = CORESIGHT_DEV_TYPE_SOURCE; > > > @@ -865,17 +886,17 @@ static int etm_probe(struct amba_device *adev, > const struct amba_id *id) > > > desc.dev = dev; > > > desc.groups = coresight_etm_groups; > > > drvdata->csdev = coresight_register(&desc); > > > - if (IS_ERR(drvdata->csdev)) { > > > - ret = PTR_ERR(drvdata->csdev); > > > - goto err_arch_supported; > > > - } > > > + if (IS_ERR(drvdata->csdev)) > > > + return PTR_ERR(drvdata->csdev); > > > > > > ret = etm_perf_symlink(drvdata->csdev, true); > > > if (ret) { > > > coresight_unregister(drvdata->csdev); > > > - goto err_arch_supported; > > > + return ret; > > > } > > > > > > + etmdrvdata[drvdata->cpu] = drvdata; > > > + > > > pm_runtime_put(&adev->dev); > > > dev_info(&drvdata->csdev->dev, > > > "%s initialized\n", (char *)coresight_get_uci_data(id)); > > > @@ -885,14 +906,40 @@ static int etm_probe(struct amba_device *adev, > const struct amba_id *id) > > > } > > > > > > return 0; > > > +} > > > > > > -err_arch_supported: > > > - if (--etm_count == 0) { > > > - > cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); > > > - if (hp_online) > > > - cpuhp_remove_state_nocalls(hp_online); > > > - } > > > - return ret; > > > +static void __exit clear_etmdrvdata(void *info) > > > +{ > > > + int cpu = *(int *)info; > > > + > > > + etmdrvdata[cpu] = NULL; > > > +} > > > + > > > +static int __exit etm_remove(struct amba_device *adev) > > > +{ > > > + struct etm_drvdata *drvdata = dev_get_drvdata(&adev->dev); > > > + > > > + etm_perf_symlink(drvdata->csdev, false); > > > + > > > + /* > > > + * Taking hotplug lock here to avoid racing between etm_remove and > > > + * CPU hotplug call backs. > > > + */ > > > + cpus_read_lock(); > > > + /* > > > + * The readers for etmdrvdata[] are CPU hotplug call backs > > > + * and PM notification call backs. Change etmdrvdata[i] on > > > + * CPU i ensures these call backs has consistent view > > > + * inside one call back function. > > > + */ > > > + if (smp_call_function_single(drvdata->cpu, clear_etmdrvdata, > &drvdata->cpu, 1)) > > > + etmdrvdata[drvdata->cpu] = NULL; > > > + > > > + cpus_read_unlock(); > > > + > > > + coresight_unregister(drvdata->csdev); > > > + > > > + return 0; > > > } > > > > > > #ifdef CONFIG_PM > > > @@ -937,6 +984,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 +994,39 @@ 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); > > > + > > > +static int __init etm_init(void) > > > +{ > > > + int ret; > > > + > > > + ret = etm_hp_setup(); > > > + > > > + /* etm_pm_setup() does its own cleanup - exit on error */ > > > > Copy/paste error --> s/etm_pm_setup/etm_hp_setup > > > > > + if (ret) > > > + return ret; > > > + > > > + ret = amba_driver_register(&etm_driver); > > > + if (ret) { > > > + pr_err("Error registering etm3x driver\n"); > > > + etm_hp_clear(); > > > + } > > > + > > > + return ret; > > > +} > > > + > > > +static void __exit etm_exit(void) > > > +{ > > > + amba_driver_unregister(&etm_driver); > > > + etm_hp_clear(); > > > +} > > > + > > > +module_init(etm_init); > > > +module_exit(etm_exit); > > > + > > > +MODULE_AUTHOR("Pratik Patel "); > > > +MODULE_AUTHOR("Mathieu Poirier "); > > > +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 mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29338C4727D for ; Wed, 23 Sep 2020 00:27:01 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C1D042085B for ; Wed, 23 Sep 2020 00:27:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OYA8ByZz"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="O7bSL6ri" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1D042085B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mBGpdXVU3TMTvwxBcIXOQLHoAWYJXCaV9kDh44HqrtM=; b=OYA8ByZzE2y5ytNDqLNlDqI1I bNJwDg8IrNAzC61Eqo/iim5nh637prHiozrzoook9cxVEfPRCNagtM1mmYKhzJQrttFUm13VPEuUT C2HoskJIZLUH0W9rtGniAjcmO2rKrn21gRdB9w2DQ7zTf5zGF5fu1zR/1VCW6Z5tNXqwHtgqJktQm kT+Spl6qHP4LCXwIM3Vy2qwZR1BQ2Q+5/ZKjwbmwgJLg7Y3E3/byWLLZBRIHTepzku23dw+VhiLY8 EhGS2FbPPq74B52qmWuvsBLYziSA6CGbBjuQ/1pM7CJ3skMEuVhaTRqI5RzFHqHS5HI88VbJkhoep tsG9hcNeA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKsb5-0003Oc-Kj; Wed, 23 Sep 2020 00:25:23 +0000 Received: from z5.mailgun.us ([104.130.96.5]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kKsay-0003Ny-06 for linux-arm-kernel@lists.infradead.org; Wed, 23 Sep 2020 00:25:21 +0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1600820720; h=In-Reply-To: Content-Type: MIME-Version: References: Message-ID: Subject: Cc: To: From: Date: Sender; bh=mQ0U9Uw4rabv6fVsy5OHo/pp4yJFu3/Nag2DHSBEkm4=; b=O7bSL6riEUoI9cZ/G25/DZj8iUEbrIQKmAlAToCV4qiDzY8zVz5RQOoKIwdyR6AVQEziTCyd X7t58g7n74mnnMr9fjNxtGZLa3XneKUB3wz3kV2zqRRUg2UH0cLIemydknHev8yPpTaHpJVB soxBGu38odLbH+sYYm/ZahI/r/U= X-Mailgun-Sending-Ip: 104.130.96.5 X-Mailgun-Sid: WyJiYzAxZiIsICJsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmciLCAiYmU5ZTRhIl0= Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n04.prod.us-east-1.postgun.com with SMTP id 5f6a957a3e7bfb5c37fd558b (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Wed, 23 Sep 2020 00:23:22 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id C3DC1C43385; Wed, 23 Sep 2020 00:23:21 +0000 (UTC) Received: from codeaurora.org (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: tingwei) by smtp.codeaurora.org (Postfix) with ESMTPSA id 3E9D1C433C8; Wed, 23 Sep 2020 00:23:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 3E9D1C433C8 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=tingweiz@codeaurora.org Date: Wed, 23 Sep 2020 08:23:05 +0800 From: Tingwei Zhang To: Mathieu Poirier Subject: Re: [PATCH v11 09/24] coresight: etm3x: allow etm3x to be built as a module Message-ID: <20200923002305.GA31116@codeaurora.org> References: <20200915104116.16789-1-tingwei@codeaurora.org> <20200915104116.16789-10-tingwei@codeaurora.org> <20200915180918.GA3665622@xps15> <20200922214208.GA933713@xps15> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200922214208.GA933713@xps15> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200922_202520_712917_47310794 X-CRM114-Status: GOOD ( 41.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tsoni@codeaurora.org, Sai Prakash Ranjan , Kim Phillips , Mao Jinlong , Suzuki K Poulose , Alexander Shishkin , Greg Kroah-Hartman , coresight@lists.linaro.org, Randy Dunlap , Mian Yousaf Kaukab , Russell King , linux-kernel@vger.kernel.org, Tingwei Zhang , Leo Yan , linux-arm-kernel@lists.infradead.org, Mike Leach Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, Sep 23, 2020 at 05:42:08AM +0800, Mathieu Poirier wrote: > On Tue, Sep 15, 2020 at 12:09:18PM -0600, Mathieu Poirier wrote: > > On Tue, Sep 15, 2020 at 06:41:01PM +0800, Tingwei Zhang wrote: > > > From: Kim Phillips > > > > > > 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 > > > - delay advertising the per-cpu etmdrvdata > > > - protect etmdrvdata[] by modifying it on relevant CPU > > > > > > Cc: Mathieu Poirier > > > Cc: Leo Yan > > > Cc: Alexander Shishkin > > > Cc: Randy Dunlap > > > Cc: Suzuki K Poulose > > > Cc: Greg Kroah-Hartman > > > Cc: Russell King > > > Signed-off-by: Kim Phillips > > > Signed-off-by: Tingwei Zhang > > > Reviewed-by: Mike Leach > > > --- > > > drivers/hwtracing/coresight/Kconfig | 5 +- > > > drivers/hwtracing/coresight/Makefile | 5 +- > > > ...resight-etm3x.c => coresight-etm3x-core.c} | 148 > ++++++++++++++---- > > > 3 files changed, 122 insertions(+), 36 deletions(-) > > > rename drivers/hwtracing/coresight/{coresight-etm3x.c => > coresight-etm3x-core.c} (90%) > > > > > I got tired of waiting for a V12 and Mike has based his work on complex > configuration on your patchset. So I did the corrections and applied > this set to my tree. With a little luck Greg won't mind the late > submission and > things will work out fine. > > You owe me a beer. If Greg accepts my pull request, you owe him one too. > > Mathieu > Really appreciated it, Mathieu. I definitely owe you and Greg one. I was waiting for other comments. Thanks Tingwei > > > diff --git a/drivers/hwtracing/coresight/Kconfig > b/drivers/hwtracing/coresight/Kconfig > > > index 6433f835fc97..8fd9fd139cf3 100644 > > > --- a/drivers/hwtracing/coresight/Kconfig > > > +++ b/drivers/hwtracing/coresight/Kconfig > > > @@ -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 > > > diff --git a/drivers/hwtracing/coresight/Makefile > b/drivers/hwtracing/coresight/Makefile > > > index 19497d1d92bf..86b4648844b4 100644 > > > --- a/drivers/hwtracing/coresight/Makefile > > > +++ b/drivers/hwtracing/coresight/Makefile > > > @@ -11,8 +11,9 @@ 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 \ > > > - coresight-etm3x-sysfs.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_STM) += coresight-stm.o > > > diff --git a/drivers/hwtracing/coresight/coresight-etm3x.c > b/drivers/hwtracing/coresight/coresight-etm3x-core.c > > > similarity index 90% > > > rename from drivers/hwtracing/coresight/coresight-etm3x.c > > > rename to drivers/hwtracing/coresight/coresight-etm3x-core.c > > > index bf22dcfd3327..56eba0b5c71f 100644 > > > --- a/drivers/hwtracing/coresight/coresight-etm3x.c > > > +++ b/drivers/hwtracing/coresight/coresight-etm3x-core.c > > > @@ -782,6 +782,42 @@ static void etm_init_trace_id(struct etm_drvdata > *drvdata) > > > drvdata->traceid = coresight_get_trace_id(drvdata->cpu); > > > } > > > > > > +static int __init etm_hp_setup(void) > > > +{ > > > + int ret; > > > + > > > + ret = > cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ARM_CORESIGHT_STARTING, > > > + "arm/coresight:starting", > > > + etm_starting_cpu, > etm_dying_cpu); > > > > Indentation problem. > > > > > + > > > + if (ret) > > > + return ret; > > > + > > > + ret = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN, > > > + "arm/coresight:online", > > > + etm_online_cpu, NULL); > > > + > > > + /* HP dyn state ID returned in ret on success */ > > > + if (ret > 0) { > > > + hp_online = ret; > > > + return 0; > > > + } > > > + > > > + /* failed dyn state - remove others */ > > > + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); > > > + > > > + return ret; > > > +} > > > + > > > +static void etm_hp_clear(void) > > > +{ > > > + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); > > > + if (hp_online) { > > > + cpuhp_remove_state_nocalls(hp_online); > > > + hp_online = 0; > > > + } > > > +} > > > + > > > static int etm_probe(struct amba_device *adev, const struct amba_id > *id) > > > { > > > int ret; > > > @@ -824,38 +860,23 @@ static int etm_probe(struct amba_device *adev, > const struct amba_id *id) > > > return -ENOMEM; > > > > > > cpus_read_lock(); > > > > Locking is no longer needed. > > > > > - etmdrvdata[drvdata->cpu] = drvdata; > > > > > > if (smp_call_function_single(drvdata->cpu, > > > etm_init_arch_data, drvdata, 1)) > > > dev_err(dev, "ETM arch init failed\n"); > > > > > > - if (!etm_count++) { > > > - > cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ARM_CORESIGHT_STARTING, > > > - > "arm/coresight:starting", > > > - etm_starting_cpu, > etm_dying_cpu); > > > - ret = > cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN, > > > - > "arm/coresight:online", > > > - etm_online_cpu, > NULL); > > > - if (ret < 0) > > > - goto err_arch_supported; > > > - hp_online = ret; > > > - } > > > cpus_read_unlock(); > > > > > > - if (etm_arch_supported(drvdata->arch) == false) { > > > - ret = -EINVAL; > > > - goto err_arch_supported; > > > - } > > > + if (etm_arch_supported(drvdata->arch) == false) > > > + return -EINVAL; > > > > > > etm_init_trace_id(drvdata); > > > etm_set_default(&drvdata->config); > > > > > > pdata = coresight_get_platform_data(dev); > > > - if (IS_ERR(pdata)) { > > > - ret = PTR_ERR(pdata); > > > - goto err_arch_supported; > > > - } > > > + if (IS_ERR(pdata)) > > > + return PTR_ERR(pdata); > > > + > > > adev->dev.platform_data = pdata; > > > > > > desc.type = CORESIGHT_DEV_TYPE_SOURCE; > > > @@ -865,17 +886,17 @@ static int etm_probe(struct amba_device *adev, > const struct amba_id *id) > > > desc.dev = dev; > > > desc.groups = coresight_etm_groups; > > > drvdata->csdev = coresight_register(&desc); > > > - if (IS_ERR(drvdata->csdev)) { > > > - ret = PTR_ERR(drvdata->csdev); > > > - goto err_arch_supported; > > > - } > > > + if (IS_ERR(drvdata->csdev)) > > > + return PTR_ERR(drvdata->csdev); > > > > > > ret = etm_perf_symlink(drvdata->csdev, true); > > > if (ret) { > > > coresight_unregister(drvdata->csdev); > > > - goto err_arch_supported; > > > + return ret; > > > } > > > > > > + etmdrvdata[drvdata->cpu] = drvdata; > > > + > > > pm_runtime_put(&adev->dev); > > > dev_info(&drvdata->csdev->dev, > > > "%s initialized\n", (char *)coresight_get_uci_data(id)); > > > @@ -885,14 +906,40 @@ static int etm_probe(struct amba_device *adev, > const struct amba_id *id) > > > } > > > > > > return 0; > > > +} > > > > > > -err_arch_supported: > > > - if (--etm_count == 0) { > > > - > cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); > > > - if (hp_online) > > > - cpuhp_remove_state_nocalls(hp_online); > > > - } > > > - return ret; > > > +static void __exit clear_etmdrvdata(void *info) > > > +{ > > > + int cpu = *(int *)info; > > > + > > > + etmdrvdata[cpu] = NULL; > > > +} > > > + > > > +static int __exit etm_remove(struct amba_device *adev) > > > +{ > > > + struct etm_drvdata *drvdata = dev_get_drvdata(&adev->dev); > > > + > > > + etm_perf_symlink(drvdata->csdev, false); > > > + > > > + /* > > > + * Taking hotplug lock here to avoid racing between etm_remove and > > > + * CPU hotplug call backs. > > > + */ > > > + cpus_read_lock(); > > > + /* > > > + * The readers for etmdrvdata[] are CPU hotplug call backs > > > + * and PM notification call backs. Change etmdrvdata[i] on > > > + * CPU i ensures these call backs has consistent view > > > + * inside one call back function. > > > + */ > > > + if (smp_call_function_single(drvdata->cpu, clear_etmdrvdata, > &drvdata->cpu, 1)) > > > + etmdrvdata[drvdata->cpu] = NULL; > > > + > > > + cpus_read_unlock(); > > > + > > > + coresight_unregister(drvdata->csdev); > > > + > > > + return 0; > > > } > > > > > > #ifdef CONFIG_PM > > > @@ -937,6 +984,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 +994,39 @@ 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); > > > + > > > +static int __init etm_init(void) > > > +{ > > > + int ret; > > > + > > > + ret = etm_hp_setup(); > > > + > > > + /* etm_pm_setup() does its own cleanup - exit on error */ > > > > Copy/paste error --> s/etm_pm_setup/etm_hp_setup > > > > > + if (ret) > > > + return ret; > > > + > > > + ret = amba_driver_register(&etm_driver); > > > + if (ret) { > > > + pr_err("Error registering etm3x driver\n"); > > > + etm_hp_clear(); > > > + } > > > + > > > + return ret; > > > +} > > > + > > > +static void __exit etm_exit(void) > > > +{ > > > + amba_driver_unregister(&etm_driver); > > > + etm_hp_clear(); > > > +} > > > + > > > +module_init(etm_init); > > > +module_exit(etm_exit); > > > + > > > +MODULE_AUTHOR("Pratik Patel "); > > > +MODULE_AUTHOR("Mathieu Poirier "); > > > +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 > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel