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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 429E7C63777 for ; Mon, 30 Nov 2020 20:56:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CFBF42073C for ; Mon, 30 Nov 2020 20:56:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Zf3jA60c" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730216AbgK3U4o (ORCPT ); Mon, 30 Nov 2020 15:56:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729822AbgK3U4o (ORCPT ); Mon, 30 Nov 2020 15:56:44 -0500 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6350AC0613CF for ; Mon, 30 Nov 2020 12:55:58 -0800 (PST) Received: by mail-pj1-x1044.google.com with SMTP id ms7so343128pjb.4 for ; Mon, 30 Nov 2020 12:55:58 -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=hwtGH00RadsJGka+CvwFq98EpWOxKlBzeXN72ZDqO1k=; b=Zf3jA60c4Yh6fHTgD1C8f/VTqjKa+5KFN3A5U1IoXY4xcv0cpDhnuoWyom3ruTEky6 +GpiXMnH+aJaOc7hoJ2x1kWLqWubTFS0BdEEIJQxof1k9Xi3vSHWy81dFHNYFfRr2NQg /0+AMHZ4xI1foU2xwtct5kCSUgmBuwUGuc/3lUf3iuPYvjcQgcev333zfrAbLkbVIYlQ axKkjfCBLWe+XjgcOHMPvYAJOxCF6WGkCkiE/8pItqpVhW3mGwMcOzGkV9Ka2rmPHoCa rnXsVxwqmOe++yoyNDLdHeE+kOQmXysyuKvQa5VdPhYmKEBqf61LaUCCsucdqjAAAXeD eBQA== 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=hwtGH00RadsJGka+CvwFq98EpWOxKlBzeXN72ZDqO1k=; b=D7h7SMkEaWks8zT3soRIx7S6iEHOtyyikjYciI1TRhIrfpjlyX1Fw0DTC/TvYr8Xy2 Ous/Tpcgpwju6hRQ2laAgrSsLwkjldckWMP4k4EXjFl3DEsLwnnpGMKh5mQah9H2e/1Y epPF001N74i5cWdefpfLu41zC+LxRnmIy7+IoYRUMNGOOmUFgeYe46C+Qdx4l8e9k7wD Nr6ZrFjmtVPgY40P4jb4BESUn5v0F7+eyxJ0+h3rBTr18bP1btJUw8jOUW2JJtLMA+fP RiFde/VE9LElDvY9ExpiqpL8MW37hgya2zQ/nN5O/qeRj0e3h0nZdbUrFqi2/9Esxbm9 k7Gg== X-Gm-Message-State: AOAM530y/0M90zOyghvEVXqWVH+fs/HSGSGMenlrZ/fygRL/+98yydvS hRBinuAc4mTa4GzmZtTqoEONnw== X-Google-Smtp-Source: ABdhPJwaP207mHL86RDUj+mpq4nX8FN+pZ818dcHT5nDZeFZWwxq3EiP1qGxl1MR1bC409nPLXXvIg== X-Received: by 2002:a17:90a:7e95:: with SMTP id j21mr728492pjl.217.1606769757741; Mon, 30 Nov 2020 12:55:57 -0800 (PST) Received: from xps15 (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id gz2sm383252pjb.2.2020.11.30.12.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Nov 2020 12:55:57 -0800 (PST) Date: Mon, 30 Nov 2020 13:55:54 -0700 From: Mathieu Poirier To: Suzuki K Poulose Cc: linux-arm-kernel@lists.infradead.org, mike.leach@linaro.org, linux-kernel@vger.kernel.org, anshuman.khandual@arm.com, jonathan.zhouwen@huawei.com, coresight@lists.linaro.org Subject: Re: [PATCH v4 05/25] coresight: Convert coresight_timeout to use access abstraction Message-ID: <20201130205554.GE1092947@xps15> References: <20201119164547.2982871-1-suzuki.poulose@arm.com> <20201119164547.2982871-6-suzuki.poulose@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201119164547.2982871-6-suzuki.poulose@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 19, 2020 at 04:45:27PM +0000, Suzuki K Poulose wrote: > Convert the generic routines to use the new access abstraction layer > gradually, starting with coresigth_timeout. > > Cc: Mike Leach > Reviewed-by: Mathieu Poirier > Signed-off-by: Suzuki K Poulose > --- > Changes since v3: > - Fix style : stacking of parameters (Mathieu) There is some stacking left in coresight.h > --- > drivers/hwtracing/coresight/coresight-catu.c | 5 ++-- > drivers/hwtracing/coresight/coresight-core.c | 13 ++++---- > drivers/hwtracing/coresight/coresight-etb10.c | 5 ++-- > .../coresight/coresight-etm4x-core.c | 30 ++++++++++++------- > drivers/hwtracing/coresight/coresight-stm.c | 3 +- > .../hwtracing/coresight/coresight-tmc-core.c | 15 ++++++---- > drivers/hwtracing/coresight/coresight-tpiu.c | 4 +-- > include/linux/coresight.h | 13 ++++++-- > 8 files changed, 56 insertions(+), 32 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c > index 5baf29510f1b..34c74b05c542 100644 > --- a/drivers/hwtracing/coresight/coresight-catu.c > +++ b/drivers/hwtracing/coresight/coresight-catu.c > @@ -401,8 +401,9 @@ static const struct attribute_group *catu_groups[] = { > > static inline int catu_wait_for_ready(struct catu_drvdata *drvdata) > { > - return coresight_timeout(drvdata->base, > - CATU_STATUS, CATU_STATUS_READY, 1); > + struct csdev_access *csa = &drvdata->csdev->access; > + > + return coresight_timeout(csa, CATU_STATUS, CATU_STATUS_READY, 1); > } > > static int catu_enable_hw(struct catu_drvdata *drvdata, void *data) > diff --git a/drivers/hwtracing/coresight/coresight-core.c b/drivers/hwtracing/coresight/coresight-core.c > index 0d6697f1d58f..f8fa53490753 100644 > --- a/drivers/hwtracing/coresight/coresight-core.c > +++ b/drivers/hwtracing/coresight/coresight-core.c > @@ -1412,23 +1412,24 @@ static void coresight_remove_conns(struct coresight_device *csdev) > } > > /** > - * coresight_timeout - loop until a bit has changed to a specific state. > - * @addr: base address of the area of interest. > - * @offset: address of a register, starting from @addr. > + * coresight_timeout - loop until a bit has changed to a specific register > + * state. > + * @csa: coresight device access for the device > + * @offset: Offset of the register from the base of the device. > * @position: the position of the bit of interest. > * @value: the value the bit should have. > * > * Return: 0 as soon as the bit has taken the desired state or -EAGAIN if > * TIMEOUT_US has elapsed, which ever happens first. > */ > - > -int coresight_timeout(void __iomem *addr, u32 offset, int position, int value) > +int coresight_timeout(struct csdev_access *csa, u32 offset, > + int position, int value) > { > int i; > u32 val; > > for (i = TIMEOUT_US; i > 0; i--) { > - val = __raw_readl(addr + offset); > + val = csdev_access_read32(csa, offset); > /* waiting on the bit to go from 0 to 1 */ > if (value) { > if (val & BIT(position)) > diff --git a/drivers/hwtracing/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c > index fec77a841f2c..f643e5bc3aa5 100644 > --- a/drivers/hwtracing/coresight/coresight-etb10.c > +++ b/drivers/hwtracing/coresight/coresight-etb10.c > @@ -252,6 +252,7 @@ static void __etb_disable_hw(struct etb_drvdata *drvdata) > { > u32 ffcr; > struct device *dev = &drvdata->csdev->dev; > + struct csdev_access *csa = &drvdata->csdev->access; > > CS_UNLOCK(drvdata->base); > > @@ -263,7 +264,7 @@ static void __etb_disable_hw(struct etb_drvdata *drvdata) > ffcr |= ETB_FFCR_FON_MAN; > writel_relaxed(ffcr, drvdata->base + ETB_FFCR); > > - if (coresight_timeout(drvdata->base, ETB_FFCR, ETB_FFCR_BIT, 0)) { > + if (coresight_timeout(csa, ETB_FFCR, ETB_FFCR_BIT, 0)) { > dev_err(dev, > "timeout while waiting for completion of Manual Flush\n"); > } > @@ -271,7 +272,7 @@ static void __etb_disable_hw(struct etb_drvdata *drvdata) > /* disable trace capture */ > writel_relaxed(0x0, drvdata->base + ETB_CTL_REG); > > - if (coresight_timeout(drvdata->base, ETB_FFSR, ETB_FFSR_BIT, 1)) { > + if (coresight_timeout(csa, ETB_FFSR, ETB_FFSR_BIT, 1)) { > dev_err(dev, > "timeout while waiting for Formatter to Stop\n"); > } > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 6448ce69be63..4335ed97f9c7 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -123,7 +123,9 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) > { > int i, rc; > struct etmv4_config *config = &drvdata->config; > - struct device *etm_dev = &drvdata->csdev->dev; > + struct coresight_device *csdev = drvdata->csdev; > + struct device *etm_dev = &csdev->dev; > + struct csdev_access *csa = &csdev->access; > > CS_UNLOCK(drvdata->base); > > @@ -137,7 +139,7 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) > writel_relaxed(0, drvdata->base + TRCPRGCTLR); > > /* wait for TRCSTATR.IDLE to go up */ > - if (coresight_timeout(drvdata->base, TRCSTATR, TRCSTATR_IDLE_BIT, 1)) > + if (coresight_timeout(csa, TRCSTATR, TRCSTATR_IDLE_BIT, 1)) > dev_err(etm_dev, > "timeout while waiting for Idle Trace Status\n"); > if (drvdata->nr_pe) > @@ -228,7 +230,7 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) > writel_relaxed(1, drvdata->base + TRCPRGCTLR); > > /* wait for TRCSTATR.IDLE to go back down to '0' */ > - if (coresight_timeout(drvdata->base, TRCSTATR, TRCSTATR_IDLE_BIT, 0)) > + if (coresight_timeout(csa, TRCSTATR, TRCSTATR_IDLE_BIT, 0)) > dev_err(etm_dev, > "timeout while waiting for Idle Trace Status\n"); > > @@ -492,7 +494,9 @@ static void etm4_disable_hw(void *info) > u32 control; > struct etmv4_drvdata *drvdata = info; > struct etmv4_config *config = &drvdata->config; > - struct device *etm_dev = &drvdata->csdev->dev; > + struct coresight_device *csdev = drvdata->csdev; > + struct device *etm_dev = &csdev->dev; > + struct csdev_access *csa = &csdev->access; > int i; > > CS_UNLOCK(drvdata->base); > @@ -519,8 +523,7 @@ static void etm4_disable_hw(void *info) > writel_relaxed(control, drvdata->base + TRCPRGCTLR); > > /* wait for TRCSTATR.PMSTABLE to go to '1' */ > - if (coresight_timeout(drvdata->base, TRCSTATR, > - TRCSTATR_PMSTABLE_BIT, 1)) > + if (coresight_timeout(csa, TRCSTATR, TRCSTATR_PMSTABLE_BIT, 1)) > dev_err(etm_dev, > "timeout while waiting for PM stable Trace Status\n"); > > @@ -1176,7 +1179,15 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) > { > int i, ret = 0; > struct etmv4_save_state *state; > - struct device *etm_dev = &drvdata->csdev->dev; > + struct coresight_device *csdev = drvdata->csdev; > + struct csdev_access *csa; > + struct device *etm_dev; > + > + if (WARN_ON(!csdev)) > + return -ENODEV; > + > + etm_dev = &csdev->dev; > + csa = &csdev->access; > > /* > * As recommended by 3.4.1 ("The procedure when powering down the PE") > @@ -1191,8 +1202,7 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) > etm4_os_lock(drvdata); > > /* wait for TRCSTATR.PMSTABLE to go up */ > - if (coresight_timeout(drvdata->base, TRCSTATR, > - TRCSTATR_PMSTABLE_BIT, 1)) { > + if (coresight_timeout(csa, TRCSTATR, TRCSTATR_PMSTABLE_BIT, 1)) { > dev_err(etm_dev, > "timeout while waiting for PM Stable Status\n"); > etm4_os_unlock(drvdata); > @@ -1281,7 +1291,7 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata) > state->trcpdcr = readl(drvdata->base + TRCPDCR); > > /* wait for TRCSTATR.IDLE to go up */ > - if (coresight_timeout(drvdata->base, TRCSTATR, TRCSTATR_IDLE_BIT, 1)) { > + if (coresight_timeout(csa, TRCSTATR, TRCSTATR_IDLE_BIT, 1)) { > dev_err(etm_dev, > "timeout while waiting for Idle Trace Status\n"); > etm4_os_unlock(drvdata); > diff --git a/drivers/hwtracing/coresight/coresight-stm.c b/drivers/hwtracing/coresight/coresight-stm.c > index 315500b7763f..9cba67b27586 100644 > --- a/drivers/hwtracing/coresight/coresight-stm.c > +++ b/drivers/hwtracing/coresight/coresight-stm.c > @@ -258,6 +258,7 @@ static void stm_disable(struct coresight_device *csdev, > struct perf_event *event) > { > struct stm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); > + struct csdev_access *csa = &csdev->access; > > /* > * For as long as the tracer isn't disabled another entity can't > @@ -270,7 +271,7 @@ static void stm_disable(struct coresight_device *csdev, > spin_unlock(&drvdata->spinlock); > > /* Wait until the engine has completely stopped */ > - coresight_timeout(drvdata->base, STMTCSR, STMTCSR_BUSY_BIT, 0); > + coresight_timeout(csa, STMTCSR, STMTCSR_BUSY_BIT, 0); > > pm_runtime_put(csdev->dev.parent); > > diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwtracing/coresight/coresight-tmc-core.c > index 8fd640d41e1b..572f4b316798 100644 > --- a/drivers/hwtracing/coresight/coresight-tmc-core.c > +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c > @@ -33,16 +33,20 @@ DEFINE_CORESIGHT_DEVLIST(etr_devs, "tmc_etr"); > > void tmc_wait_for_tmcready(struct tmc_drvdata *drvdata) > { > + struct coresight_device *csdev = drvdata->csdev; > + struct csdev_access *csa = &csdev->access; > + > /* Ensure formatter, unformatter and hardware fifo are empty */ > - if (coresight_timeout(drvdata->base, > - TMC_STS, TMC_STS_TMCREADY_BIT, 1)) { > - dev_err(&drvdata->csdev->dev, > + if (coresight_timeout(csa, TMC_STS, TMC_STS_TMCREADY_BIT, 1)) { > + dev_err(&csdev->dev, > "timeout while waiting for TMC to be Ready\n"); > } > } > > void tmc_flush_and_stop(struct tmc_drvdata *drvdata) > { > + struct coresight_device *csdev = drvdata->csdev; > + struct csdev_access *csa = &csdev->access; > u32 ffcr; > > ffcr = readl_relaxed(drvdata->base + TMC_FFCR); > @@ -51,9 +55,8 @@ void tmc_flush_and_stop(struct tmc_drvdata *drvdata) > ffcr |= BIT(TMC_FFCR_FLUSHMAN_BIT); > writel_relaxed(ffcr, drvdata->base + TMC_FFCR); > /* Ensure flush completes */ > - if (coresight_timeout(drvdata->base, > - TMC_FFCR, TMC_FFCR_FLUSHMAN_BIT, 0)) { > - dev_err(&drvdata->csdev->dev, > + if (coresight_timeout(csa, TMC_FFCR, TMC_FFCR_FLUSHMAN_BIT, 0)) { > + dev_err(&csdev->dev, > "timeout while waiting for completion of Manual Flush\n"); > } > > diff --git a/drivers/hwtracing/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c > index 98c4a029854c..1e92c76d9656 100644 > --- a/drivers/hwtracing/coresight/coresight-tpiu.c > +++ b/drivers/hwtracing/coresight/coresight-tpiu.c > @@ -86,9 +86,9 @@ static void tpiu_disable_hw(struct csdev_access *csa) > /* Generate manual flush */ > csdev_access_relaxed_write32(csa, FFCR_STOP_FI | FFCR_FON_MAN, TPIU_FFCR); > /* Wait for flush to complete */ > - coresight_timeout(csa->base, TPIU_FFCR, FFCR_FON_MAN_BIT, 0); > + coresight_timeout(csa, TPIU_FFCR, FFCR_FON_MAN_BIT, 0); > /* Wait for formatter to stop */ > - coresight_timeout(csa->base, TPIU_FFSR, FFSR_FT_STOPPED_BIT, 1); > + coresight_timeout(csa, TPIU_FFSR, FFSR_FT_STOPPED_BIT, 1); > > CS_LOCK(csa->base); > } > diff --git a/include/linux/coresight.h b/include/linux/coresight.h > index d3aa328639cd..595ceb5f8d53 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -464,7 +464,7 @@ coresight_register(struct coresight_desc *desc); > extern void coresight_unregister(struct coresight_device *csdev); > extern int coresight_enable(struct coresight_device *csdev); > extern void coresight_disable(struct coresight_device *csdev); > -extern int coresight_timeout(void __iomem *addr, u32 offset, > +extern int coresight_timeout(struct csdev_access *csa, u32 offset, > int position, int value); > > extern int coresight_claim_device(void __iomem *base); > @@ -497,8 +497,15 @@ static inline void coresight_unregister(struct coresight_device *csdev) {} > static inline int > coresight_enable(struct coresight_device *csdev) { return -ENOSYS; } > static inline void coresight_disable(struct coresight_device *csdev) {} > -static inline int coresight_timeout(void __iomem *addr, u32 offset, > - int position, int value) { return 1; } > + > +static inline int coresight_timeout(struct csdev_access *csa, > + u32 offset, > + int position, > + int value) > +{ > + return 1; > +} > + > static inline int coresight_claim_device_unlocked(void __iomem *base) > { > return -EINVAL; > -- > 2.24.1 >