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=-14.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 61F46C433DB for ; Fri, 8 Jan 2021 00:41:19 +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 16E3D23447 for ; Fri, 8 Jan 2021 00:41:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 16E3D23447 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=mFJTRkA2iGgcAD/ceTgqX1cv9++Ye19OnMFwgevFOOI=; b=ZA2caE3cMrlRYFLwwR7Lb2wOL ITtKd0wWA7UaUXFt8Rz62JP+qalv19FPFj5FZ5QmMQ9BioIiPOQ3G9GzMtBj5EQNlt6BPJ1YzEicO wyPo3qif/EDFQdb+z338TCU4fvNy5TRIZkqWstVM9FY97X7MIIggTpz+K66SUU2RdTncvEJ+b8B9A JC3ctGyTKqK32rQW6jTYQA9aqg+WJHsC0GU/Xp6UGCJDtXc4BQIaO4tmkAt6akxPujHkCszAN/Zh2 Hb0PkUIqAweQ8iWdq9DjY2vHUisxx0yiu7zQyt/5aHaibon7R+9K4vM0KRxvkLgITDCfsku7xFTDE nytnrQQNg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxfna-0004PV-EI; Fri, 08 Jan 2021 00:38:38 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxfnX-0004PB-L5 for linux-arm-kernel@lists.infradead.org; Fri, 08 Jan 2021 00:38:36 +0000 Received: by mail-pj1-x1036.google.com with SMTP id m5so5184986pjv.5 for ; Thu, 07 Jan 2021 16:38:35 -0800 (PST) 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=7BrDWbaU7M4IhUHiUIN+sg1lcJNZeyjj5w02xt93uGA=; b=Trk5fD3NRVR2qXCdhNpKefNa/+fNCT6AjXKcPxxrAhCK+JNsuZvn/3cwqrnHER4bDH pfH/49pemwGqlqydQ+a5DLvbmb2+UezOnK+mWKXNMlTGEiVFRC+mVInAYlNSmchyphbu uHHCVHS63c6AnACPie79x6iFuMhuKU4s5KPYsgaDZpVe3/Y3xIjd13ak7O0/PLBuLFik SUcokOE4OQnhwe7vX8ab1Qptb3pE80kssCsbGvGQc0N8cLZ7NWi3p9l9IkYemYQoYUmW +nHVoKEK8Cqd4CvWR1ECugYshHsxbD+ZM4JGdlX04YlG+g3Ry0t5/UMoCGpTmFdTxZU6 ZT0A== 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=7BrDWbaU7M4IhUHiUIN+sg1lcJNZeyjj5w02xt93uGA=; b=Kacuvgg9DX8CvJrcN6uX7wbKNzoVBDF7dbs26xaixZYtEIpzbUl1PopXkjcDAIzfhj EWLfkzxn7RsKiQwcF/U2zLuNGs7NPKP+T1QG8ohzmy/cz8THD8Gr+hGjMOAVjOIp4RAR mwwSfWEPHzoSF9111cFuGMS9h2nxLvpTyMBbrgwhA0lSfavMNSMB7PTXfcGY5BUPVHSc 4m4b9KCkjmTL6nylVQpUEcgUYQKMlJptopLJIa1EPCKN9kUY6NiBRfmtKMr8wLCmB+jx +9AtnUauxyqT3dfRy5Ncq7s1sNnd9boQreLaJZlWTyARrPxYKz44KwMu9NLcDHL8F56O KvKw== X-Gm-Message-State: AOAM532AZKVleqJgpt+wzHzgBBci8eS5bWSSJxNOTq9956QZ7uVQYyNJ 8B4qKtdTHQFhlh51MkD1xrBBuw== X-Google-Smtp-Source: ABdhPJzlWIeRCrwrXupNXnaC1pGPC/d3pHGqLYUDlIPNxw5lg90Lw0tdpsJD15rGK07yKIRDim4auA== X-Received: by 2002:a17:902:b717:b029:dc:3e69:6dd5 with SMTP id d23-20020a170902b717b02900dc3e696dd5mr1304505pls.70.1610066311330; Thu, 07 Jan 2021 16:38:31 -0800 (PST) Received: from xps15 (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id w63sm6676089pfc.20.2021.01.07.16.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 16:38:30 -0800 (PST) Date: Thu, 7 Jan 2021 17:38:28 -0700 From: Mathieu Poirier To: Suzuki K Poulose Subject: Re: [PATCH v6 21/26] coresight: etm4x: Refactor probing routine Message-ID: <20210108003828.GE43045@xps15> References: <20210107123859.674252-1-suzuki.poulose@arm.com> <20210107123859.674252-22-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210107123859.674252-22-suzuki.poulose@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210107_193835_799815_C5F05D8A X-CRM114-Status: GOOD ( 25.28 ) 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: anshuman.khandual@arm.com, coresight@lists.linaro.org, linux-kernel@vger.kernel.org, leo.yan@linaro.org, linux-arm-kernel@lists.infradead.org, mike.leach@linaro.org 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 Thu, Jan 07, 2021 at 12:38:54PM +0000, Suzuki K Poulose wrote: > CoreSight ETM with system register access may not have a > memory mapped i/o access. Refactor the ETM specific probing > into a common routine to allow reusing the code for such ETMs. > > Cc: Mike Leach > Reviewed-by: Mathieu Poirier In V5 you told me to review this again... I just did so at my tag stand. > Signed-off-by: Suzuki K Poulose > --- > Changes since v4: > - Refactor the "remove" callback for AMBA driver, for reuse by > platform_driver to follow > --- > .../coresight/coresight-etm4x-core.c | 62 ++++++++++++------- > 1 file changed, 39 insertions(+), 23 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index f5bbb6131d77..228845f6fdd8 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -1708,14 +1708,11 @@ static void etm4_pm_clear(void) > } > } > > -static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > +static int etm4_probe(struct device *dev, void __iomem *base, u32 etm_pid) > { > int ret; > - void __iomem *base; > - struct device *dev = &adev->dev; > struct coresight_platform_data *pdata = NULL; > struct etmv4_drvdata *drvdata; > - struct resource *res = &adev->res; > struct coresight_desc desc = { 0 }; > struct etm4_init_arg init_arg = { 0 }; > > @@ -1739,11 +1736,6 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > if (fwnode_property_present(dev_fwnode(dev), "qcom,skip-power-up")) > drvdata->skip_power_up = true; > > - /* Validity for the resource is already checked by the AMBA core */ > - base = devm_ioremap_resource(dev, res); > - if (IS_ERR(base)) > - return PTR_ERR(base); > - > drvdata->base = base; > > spin_lock_init(&drvdata->spinlock); > @@ -1773,7 +1765,7 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > if (IS_ERR(pdata)) > return PTR_ERR(pdata); > > - adev->dev.platform_data = pdata; > + dev->platform_data = pdata; > > desc.type = CORESIGHT_DEV_TYPE_SOURCE; > desc.subtype.source_subtype = CORESIGHT_DEV_SUBTYPE_SOURCE_PROC; > @@ -1793,7 +1785,6 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > > etmdrvdata[drvdata->cpu] = drvdata; > > - pm_runtime_put(&adev->dev); > dev_info(&drvdata->csdev->dev, "CPU%d: ETM v%d.%d initialized\n", > drvdata->cpu, ETM_ARCH_MAJOR_VERSION(drvdata->arch), > ETM_ARCH_MINOR_VERSION(drvdata->arch)); > @@ -1803,11 +1794,30 @@ static int etm4_probe(struct amba_device *adev, const struct amba_id *id) > drvdata->boot_enable = true; > } > > - etm4_check_arch_features(drvdata, id->id); > + etm4_check_arch_features(drvdata, etm_pid); > > return 0; > } > > +static int etm4_probe_amba(struct amba_device *adev, const struct amba_id *id) > +{ > + void __iomem *base; > + struct device *dev = &adev->dev; > + struct resource *res = &adev->res; > + int ret; > + > + /* Validity for the resource is already checked by the AMBA core */ > + base = devm_ioremap_resource(dev, res); > + if (IS_ERR(base)) > + return PTR_ERR(base); > + > + ret = etm4_probe(dev, base, id->id); > + if (!ret) > + pm_runtime_put(&adev->dev); > + > + return ret; > +} > + > static struct amba_cs_uci_id uci_id_etm4[] = { > { > /* ETMv4 UCI data */ > @@ -1824,15 +1834,12 @@ static void clear_etmdrvdata(void *info) > etmdrvdata[cpu] = NULL; > } > > -static int etm4_remove(struct amba_device *adev) > +static int __exit etm4_remove_dev(struct etmv4_drvdata *drvdata) > { > - struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev); > - > etm_perf_symlink(drvdata->csdev, false); > - > /* > - * Taking hotplug lock here to avoid racing between etm4_remove and > - * CPU hotplug call backs. > + * Taking hotplug lock here to avoid racing between etm4_remove_dev() > + * and CPU hotplug call backs. > */ > cpus_read_lock(); > /* > @@ -1851,6 +1858,15 @@ static int etm4_remove(struct amba_device *adev) > return 0; > } > > +static int __exit etm4_remove_amba(struct amba_device *adev) > +{ > + struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev); > + > + if (drvdata) > + return etm4_remove_dev(drvdata); > + return 0; > +} > + > static const struct amba_id etm4_ids[] = { > CS_AMBA_ID(0x000bb95d), /* Cortex-A53 */ > CS_AMBA_ID(0x000bb95e), /* Cortex-A57 */ > @@ -1872,14 +1888,14 @@ static const struct amba_id etm4_ids[] = { > > MODULE_DEVICE_TABLE(amba, etm4_ids); > > -static struct amba_driver etm4x_driver = { > +static struct amba_driver etm4x_amba_driver = { > .drv = { > .name = "coresight-etm4x", > .owner = THIS_MODULE, > .suppress_bind_attrs = true, > }, > - .probe = etm4_probe, > - .remove = etm4_remove, > + .probe = etm4_probe_amba, > + .remove = etm4_remove_amba, > .id_table = etm4_ids, > }; > > @@ -1893,7 +1909,7 @@ static int __init etm4x_init(void) > if (ret) > return ret; > > - ret = amba_driver_register(&etm4x_driver); > + ret = amba_driver_register(&etm4x_amba_driver); > if (ret) { > pr_err("Error registering etm4x driver\n"); > etm4_pm_clear(); > @@ -1904,7 +1920,7 @@ static int __init etm4x_init(void) > > static void __exit etm4x_exit(void) > { > - amba_driver_unregister(&etm4x_driver); > + amba_driver_unregister(&etm4x_amba_driver); > etm4_pm_clear(); > } > > -- > 2.24.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel