From nobody Wed Dec 17 00:14:36 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D024EC4167B for ; Fri, 8 Dec 2023 05:40:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233262AbjLHFkI (ORCPT ); Fri, 8 Dec 2023 00:40:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233169AbjLHFjz (ORCPT ); Fri, 8 Dec 2023 00:39:55 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EBA4C1721; Thu, 7 Dec 2023 21:40:01 -0800 (PST) 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 756A011FB; Thu, 7 Dec 2023 21:40:47 -0800 (PST) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.41.8]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3CBD73F5A1; Thu, 7 Dec 2023 21:39:56 -0800 (PST) From: Anshuman Khandual To: linux-arm-kernel@lists.infradead.org, suzuki.poulose@arm.com Cc: Anshuman Khandual , Lorenzo Pieralisi , Sudeep Holla , Mike Leach , James Clark , Maxime Coquelin , Alexandre Torgue , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, coresight@lists.linaro.org, linux-stm32@st-md-mailman.stormreply.com Subject: [PATCH V3 02/10] coresight: tmc: Extract device properties from AMBA pid based table lookup Date: Fri, 8 Dec 2023 11:09:31 +0530 Message-Id: <20231208053939.42901-3-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231208053939.42901-1-anshuman.khandual@arm.com> References: <20231208053939.42901-1-anshuman.khandual@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This extracts device properties from AMBA pid based table lookup. This also defers tmc_etr_setup_caps() after the coresight device has been initialized so that pid value can be read. Cc: Suzuki K Poulose Cc: Mike Leach Cc: James Clark Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- Changes in V3: - New patch in the series .../hwtracing/coresight/coresight-tmc-core.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-tmc-core.c b/drivers/hwt= racing/coresight/coresight-tmc-core.c index c106d142e632..ad61d02f5f75 100644 --- a/drivers/hwtracing/coresight/coresight-tmc-core.c +++ b/drivers/hwtracing/coresight/coresight-tmc-core.c @@ -362,16 +362,24 @@ static inline bool tmc_etr_has_non_secure_access(stru= ct tmc_drvdata *drvdata) return (auth & TMC_AUTH_NSID_MASK) =3D=3D 0x3; } =20 +#define TMC_AMBA_MASK 0xfffff + +static const struct amba_id tmc_ids[]; + /* Detect and initialise the capabilities of a TMC ETR */ -static int tmc_etr_setup_caps(struct device *parent, u32 devid, void *dev_= caps) +static int tmc_etr_setup_caps(struct device *parent, u32 devid) { int rc; - u32 dma_mask =3D 0; + u32 tmc_pid, dma_mask =3D 0; struct tmc_drvdata *drvdata =3D dev_get_drvdata(parent); + void *dev_caps; =20 if (!tmc_etr_has_non_secure_access(drvdata)) return -EACCES; =20 + tmc_pid =3D coresight_get_pid(&drvdata->csdev->access) & TMC_AMBA_MASK; + dev_caps =3D coresight_get_uci_data_from_amba(tmc_ids, tmc_pid); + /* Set the unadvertised capabilities */ tmc_etr_init_caps(drvdata, (u32)(unsigned long)dev_caps); =20 @@ -487,10 +495,6 @@ static int tmc_probe(struct amba_device *adev, const s= truct amba_id *id) desc.type =3D CORESIGHT_DEV_TYPE_SINK; desc.subtype.sink_subtype =3D CORESIGHT_DEV_SUBTYPE_SINK_SYSMEM; desc.ops =3D &tmc_etr_cs_ops; - ret =3D tmc_etr_setup_caps(dev, devid, - coresight_get_uci_data(id)); - if (ret) - goto out; idr_init(&drvdata->idr); mutex_init(&drvdata->idr_mutex); dev_list =3D &etr_devs; @@ -528,6 +532,9 @@ static int tmc_probe(struct amba_device *adev, const st= ruct amba_id *id) goto out; } =20 + if (drvdata->config_type =3D=3D TMC_CONFIG_TYPE_ETR) + ret =3D tmc_etr_setup_caps(dev, devid); + drvdata->miscdev.name =3D desc.name; drvdata->miscdev.minor =3D MISC_DYNAMIC_MINOR; drvdata->miscdev.fops =3D &tmc_fops; --=20 2.25.1