From nobody Fri Oct 3 13:27:19 2025 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53E8925BF1B for ; Mon, 1 Sep 2025 06:58:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756709906; cv=none; b=Fasy98S97yPWX8lw0TKNxXWI0+/E9VI+/wxHUOueTOYEqrYi6eTDIu7AVTkbliuMDNQJ8iguqkZkcuMJMfAIWNSJHPquwC8gDrKy8c+qRnyyOcF5uBfatWrwdh8ceZa6KL5T2N/hw9ZPCc6ebnD1qSaOt/f4hKoGSCqHjWR+IvU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756709906; c=relaxed/simple; bh=0cctjiu4mUm5N0O/l2W3akr4wwL/nWN7vsCpgeUxUnI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eqMsN5bes3cYjmZL6pFwozKYnIe4ZYjVfLJH0ALBOn9Usido7syNEzvXEacyt8EnwOW7qUxUtxlz+0Pmz5SzvDmsxYCUvuJepSPPwD9KFPLmtTuBy1uZez7mmqX0UiX7XmmX5km3DI67BHW2TruNoOiGHiHFFGke+JVnJHx8vjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=kaMBKQQ6; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="kaMBKQQ6" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57VN02I2025735 for ; Mon, 1 Sep 2025 06:58:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 2qH6VhWxn/zSPj4QiRAg7fr+LOmrENATveDxzpql1NE=; b=kaMBKQQ6da2o01z1 9plibbtddOkVBUlHva3ruEEundWBVzyyTP7SHdQsly7O03WWKrTlKe/CI/pUPAZm ANGR0X8UiGFx87oChoS8ZZzYJ4M5vvswv6FBVQFTmc7tE4n+h1zYl7pQV856aHkD GIZZitkqUw8cjdQ8zLLYZsFgY6emRIQI/o/hBUsnKatcrP6OeGBoer9NsgKWRW73 g1OhnaPn7nZMhg7rfFFFGyrA5k/KD68tVA8urg9ju/BuUNi4shqscoV6wYkDe+Wa nJhRwpeNtgPFNGuSmHSu+WJVAz+4/eWYeH2dWE96KIQCTuwDXFJ9UudyiOM2ohw2 LvnYWw== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48urmjbmk0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 01 Sep 2025 06:58:22 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-770562b1ed3so6199173b3a.2 for ; Sun, 31 Aug 2025 23:58:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756709901; x=1757314701; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2qH6VhWxn/zSPj4QiRAg7fr+LOmrENATveDxzpql1NE=; b=sY//hMi6EXJhEAn/pFI4daol8kKIC3MDkYVDPEpnIFeb78y9nGKgCqLmpPawT1mQiV xzTA6Bh8kdm70SBmzPAm5qxoxe9+30coo11SVVyT6kJjexCn1B18ICG8fMsOnIVgNwnf rxG0cF+wELpea9nHrFLquM5EBk9OGtB7zlFUmQgSxnIOpBHk+/WZDGRgsdmECRF3dNiX YvKy3++gJ34bpif7hm8OAIE36tUk+MU8AloD1JLFDKWT6Wzpzgvs5s409XRmuts7wsce 3v4MBYahOBRxiQyJrJsU4cd6ClL6uqCne/5d7K8rBpq3Tt2C9j4Kl0Z6u25AqDctLJgV niiQ== X-Forwarded-Encrypted: i=1; AJvYcCVl43Tojwd8kureVvMyQf/PLqO4s6cnrKB1cDAtx2r/blb7AUduF067FDFcA9ExbwGFVPK2wrkqUEhUaGU=@vger.kernel.org X-Gm-Message-State: AOJu0YyUBAaCbJBHrHRRyKSSqEw7GMT3pYIpYNfUVQQSw0VeQReCTJbb HjtWxjh7igLZ+T0xII7rrA771LGCN3tOqRQdh1GOZOmUXIZiidmzz31lDoMsEdChMrzTPdaeS0J PbHJU4ApDhwssNx9t+mywE0EBRl4Wk9eaXkOU5ZEcB/YPt6Fuz7I9qLzp5xfbgyEhPBI= X-Gm-Gg: ASbGncuWVnzuq/NgJ1hR2YVuHMYj1K+3Re4u8WrJyVSmhOdoG1qxX9lDPL1kThOTlgY e68enoIUblHEigj3ex92Zh+bBmd7UibRGLhcw2TLiSaEBZvgyRMp3uzFoAGGqU31cG0Q0otqtp6 Cn8smycHbVc993fFFf+ZEbNn/nemS3wc8tIRqNl/k5EQ/3UJrI2x6fJe3oOPVro1kPEpTiFPnx8 s3ETvlBVB2V/9fphRnfWuZQQ+ETkhm/eaYcERKA4u60ITK1Oy5z2cgk/TysWIbIXm44hNkgDyfd BcDFt+7bsqHfswdqUEk8xhbOLUvi+WO3bg27pj6/J+6spieqbat5SKFFxXNHLx11q9J2KtYWeBg 8OMqcaocGqEZAJ9lWe/4mEA== X-Received: by 2002:a05:6a20:1595:b0:243:a20a:3ca5 with SMTP id adf61e73a8af0-243d6dfda4fmr9693667637.13.1756709901493; Sun, 31 Aug 2025 23:58:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFyL3Lv23HMZmNxbBVc6texbzqxTHCnrLR1QdzLtU1W4qMyK9JtaDWZrc48KBy+vPO5XHS0IQ== X-Received: by 2002:a05:6a20:1595:b0:243:a20a:3ca5 with SMTP id adf61e73a8af0-243d6dfda4fmr9693635637.13.1756709900981; Sun, 31 Aug 2025 23:58:20 -0700 (PDT) Received: from hu-yuanfang-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b4cd366f95asm8559358a12.51.2025.08.31.23.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Aug 2025 23:58:20 -0700 (PDT) From: Yuanfang Zhang Date: Sun, 31 Aug 2025 23:58:14 -0700 Subject: [PATCH v4 2/3] coresight-tnoc: add platform driver to support Interconnect TNOC Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250831-itnoc-v4-2-f0fb0ef822a5@oss.qualcomm.com> References: <20250831-itnoc-v4-0-f0fb0ef822a5@oss.qualcomm.com> In-Reply-To: <20250831-itnoc-v4-0-f0fb0ef822a5@oss.qualcomm.com> To: Suzuki K Poulose , Mike Leach , James Clark , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alexander Shishkin Cc: kernel@oss.qualcomm.com, coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Yuanfang Zhang , Leo Yan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1756709897; l=6708; i=yuanfang.zhang@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=0cctjiu4mUm5N0O/l2W3akr4wwL/nWN7vsCpgeUxUnI=; b=IKzRBw7TeIeOne6GVMmJ8xWElyiFd0ax5BypFhIxchVpAsCbnr8C1CbZMbunnsXAfNp1LfbbF uLybIkfQPP8BaERJ5jgDNzThZex2zlJK9HEM71GBNF4ttZPunWA8Rk7 X-Developer-Key: i=yuanfang.zhang@oss.qualcomm.com; a=ed25519; pk=9oS/FoPW5k0CsqSDDrPlnV+kVIOUaAe0O5pr4M1wHgY= X-Authority-Analysis: v=2.4 cv=OemYDgTY c=1 sm=1 tr=0 ts=68b5440e cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=7CQSdrXTAAAA:8 a=pUju2gecW9X7egxZnGUA:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-GUID: ikfgXI9GMlXkT6GuPnSdMTPbDJHMGBP_ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODMwMDAyNCBTYWx0ZWRfX/p0S9UAsF5T/ +nbyQ3k0NGIXvqitkrTaL3wn5qhuhH+6TOPux/dzLPdoy4R8hKrJNCnqDNQKSZnHMbdVdPqXF0f Ssgr47ZDEu0u1W7G4B8mX2wYnq5tMDsAT//Jeh9CwRwO7zHm7q+EvqL15irdPsB2Az2Em6Z7jEP 1yxfkl1PTenc3mn5kg2zxJYIwKPH6ULke5FCHQJyNaBBls0RnnbxsFMOymYrSnjgV1JrYRbwNtG 35rAMTkTCz+ndGMSXsiSBdNCz9GBdDR94WW0L41b7FDKGKkBmmN20Mv5sr9JhVmXKROU27+W0lz mkg8mM6xi5egU9D4fT/r4afPW3SWUY2yxG2aDCBPfgnAu5hvWT+D4Ncyr/kw1hMfjUPMzDD1Xkc htfp4J8e X-Proofpoint-ORIG-GUID: ikfgXI9GMlXkT6GuPnSdMTPbDJHMGBP_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-01_03,2025-08-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 priorityscore=1501 adultscore=0 clxscore=1015 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508300024 This patch adds platform driver support for the CoreSight Interconnect TNOC, Interconnect TNOC is a CoreSight link that forwards trace data from a subsystem to the Aggregator TNOC. Compared to Aggregator TNOC, it does not have aggregation and ATID functionality. Key changes: - Add platform driver `coresight-itnoc` with device tree match support. - Refactor probe logic into a common `_tnoc_probe()` function. - Conditionally initialize ATID only for AMBA-based TNOC blocks. Signed-off-by: Yuanfang Zhang Reviewed-by: Leo Yan --- drivers/hwtracing/coresight/coresight-tnoc.c | 113 +++++++++++++++++++++++= +--- 1 file changed, 102 insertions(+), 11 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-tnoc.c b/drivers/hwtraci= ng/coresight/coresight-tnoc.c index d542df46ea39314605290311f683010337bfd4bd..5be882300d79bc0173aa6a19d7d= a1d48c4aaca9c 100644 --- a/drivers/hwtracing/coresight/coresight-tnoc.c +++ b/drivers/hwtracing/coresight/coresight-tnoc.c @@ -34,6 +34,7 @@ * @base: memory mapped base address for this component. * @dev: device node for trace_noc_drvdata. * @csdev: component vitals needed by the framework. + * @pclk: APB clock if present, otherwise NULL * @spinlock: serialize enable/disable operation. * @atid: id for the trace packet. */ @@ -41,8 +42,9 @@ struct trace_noc_drvdata { void __iomem *base; struct device *dev; struct coresight_device *csdev; + struct clk *pclk; spinlock_t spinlock; - u32 atid; + int atid; }; =20 DEFINE_CORESIGHT_DEVLIST(trace_noc_devs, "traceNoc"); @@ -51,6 +53,12 @@ static void trace_noc_enable_hw(struct trace_noc_drvdata= *drvdata) { u32 val; =20 + /* No valid ATID, simply enable the unit */ + if (drvdata->atid =3D=3D -EOPNOTSUPP) { + writel(TRACE_NOC_CTRL_PORTEN, drvdata->base + TRACE_NOC_CTRL); + return; + } + /* Set ATID */ writel_relaxed(drvdata->atid, drvdata->base + TRACE_NOC_XLD); =20 @@ -124,6 +132,11 @@ static int trace_noc_init_default_data(struct trace_no= c_drvdata *drvdata) { int atid; =20 + if (!dev_is_amba(drvdata->dev)) { + drvdata->atid =3D -EOPNOTSUPP; + return 0; + } + atid =3D coresight_trace_id_get_system_id(); if (atid < 0) return atid; @@ -149,8 +162,21 @@ static struct attribute *coresight_tnoc_attrs[] =3D { NULL, }; =20 +static umode_t trace_id_is_visible(struct kobject *kobj, + struct attribute *attr, int idx) +{ + struct device *dev =3D kobj_to_dev(kobj); + struct trace_noc_drvdata *drvdata =3D dev_get_drvdata(dev->parent); + + if (attr =3D=3D &dev_attr_traceid.attr && drvdata->atid < 0) + return 0; + + return attr->mode; +} + static const struct attribute_group coresight_tnoc_group =3D { .attrs =3D coresight_tnoc_attrs, + .is_visible =3D trace_id_is_visible, }; =20 static const struct attribute_group *coresight_tnoc_groups[] =3D { @@ -158,9 +184,8 @@ static const struct attribute_group *coresight_tnoc_gro= ups[] =3D { NULL, }; =20 -static int trace_noc_probe(struct amba_device *adev, const struct amba_id = *id) +static int _tnoc_probe(struct device *dev, struct resource *res) { - struct device *dev =3D &adev->dev; struct coresight_platform_data *pdata; struct trace_noc_drvdata *drvdata; struct coresight_desc desc =3D { 0 }; @@ -173,16 +198,20 @@ static int trace_noc_probe(struct amba_device *adev, = const struct amba_id *id) pdata =3D coresight_get_platform_data(dev); if (IS_ERR(pdata)) return PTR_ERR(pdata); - adev->dev.platform_data =3D pdata; + dev->platform_data =3D pdata; =20 drvdata =3D devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; =20 - drvdata->dev =3D &adev->dev; + drvdata->dev =3D dev; dev_set_drvdata(dev, drvdata); =20 - drvdata->base =3D devm_ioremap_resource(dev, &adev->res); + ret =3D coresight_get_enable_clocks(dev, &drvdata->pclk, NULL); + if (ret) + return ret; + + drvdata->base =3D devm_ioremap_resource(dev, res); if (IS_ERR(drvdata->base)) return PTR_ERR(drvdata->base); =20 @@ -195,20 +224,31 @@ static int trace_noc_probe(struct amba_device *adev, = const struct amba_id *id) desc.ops =3D &trace_noc_cs_ops; desc.type =3D CORESIGHT_DEV_TYPE_LINK; desc.subtype.link_subtype =3D CORESIGHT_DEV_SUBTYPE_LINK_MERG; - desc.pdata =3D adev->dev.platform_data; - desc.dev =3D &adev->dev; + desc.pdata =3D pdata; + desc.dev =3D dev; desc.access =3D CSDEV_ACCESS_IOMEM(drvdata->base); desc.groups =3D coresight_tnoc_groups; drvdata->csdev =3D coresight_register(&desc); if (IS_ERR(drvdata->csdev)) { - coresight_trace_id_put_system_id(drvdata->atid); + if (drvdata->atid > 0) + coresight_trace_id_put_system_id(drvdata->atid); return PTR_ERR(drvdata->csdev); } - pm_runtime_put(&adev->dev); =20 return 0; } =20 +static int trace_noc_probe(struct amba_device *adev, const struct amba_id = *id) +{ + int ret; + + ret =3D _tnoc_probe(&adev->dev, &adev->res); + if (!ret) + pm_runtime_put(&adev->dev); + + return ret; +} + static void trace_noc_remove(struct amba_device *adev) { struct trace_noc_drvdata *drvdata =3D dev_get_drvdata(&adev->dev); @@ -236,7 +276,58 @@ static struct amba_driver trace_noc_driver =3D { .id_table =3D trace_noc_ids, }; =20 -module_amba_driver(trace_noc_driver); +static int itnoc_probe(struct platform_device *pdev) +{ + struct resource *res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); + int ret; + + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + + ret =3D _tnoc_probe(&pdev->dev, res); + pm_runtime_put(&pdev->dev); + if (ret) + pm_runtime_disable(&pdev->dev); + + return ret; +} + +static void itnoc_remove(struct platform_device *pdev) +{ + struct trace_noc_drvdata *drvdata =3D platform_get_drvdata(pdev); + + coresight_unregister(drvdata->csdev); + pm_runtime_disable(&pdev->dev); +} + +static const struct of_device_id itnoc_of_match[] =3D { + { .compatible =3D "qcom,coresight-itnoc" }, + {} +}; +MODULE_DEVICE_TABLE(of, itnoc_of_match); + +static struct platform_driver itnoc_driver =3D { + .probe =3D itnoc_probe, + .remove =3D itnoc_remove, + .driver =3D { + .name =3D "coresight-itnoc", + .of_match_table =3D itnoc_of_match, + .suppress_bind_attrs =3D true, + }, +}; + +static int __init tnoc_init(void) +{ + return coresight_init_driver("tnoc", &trace_noc_driver, &itnoc_driver, TH= IS_MODULE); +} + +static void __exit tnoc_exit(void) +{ + coresight_remove_driver(&trace_noc_driver, &itnoc_driver); +} +module_init(tnoc_init); +module_exit(tnoc_exit); =20 MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Trace NOC driver"); --=20 2.34.1