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 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 A435FC43464 for ; Fri, 18 Sep 2020 15:36:38 +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 D52B920848 for ; Fri, 18 Sep 2020 15:36:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="l04wGWNi"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="n/JlwjTi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D52B920848 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:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ay/w9jlomvaZMxxuKq44CMUabJFB5yi41X6CA540J5I=; b=l04wGWNirM5G0UMIcm2vPDfYh f18WjOCZhw+d0IWElpXS/zOH961pj1q7bM3RgkM5SDLmYHb4mhoF0q47CQqdYLn2BgmsHZDOTN5Vv OIs875gSIh9i8iS5tHBDqC+OOUH3AlVExPP5Q8LS6meEeIxM0/VB3xwq4XL7UwDP3VjCN4xIiUNc7 4fnQXE8wZjfTPCrr9Kno83NZYBYuF14Wzh8aW80pyPhNsl6XRoclhVC1YLrH4moRMgcbr7NRjCv66 7KE8ioqCn46OWi8vleLMb21DydnyO0nVR8J7BZnLexJJBLOROe9heaDsYPzfgR3JtAfKC3DWwqCnr eamUMhV4g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJIPE-0005Ed-61; Fri, 18 Sep 2020 15:34:36 +0000 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJIOy-00058T-CI for linux-arm-kernel@lists.infradead.org; Fri, 18 Sep 2020 15:34:23 +0000 Received: by mail-ej1-x644.google.com with SMTP id i22so8711009eja.5 for ; Fri, 18 Sep 2020 08:34:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=rCdd8FmIviHpI4rhRIJZpcAt4cUwsfwUEezjwl6LywQ=; b=n/JlwjTiI3gR4fyxBa1lU3RjZVmutx2/icUKpK7esGUiN32c03U5f29BUo9SN7Vfme V3K3tSJHSTdqfvuSbn14EERBeF7wytzAG/r5njFS741X2jBYYryMSRWz1yWgAE7ieoNO 5xinOYbauG8ps5/cn5VTb1Llo8aCbVLfHi4H5Se5RaZDsKxllcPJFM31FjBIHGB7cJQM 1avBXzBbZjSw5qfa5BziB40dSAmJl3audr70FhSCssl6hEsyl9kdUe8zGpTpECskIgRC v2J1Chez/Jfx8Xdsb7GSF86Qhqgu0YpRHpaqHmQ/OcNYekKisu/sDlJebTyM9UPolNAg Wm4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=rCdd8FmIviHpI4rhRIJZpcAt4cUwsfwUEezjwl6LywQ=; b=fG5jbLESNRnb+L0w/orRv79/PQmXpfwX3oZ/ANZ0Av3L6c6cqziwOVM7lX9nlZDc2j K+fB8ZLejAgBckta75xTZIdqD9C4m6lMO1TAPTWBiNuYfkHvWlAD4Jpk5nyQCprfMul/ E5cSszSvYproyduvHDR/nhZwtQoL/W34wmgdaSIFNcaB+1zZOhLbKrKSYmCPtmFH4I78 tzWnmS6WirHbu266Z61nUW3D72xarsmQgGaoI5fjy56WaHwMHXXMlOgVOnaEDKtZoCB7 edNdNJn2SN7rrYuJGFLJmvpfycSqM1okPTwtIPH8UeDUK/hoMU7DtCAuhKTlNXz5riEI Zrqg== X-Gm-Message-State: AOAM531HwBOPHlAa2OKUC0aqxstf3yjHhWvJpI3qXSP3n+T98TJs8LEJ mxIodBHOi2DlybcM21Zjc64OFNbgka94lDNLG6/psg== X-Google-Smtp-Source: ABdhPJxPb1h1ogG4pUMzpQ4/+B0aVasJAyxttS7Oghgh+jyd6f/i2GH/Q2kS5sb9rcmHLh1eoj/dVCNDL/hic3jiAKU= X-Received: by 2002:a17:906:2b4f:: with SMTP id b15mr37717445ejg.477.1600443258653; Fri, 18 Sep 2020 08:34:18 -0700 (PDT) MIME-Version: 1.0 References: <20200911084119.1080694-1-suzuki.poulose@arm.com> <20200911084119.1080694-4-suzuki.poulose@arm.com> In-Reply-To: <20200911084119.1080694-4-suzuki.poulose@arm.com> From: Mike Leach Date: Fri, 18 Sep 2020 16:34:07 +0100 Message-ID: Subject: Re: [PATCH 03/19] coresight: Convert coresight_timeout to use access abstraction To: Suzuki K Poulose X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200918_113420_500157_C2A2B867 X-CRM114-Status: GOOD ( 28.69 ) 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: Coresight ML , Anshuman.Khandual@arm.com, Mathieu Poirier , linux-arm-kernel , Leo Yan 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 Reviewed-by: Mike Leach On Fri, 11 Sep 2020 at 09:41, 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 > --- > drivers/hwtracing/coresight/coresight-catu.c | 5 ++-- > drivers/hwtracing/coresight/coresight-etb10.c | 5 ++-- > drivers/hwtracing/coresight/coresight-etm4x.c | 30 ++++++++++++------- > drivers/hwtracing/coresight/coresight-stm.c | 3 +- > drivers/hwtracing/coresight/coresight-tmc.c | 15 ++++++---- > drivers/hwtracing/coresight/coresight-tpiu.c | 4 +-- > drivers/hwtracing/coresight/coresight.c | 15 ++++++---- > include/linux/coresight.h | 17 ++++++++--- > 8 files changed, 61 insertions(+), 33 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c > index 90da0b842717..15e63e52ff23 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-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c > index 42fe174a68f0..2786d02dd23b 100644 > --- a/drivers/hwtracing/coresight/coresight-etb10.c > +++ b/drivers/hwtracing/coresight/coresight-etb10.c > @@ -251,6 +251,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); > > @@ -262,7 +263,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"); > } > @@ -270,7 +271,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.c b/drivers/hwtracing/coresight/coresight-etm4x.c > index 466e6f304751..973fb0fd4826 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x.c > @@ -107,7 +107,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); > > @@ -121,7 +123,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"); > > @@ -208,7 +210,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"); > > @@ -472,7 +474,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); > @@ -499,8 +503,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"); > > @@ -1145,7 +1148,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") > @@ -1160,8 +1171,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); > @@ -1244,7 +1254,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 fbf86f31f2ab..9667c5c8f433 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.c b/drivers/hwtracing/coresight/coresight-tmc.c > index 5711e55c310c..cc9d97f9eb5b 100644 > --- a/drivers/hwtracing/coresight/coresight-tmc.c > +++ b/drivers/hwtracing/coresight/coresight-tmc.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 cc7d7ed474f5..7dd8300cf6be 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/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c > index 38e9c03ab754..21e7615fcbc8 100644 > --- a/drivers/hwtracing/coresight/coresight.c > +++ b/drivers/hwtracing/coresight/coresight.c > @@ -1338,23 +1338,26 @@ 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/include/linux/coresight.h b/include/linux/coresight.h > index 1377240275d8..55a9c3276a28 100644 > --- a/include/linux/coresight.h > +++ b/include/linux/coresight.h > @@ -468,8 +468,10 @@ 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, > - int position, int value); > +extern int coresight_timeout(struct csdev_access *csa, > + u32 offset, > + int position, > + int value); > > extern int coresight_claim_device(void __iomem *base); > extern int coresight_claim_device_unlocked(void __iomem *base); > @@ -501,8 +503,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 > -- Mike Leach Principal Engineer, ARM Ltd. Manchester Design Centre. UK _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel