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=-10.0 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 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 C5548C433DF for ; Thu, 13 Aug 2020 19:42:35 +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 8733320791 for ; Thu, 13 Aug 2020 19:42:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2Ijg/nuo"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="dfa/za1G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8733320791 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.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=HDlr1ZNHseRY4O7Wr8Mox/s2RHbxn7iyFBG6KYrmPCs=; b=2Ijg/nuoehwlfC6zA6c8+rx0r 9760bHZUGNjienq4Ekn/SKc8nf1QSJxN0Ko4Vqzj9O6LBIhTXyTJYAAZ9aimsldoOd9KpBs4PRVC7 cdj7OMAdIlfNi815aDFnpDJMr52AQtPORBREEeA7CtMSuNEMpGTRLdM858XDLEtshtCQgtjkQvWaz fNpCEjPAZgu2ExNPUsSK2XoYqQeSrDFLPuNZ/sXt4JE0YPgLIlgR4jDvxE/fh1EYLPY5SWEKs81qf AzoND0ErIwUJDIAM4Mh/hfM8sKhfeJj7Aw6awe4dyMyZ/b5aSj7hbfEhEeBPRZpPVU9x2calDYdW9 CtOPmDpVQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6J61-0007LF-VY; Thu, 13 Aug 2020 19:41:06 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k6J5y-0007KN-O7 for linux-arm-kernel@lists.infradead.org; Thu, 13 Aug 2020 19:41:04 +0000 Received: by mail-pg1-x543.google.com with SMTP id 128so3334617pgd.5 for ; Thu, 13 Aug 2020 12:41:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=RDrhSXbElQ+1LVHqvs6mp9FDXB+WRAbJ/Df6q4oJJhs=; b=dfa/za1GBD9rgIdHtMbz70co6+JsjhmDRE1PZQ9LB2kFAgvVPRiLBoqcjl4veNtFE9 6T1c2vA4ezg3Kek30N2+u9HTu97/qMi5cWSBzu6XipEYGwAzDXzelJzsXlj23LNE749q RC8WBAoFnNlB0qnRW0zTDKlJUS/RTfiPqXdZZk2awiiP8kUkl6uj4rfZpiEP2LmYjjzL GbxIdyX8TdMQZ4J6Ea0uYOOSRzGG8FD9vM6sW24R5DiutdkykSgUVlFFpBg6uDyTKl7K f9gq3obaqGT02gZJF3nM4TWbnSTQdVC7McoUxeOl48iY27H0yXIBFCFOOBRc1Cpprl0l Kpbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=RDrhSXbElQ+1LVHqvs6mp9FDXB+WRAbJ/Df6q4oJJhs=; b=pAAfFv/rRxESkrAuBtXKiihX4swFHautL2tgkAQf6sBhgwxHIdyfPy65XUQNXCEtAa 2TeRzuq2OlIf9/Y4szDGIICQVLly0HWZ0IT8Wpyi7jolIOtM1ljf0IHFIz7fARCSm7jz yKnaeIoikIpsircnOeYDJKZGAQSwSQoywmsiuR/Gh3xEH+7QXBcqLj2idbjJSUGGCBKz 5XRxUJayzprfBJMUzIpL2Y2NQtT7Q/e4DveZlDJxV5egQj85CERH7zj96UJVpHAYOeAw 3RNGN4xc6+axOzUbG1v/7T5ZAvH2FEBRpB4L0MCde4BxoLBoEOeV6cQ+Gkz1+TQrrKq7 o2wA== X-Gm-Message-State: AOAM531aanj3otVFt7nLeYY/mmfvmlMKf0SK3RdAh0/etqXZeWRvKAqy /3HnEiCt40dW/OPygl3m1jCb+Q== X-Google-Smtp-Source: ABdhPJzy+Peu3Sn0xyU8BkwOTX0TF5SM1yDldwq06KvA5XvEGLs91ro6CkrTpVXI/9rJQp5H1Nq5PQ== X-Received: by 2002:a65:6087:: with SMTP id t7mr5274182pgu.453.1597347660461; Thu, 13 Aug 2020 12:41:00 -0700 (PDT) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id b63sm6663291pfg.43.2020.08.13.12.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Aug 2020 12:40:59 -0700 (PDT) Date: Thu, 13 Aug 2020 13:40:57 -0600 From: Mathieu Poirier To: Tingwei Zhang Subject: Re: [PATCH v8 10/24] coresight: etm4x: allow etm4x to be built as a module Message-ID: <20200813194057.GI3393195@xps15> References: <20200807111153.7784-1-tingwei@codeaurora.org> <20200807111153.7784-11-tingwei@codeaurora.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200807111153.7784-11-tingwei@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200813_154103_127138_D41DA134 X-CRM114-Status: GOOD ( 36.06 ) 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 , 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 Fri, Aug 07, 2020 at 07:11:39PM +0800, Tingwei Zhang wrote: > From: Kim Phillips > > 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 > - protect etmdrvdata[] with mutex lock from racing > between module unload and CPU hotplug > > 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 > Tested-by: Mike Leach > --- > drivers/hwtracing/coresight/Kconfig | 5 +- > drivers/hwtracing/coresight/Makefile | 4 +- > ...resight-etm4x.c => coresight-etm4x-core.c} | 118 +++++++++++++----- > 3 files changed, 92 insertions(+), 35 deletions(-) > rename drivers/hwtracing/coresight/{coresight-etm4x.c => coresight-etm4x-core.c} (95%) > > diff --git a/drivers/hwtracing/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig > index 8fd9fd139cf3..d6e107bbd30b 100644 > --- a/drivers/hwtracing/coresight/Kconfig > +++ b/drivers/hwtracing/coresight/Kconfig > @@ -78,7 +78,7 @@ config CORESIGHT_SOURCE_ETM3X > module will be called coresight-etm3x. > > config CORESIGHT_SOURCE_ETM4X > - bool "CoreSight Embedded Trace Macrocell 4.x driver" > + tristate "CoreSight Embedded Trace Macrocell 4.x driver" > depends on ARM64 > select CORESIGHT_LINKS_AND_SINKS > select PID_IN_CONTEXTIDR > @@ -88,6 +88,9 @@ config CORESIGHT_SOURCE_ETM4X > for instruction level tracing. Depending on the implemented version > data tracing may also be available. > > + To compile this driver as a module, choose M here: the > + module will be called coresight-etm4x. > + > config CORESIGHT_STM > tristate "CoreSight System Trace Macrocell driver" > depends on (ARM && !(CPU_32v3 || CPU_32v4 || CPU_32v4T)) || ARM64 > diff --git a/drivers/hwtracing/coresight/Makefile b/drivers/hwtracing/coresight/Makefile > index d619cfd0abd8..271dc255454f 100644 > --- a/drivers/hwtracing/coresight/Makefile > +++ b/drivers/hwtracing/coresight/Makefile > @@ -14,8 +14,8 @@ obj-$(CONFIG_CORESIGHT_LINKS_AND_SINKS) += coresight-funnel.o \ > obj-$(CONFIG_CORESIGHT_SOURCE_ETM3X) += coresight-etm3x.o > coresight-etm3x-y := coresight-etm3x-core.o coresight-etm-cp14.o \ > coresight-etm3x-sysfs.o > -obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o \ > - coresight-etm4x-sysfs.o > +obj-$(CONFIG_CORESIGHT_SOURCE_ETM4X) += coresight-etm4x.o > +coresight-etm4x-y := coresight-etm4x-core.o coresight-etm4x-sysfs.o > obj-$(CONFIG_CORESIGHT_STM) += coresight-stm.o > obj-$(CONFIG_CORESIGHT_CPU_DEBUG) += coresight-cpu-debug.o > obj-$(CONFIG_CORESIGHT_CATU) += coresight-catu.o > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > similarity index 95% > rename from drivers/hwtracing/coresight/coresight-etm4x.c > rename to drivers/hwtracing/coresight/coresight-etm4x-core.c > index fddfd93b9a7b..ae9847e194a3 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -48,6 +48,7 @@ module_param(pm_save_enable, int, 0444); > MODULE_PARM_DESC(pm_save_enable, > "Save/restore state on power down: 1 = never, 2 = self-hosted"); > > +static DEFINE_PER_CPU(struct mutex, etmdrvdata_lock); > static struct etmv4_drvdata *etmdrvdata[NR_CPUS]; > static void etm4_set_default_config(struct etmv4_config *config); > static int etm4_set_event_filters(struct etmv4_drvdata *drvdata, > @@ -1089,18 +1090,25 @@ void etm4_config_trace_mode(struct etmv4_config *config) > > static int etm4_online_cpu(unsigned int cpu) > { > - if (!etmdrvdata[cpu]) > + mutex_lock(&per_cpu(etmdrvdata_lock, cpu)); > + if (!etmdrvdata[cpu]) { > + mutex_unlock(&per_cpu(etmdrvdata_lock, cpu)); > return 0; > + } > > if (etmdrvdata[cpu]->boot_enable && !etmdrvdata[cpu]->sticky_enable) > coresight_enable(etmdrvdata[cpu]->csdev); > + mutex_unlock(&per_cpu(etmdrvdata_lock, cpu)); > return 0; > } > > static int etm4_starting_cpu(unsigned int cpu) > { > - if (!etmdrvdata[cpu]) > + mutex_lock(&per_cpu(etmdrvdata_lock, cpu)); > + if (!etmdrvdata[cpu]) { > + mutex_unlock(&per_cpu(etmdrvdata_lock, cpu)); > return 0; > + } > > spin_lock(&etmdrvdata[cpu]->spinlock); > if (!etmdrvdata[cpu]->os_unlock) > @@ -1109,18 +1117,23 @@ static int etm4_starting_cpu(unsigned int cpu) > if (local_read(&etmdrvdata[cpu]->mode)) > etm4_enable_hw(etmdrvdata[cpu]); > spin_unlock(&etmdrvdata[cpu]->spinlock); > + mutex_unlock(&per_cpu(etmdrvdata_lock, cpu)); > return 0; > } > > static int etm4_dying_cpu(unsigned int cpu) > { > - if (!etmdrvdata[cpu]) > + mutex_lock(&per_cpu(etmdrvdata_lock, cpu)); > + if (!etmdrvdata[cpu]) { > + mutex_unlock(&per_cpu(etmdrvdata_lock, cpu)); > return 0; > + } > > spin_lock(&etmdrvdata[cpu]->spinlock); > if (local_read(&etmdrvdata[cpu]->mode)) > etm4_disable_hw(etmdrvdata[cpu]); > spin_unlock(&etmdrvdata[cpu]->spinlock); > + mutex_unlock(&per_cpu(etmdrvdata_lock, cpu)); > return 0; > } > > @@ -1360,24 +1373,30 @@ static int etm4_cpu_pm_notify(struct notifier_block *nb, unsigned long cmd, > { > struct etmv4_drvdata *drvdata; > unsigned int cpu = smp_processor_id(); > + int ret = NOTIFY_OK; > > + mutex_lock(&per_cpu(etmdrvdata_lock, cpu)); > if (!etmdrvdata[cpu]) > - return NOTIFY_OK; > + goto out; > > drvdata = etmdrvdata[cpu]; > > if (!drvdata->save_state) > - return NOTIFY_OK; > + goto out; > > - if (WARN_ON_ONCE(drvdata->cpu != cpu)) > - return NOTIFY_BAD; > + if (WARN_ON_ONCE(drvdata->cpu != cpu)) { > + ret = NOTIFY_BAD; > + goto out; > + } > > switch (cmd) { > case CPU_PM_ENTER: > /* save the state if self-hosted coresight is in use */ > if (local_read(&drvdata->mode)) > - if (etm4_cpu_save(drvdata)) > - return NOTIFY_BAD; > + if (etm4_cpu_save(drvdata)) { > + ret = NOTIFY_BAD; > + goto out; > + } > break; > case CPU_PM_EXIT: > /* fallthrough */ > @@ -1386,10 +1405,12 @@ static int etm4_cpu_pm_notify(struct notifier_block *nb, unsigned long cmd, > etm4_cpu_restore(drvdata); > break; > default: > - return NOTIFY_DONE; > + goto out; > } > > - return NOTIFY_OK; > +out: > + mutex_unlock(&per_cpu(etmdrvdata_lock, cpu)); > + return ret; > } > > static struct notifier_block etm4_cpu_pm_nb = { > @@ -1430,7 +1451,7 @@ static int __init etm4_pm_setup(void) > return ret; > } > > -static void __init etm4_pm_clear(void) > +static void etm4_pm_clear(void) > { > cpu_pm_unregister_notifier(&etm4_cpu_pm_nb); > cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_STARTING); > @@ -1487,25 +1508,20 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > if (!desc.name) > return -ENOMEM; > > - etmdrvdata[drvdata->cpu] = drvdata; > - > if (smp_call_function_single(drvdata->cpu, > etm4_init_arch_data, drvdata, 1)) > dev_err(dev, "ETM arch init failed\n"); > > - if (etm4_arch_supported(drvdata->arch) == false) { > - ret = -EINVAL; > - goto err_arch_supported; > - } > + if (etm4_arch_supported(drvdata->arch) == false) > + return -EINVAL; > > etm4_init_trace_id(drvdata); > etm4_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; > @@ -1515,17 +1531,19 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > desc.dev = dev; > desc.groups = coresight_etmv4_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; > } > > + mutex_lock(&per_cpu(etmdrvdata_lock, drvdata->cpu)); > + etmdrvdata[drvdata->cpu] = drvdata; > + mutex_unlock(&per_cpu(etmdrvdata_lock, drvdata->cpu)); > + > pm_runtime_put(&adev->dev); > dev_info(&drvdata->csdev->dev, "CPU%d: ETM v%d.%d initialized\n", > drvdata->cpu, drvdata->arch >> 4, drvdata->arch & 0xf); > @@ -1536,10 +1554,6 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > } > > return 0; > - > -err_arch_supported: > - etmdrvdata[drvdata->cpu] = NULL; > - return ret; > } > > static struct amba_cs_uci_id uci_id_etm4[] = { > @@ -1551,6 +1565,22 @@ 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); > + > + mutex_lock(&per_cpu(etmdrvdata_lock, drvdata->cpu)); > + etmdrvdata[drvdata->cpu] = NULL; > + mutex_unlock(&per_cpu(etmdrvdata_lock, drvdata->cpu)); > + > + 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 */ > @@ -1568,18 +1598,26 @@ 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, > }; > > static int __init etm4x_init(void) > { > int ret; > + int cpu; > + > + for_each_possible_cpu(cpu) > + mutex_init(&per_cpu(etmdrvdata_lock, cpu)); > > ret = etm4_pm_setup(); > > @@ -1595,4 +1633,20 @@ static int __init etm4x_init(void) > > return ret; > } > -device_initcall(etm4x_init); > + > +static void __exit etm4x_exit(void) > +{ > + int cpu; > + > + amba_driver_unregister(&etm4x_driver); > + etm4_pm_clear(); > + for_each_possible_cpu(cpu) > + mutex_destroy(&per_cpu(etmdrvdata_lock, cpu)); > +} > +module_init(etm4x_init); > +module_exit(etm4x_exit); > + > +MODULE_AUTHOR("Pratik Patel "); > +MODULE_AUTHOR("Mathieu Poirier "); > +MODULE_DESCRIPTION("Arm CoreSight Program Flow Trace v4 driver"); ... And this should be "Arm CoreSight Embedded Trace Macrocell 4.x 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