From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8490A14273; Mon, 18 Dec 2023 10:34:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 14DED1FB; Mon, 18 Dec 2023 02:35:15 -0800 (PST) Received: from [10.57.46.32] (unknown [10.57.46.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0F2193F7C5; Mon, 18 Dec 2023 02:34:27 -0800 (PST) Message-ID: Date: Mon, 18 Dec 2023 10:34:26 +0000 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 3/8] coresight-tpdm: Add CMB dataset support Content-Language: en-GB To: Tao Zhang , Mathieu Poirier , Alexander Shishkin , Konrad Dybcio , Mike Leach , Rob Herring , Krzysztof Kozlowski Cc: Jinlong Mao , Leo Yan , Greg Kroah-Hartman , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Tingwei Zhang , Yuanfang Zhang , Trilok Soni , Song Chai , linux-arm-msm@vger.kernel.org, andersson@kernel.org References: <1700533494-19276-1-git-send-email-quic_taozha@quicinc.com> <1700533494-19276-4-git-send-email-quic_taozha@quicinc.com> From: Suzuki K Poulose In-Reply-To: <1700533494-19276-4-git-send-email-quic_taozha@quicinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 21/11/2023 02:24, Tao Zhang wrote: > CMB (continuous multi-bit) is one of TPDM's dataset type. CMB subunit > can be enabled for data collection by writing 1 to the first bit of > CMB_CR register. This change is to add enable/disable function for > CMB dataset by writing CMB_CR register. > > Reviewed-by: James Clark > Signed-off-by: Tao Zhang > Signed-off-by: Jinlong Mao > --- > drivers/hwtracing/coresight/coresight-tpdm.c | 31 ++++++++++++++++++++ > drivers/hwtracing/coresight/coresight-tpdm.h | 8 +++++ > 2 files changed, 39 insertions(+) > > diff --git a/drivers/hwtracing/coresight/coresight-tpdm.c b/drivers/hwtracing/coresight/coresight-tpdm.c > index 97654aa4b772..c8bb38822e08 100644 > --- a/drivers/hwtracing/coresight/coresight-tpdm.c > +++ b/drivers/hwtracing/coresight/coresight-tpdm.c > @@ -131,6 +131,11 @@ static bool tpdm_has_dsb_dataset(struct tpdm_drvdata *drvdata) > return (drvdata->datasets & TPDM_PIDR0_DS_DSB); > } > > +static bool tpdm_has_cmb_dataset(struct tpdm_drvdata *drvdata) > +{ > + return (drvdata->datasets & TPDM_PIDR0_DS_CMB); > +} > + > static umode_t tpdm_dsb_is_visible(struct kobject *kobj, > struct attribute *attr, int n) > { > @@ -267,6 +272,17 @@ static void tpdm_enable_dsb(struct tpdm_drvdata *drvdata) > writel_relaxed(val, drvdata->base + TPDM_DSB_CR); > } > > +static void tpdm_enable_cmb(struct tpdm_drvdata *drvdata) > +{ > + u32 val; > + > + val = readl_relaxed(drvdata->base + TPDM_CMB_CR); > + val |= TPDM_CMB_CR_ENA; > + > + /* Set the enable bit of CMB control register to 1 */ > + writel_relaxed(val, drvdata->base + TPDM_CMB_CR); > +} > + > /* > * TPDM enable operations > * The TPDM or Monitor serves as data collection component for various > @@ -281,6 +297,8 @@ static void __tpdm_enable(struct tpdm_drvdata *drvdata) > > if (tpdm_has_dsb_dataset(drvdata)) > tpdm_enable_dsb(drvdata); > + if (tpdm_has_cmb_dataset(drvdata)) > + tpdm_enable_cmb(drvdata); > Don't we need to add this check in the "property read" section ? Otherwise, we could generate warnings unnecessarily ? i.e, if (tpdm_has_cmb_..()) rc |= fwnode_..read_property(cmb-elem-size...) Similarly for DSB. > CS_LOCK(drvdata->base); > } > @@ -314,6 +332,17 @@ static void tpdm_disable_dsb(struct tpdm_drvdata *drvdata) > writel_relaxed(val, drvdata->base + TPDM_DSB_CR); > } > > +static void tpdm_disable_cmb(struct tpdm_drvdata *drvdata) > +{ > + u32 val; > + > + val = readl_relaxed(drvdata->base + TPDM_CMB_CR); > + val &= ~TPDM_CMB_CR_ENA; > + > + /* Set the enable bit of CMB control register to 0 */ > + writel_relaxed(val, drvdata->base + TPDM_CMB_CR); > +} > + > /* TPDM disable operations */ > static void __tpdm_disable(struct tpdm_drvdata *drvdata) > { > @@ -321,6 +350,8 @@ static void __tpdm_disable(struct tpdm_drvdata *drvdata) > > if (tpdm_has_dsb_dataset(drvdata)) > tpdm_disable_dsb(drvdata); > + if (tpdm_has_cmb_dataset(drvdata)) > + tpdm_disable_cmb(drvdata); minor nit: Instead of having these : if (tpdm_has_XY_() tpdm_{enable/disable}_XY_() I prefer : tpdm_{enable/disable}_XY_ and the helper take care of returning early if the feature is not present. Suzuki > > CS_LOCK(drvdata->base); > } > diff --git a/drivers/hwtracing/coresight/coresight-tpdm.h b/drivers/hwtracing/coresight/coresight-tpdm.h > index 4115b2a17b8d..0098c58dfdd6 100644 > --- a/drivers/hwtracing/coresight/coresight-tpdm.h > +++ b/drivers/hwtracing/coresight/coresight-tpdm.h > @@ -9,6 +9,12 @@ > /* The max number of the datasets that TPDM supports */ > #define TPDM_DATASETS 7 > > +/* CMB Subunit Registers */ > +#define TPDM_CMB_CR (0xA00) > + > +/* Enable bit for CMB subunit */ > +#define TPDM_CMB_CR_ENA BIT(0) > + > /* DSB Subunit Registers */ > #define TPDM_DSB_CR (0x780) > #define TPDM_DSB_TIER (0x784) > @@ -79,10 +85,12 @@ > * > * PERIPHIDR0[0] : Fix to 1 if ImplDef subunit present, else 0 > * PERIPHIDR0[1] : Fix to 1 if DSB subunit present, else 0 > + * PERIPHIDR0[2] : Fix to 1 if CMB subunit present, else 0 > */ > > #define TPDM_PIDR0_DS_IMPDEF BIT(0) > #define TPDM_PIDR0_DS_DSB BIT(1) > +#define TPDM_PIDR0_DS_CMB BIT(2) > > #define TPDM_DSB_MAX_LINES 256 > /* MAX number of EDCR registers */