From patchwork Wed Feb 5 18:27:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raviteja Laggyshetty X-Patchwork-Id: 862178 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 A6EA91FF61A; Wed, 5 Feb 2025 18:28:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780100; cv=none; b=deIYoBIliLgqV/T7aRaWZaaAmT+azsaofqZnRRWjO4vczE+wJ8nO6jMsYVxMB/eihUS3tM4IuU9AlZrjj1xdmhIMzF7aXdAhhoA4VIIphtezaGxzyD73bDrgbXS8b9iO2s8j2afqyIR+rd8t8SoumxS6Q/Hd9dLmu7pUZlv4pqE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780100; c=relaxed/simple; bh=Wt3WOZtnYx1lYV4UehWviEAJPo6kdFHKlThAHrCrl/E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=vCwZdZTAn19Lgk0Qw+jVHr4Yz9oTjMbZzedzhBnf3yWC8ttS7MbJ72gYKSmiC24J4H3uwALSRs8tdgBGudg/+XyzFogif0Dn4QbSJEbkyKuDW+VAS/tGsPwqfvHm2kRAdmZt3MY+roaYAvXlgh5BJfBS3MNSNho4ztlBGxUVE/k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=QgVzoGt6; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="QgVzoGt6" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 515BOdKn024555; Wed, 5 Feb 2025 18:28:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= I10c2WLWsGvwgGWS0Ooh81W6XZMBlLL0tayi+aKKv3o=; b=QgVzoGt6FfjlCHMf ZtlJ1r6FUAQhXigXPBaGCGwrRREo8pVxH5iu+b1AfqWhsXdXcNiKeCpigmJ+bSbg uXXYt/AZYHy4TXGPIh/+A36YLNhqVlKa2JpkeHQfTihzD2s11gKOZOEdHJa85mLK TZs1EMFVpsaHroajHxhclh1JM0ElUvKNczK2p0ZnldJOeYXbGBGYn6kKTCOIgxkH D7UCdwgPFj7mbKdtx+LXqCR1f5ihu7HyqpgzsrKVg0gl8rWztzNE95dIO6N/4kCO zTcq7COZ5a+uIPpI6Ox2rhio6RB7DrXI1bND4IXsKvqDuuy9R5VYbPtO3GGd5Spj vKl8Bw== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44m73b91y6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Feb 2025 18:28:12 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 515ISBqU007085 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 5 Feb 2025 18:28:11 GMT Received: from c194c8e2f407.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 5 Feb 2025 10:28:07 -0800 From: Raviteja Laggyshetty To: Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio CC: Odelu Kukatla , Mike Tipton , Jeff Johnson , "Andrew Halaney" , Sibi Sankar , , , , Subject: [PATCH V8 1/7] dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P Date: Wed, 5 Feb 2025 18:27:37 +0000 Message-ID: <20250205182743.915-2-quic_rlaggysh@quicinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250205182743.915-1-quic_rlaggysh@quicinc.com> References: <20250205182743.915-1-quic_rlaggysh@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: tGrWX0xoZmKltZicGmgAG_3PlGO5POuj X-Proofpoint-GUID: tGrWX0xoZmKltZicGmgAG_3PlGO5POuj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_06,2025-02-05_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 spamscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=999 priorityscore=1501 mlxscore=0 suspectscore=0 malwarescore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502050141 Add Epoch Subsystem (EPSS) L3 interconnect provider binding on SA8775P SoCs. The L3 instance on the SA8775P SoC is similar to those on SoCs like SM8250 and SC7280. These SoCs use the PERF register instead of L3_REG for programming the performance level, which is managed in the data associated with the target-specific compatibles. Since the hardware remains the same across all EPSS-supporting SoCs, the generic compatible is retained for all SoCs. Signed-off-by: Raviteja Laggyshetty --- Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml b/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml index 4ac0863205b3..cd4bb912e0dc 100644 --- a/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml +++ b/Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml @@ -28,6 +28,7 @@ properties: - const: qcom,osm-l3 - items: - enum: + - qcom,sa8775p-epss-l3 - qcom,sc7280-epss-l3 - qcom,sc8280xp-epss-l3 - qcom,sm6375-cpucp-l3 From patchwork Wed Feb 5 18:27:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raviteja Laggyshetty X-Patchwork-Id: 862620 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 E7D311FFC63; Wed, 5 Feb 2025 18:28:22 +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=1738780104; cv=none; b=sK9QivrmEev3YmPq2jbr2ALfQYw8b+DqJ98yvDGhuQHODREdZ//MqUwdzDIilJhiVb3ZU9T1++3V1qIx5w9IhvDtYUoHvu2td6W0zHfALScKMIQoFDI3m8fLN6zzszxn+yBeBA70QWByn0+XeqZQgtbHpDMv7BgG5NYjwRNeREQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780104; c=relaxed/simple; bh=eNVvjIFGAsvEALustSXjsKe3NcYrWszc4+uIuFGcJEg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=a8swSw7ZvDPsJjBpbz9FrYRTI8zBplTtJfpNDcLTLR9hix7Jzs1dlNorNy+GL1OzQqvSj3fEzzoCPdpzjtIS5HmRv/XnwNex+veYFdjewdQ3LIWI+YyfFTVf3mvGkUwTQ6sk6iiAGsIrnFpUN/KIqpoerEkfEbBf040zoE5EoMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=nT6XX5GE; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="nT6XX5GE" 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 515GqZO5029263; Wed, 5 Feb 2025 18:28:18 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= uRLMXYgGMFgcqLEeRv382JBwvJGd1S7aJ0HM8A4TlpU=; b=nT6XX5GE0Ut/pl/i N4/LGi8cLtueLDUaIJwGTcfKe/tnX0YHb5ZDrJjO9pCAY1PPIq99MTO247AYxRef rskZhUa5YyxxBCv8eUIc5s6toAodeZlCiyW9pdgTkQ8BtdBIhYbwfQGZ8dCat8jV koZ6ig6v8GeamcQ/wo6OinpImH7XvIgKOJ/DzHzMWsofy8peffRblpxVVqenE5YC +lsI4F9Y1GvVKZuly7Khy8lMuP3T72qMWCWkmsJk7LsyMrpZgWagcprcKztI5eaf vAVlltcEi/8N43FV43omu2pAO3eo6pDxan8xkM68c2Z1pHf8MbypisYvX9pg1AUX t70X2g== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44mbw4888e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Feb 2025 18:28:18 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 515ISHhi012201 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 5 Feb 2025 18:28:17 GMT Received: from c194c8e2f407.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 5 Feb 2025 10:28:12 -0800 From: Raviteja Laggyshetty To: Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio CC: Odelu Kukatla , Mike Tipton , Jeff Johnson , "Andrew Halaney" , Sibi Sankar , , , , Subject: [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support Date: Wed, 5 Feb 2025 18:27:38 +0000 Message-ID: <20250205182743.915-3-quic_rlaggysh@quicinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250205182743.915-1-quic_rlaggysh@quicinc.com> References: <20250205182743.915-1-quic_rlaggysh@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: 6u3RgiMob9PPwFn8dLD6VR3tD0ikuQoh X-Proofpoint-ORIG-GUID: 6u3RgiMob9PPwFn8dLD6VR3tD0ikuQoh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_06,2025-02-05_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 suspectscore=0 priorityscore=1501 spamscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 lowpriorityscore=0 mlxscore=0 bulkscore=0 impostorscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502050141 The current interconnect framework relies on static IDs for node creation and registration, which limits topologies with multiple instances of the same interconnect provider. To address this, update the interconnect framework APIs icc_node_create() and icc_link_create() APIs to dynamically allocate IDs for interconnect nodes during creation. This change removes the dependency on static IDs, allowing multiple instances of the same hardware, such as EPSS L3. Signed-off-by: Raviteja Laggyshetty --- drivers/interconnect/core.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index 9d5404a07e8a..40700246f1b6 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c @@ -20,6 +20,8 @@ #include "internal.h" +#define ICC_DYN_ID_START 10000 + #define CREATE_TRACE_POINTS #include "trace.h" @@ -826,7 +828,12 @@ static struct icc_node *icc_node_create_nolock(int id) if (!node) return ERR_PTR(-ENOMEM); - id = idr_alloc(&icc_idr, node, id, id + 1, GFP_KERNEL); + /* negative id indicates dynamic id allocation */ + if (id < 0) + id = idr_alloc(&icc_idr, node, ICC_DYN_ID_START, 0, GFP_KERNEL); + else + id = idr_alloc(&icc_idr, node, id, id + 1, GFP_KERNEL); + if (id < 0) { WARN(1, "%s: couldn't get idr\n", __func__); kfree(node); @@ -962,6 +969,10 @@ void icc_node_add(struct icc_node *node, struct icc_provider *provider) node->avg_bw = node->init_avg; node->peak_bw = node->init_peak; + if (node->id >= ICC_DYN_ID_START) + node->name = devm_kasprintf(provider->dev, GFP_KERNEL, "%s@%s", + node->name, dev_name(provider->dev)); + if (node->avg_bw || node->peak_bw) { if (provider->pre_aggregate) provider->pre_aggregate(node); From patchwork Wed Feb 5 18:27:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raviteja Laggyshetty X-Patchwork-Id: 862177 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 26A4B2066D8; Wed, 5 Feb 2025 18:28:26 +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=1738780108; cv=none; b=UbqKP0vCkJuWSDAsgpyvjpNr3oaFaebCiOWHjnCuHh9sxBZnU+W2mg3LI/OASZjs4kBhCD30SkGBvgbusXB1/gYjGmnBk8b0wLUDweQK/b8wa8hzWJcuNUjzgS1H0hrMj6BnEoqps07sy3zOgEmj5FAegR0stt2uRFHUuhFO4Rw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780108; c=relaxed/simple; bh=FNQ7IxtxT2minTzs/B2LDFRqdrLR0PnL2732GPTqL5o=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lZ6/XR3sG6uVuB64ihTygAR7w0s5GG/eSSciI0emoNY/pln7Y1mGDKEElktnnX+zJd2SamUwVgEdZBeUVm/kfMUMhfZhASa4vZkvein5PLDm1m9aPBQWl7fOx+krLepCGfFWTz3shfmA+I1MEtHDNuKjV71xBJVmflUhO/5cVLE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=DaL2H+yZ; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="DaL2H+yZ" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 515C4Wp7015605; Wed, 5 Feb 2025 18:28:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= lf0Ybz47XKLkEdFkpbvkc19pblW2c8brE5uH7aAxhTU=; b=DaL2H+yZjsZuIxdV n6Z4igKh6aPdyvWOiIYOC+tw433vEHY9Jwp9CgU9whxQqcghP4OPxGWug1mOBx/d jzUuLcCy4Eb6fLijGwyAJq1Ir8BBBoIXO/n9cxJBkWKHqgwEd2WZmPt/+SPC2ddP tl2euyWp9DcnxLrxQdJxOtF8VxPdlW7ts4ifAruq676ExaVcI+JF5eG7DOsGymSk +pMUfC5E3nsQ9VlgKHtH2T1ix4Y2bu5vwsvSe14Ps8DtIf3FKvjbIt7CwKDb2Jn6 azWoxN0VbxuINtBaC2DI2l8GiPBqy3UY8GNAtGPrUG50c98G41u2mDzxns2qq5Ug 3F8iLA== Received: from nasanppmta03.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44m7p38ye2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Feb 2025 18:28:22 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA03.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 515ISL4t012244 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 5 Feb 2025 18:28:21 GMT Received: from c194c8e2f407.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 5 Feb 2025 10:28:17 -0800 From: Raviteja Laggyshetty To: Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio CC: Odelu Kukatla , Mike Tipton , Jeff Johnson , "Andrew Halaney" , Sibi Sankar , , , , Subject: [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support Date: Wed, 5 Feb 2025 18:27:39 +0000 Message-ID: <20250205182743.915-4-quic_rlaggysh@quicinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250205182743.915-1-quic_rlaggysh@quicinc.com> References: <20250205182743.915-1-quic_rlaggysh@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: GC3RFZHm9o6tSrkfQ7AEmZAvdFhulNTD X-Proofpoint-ORIG-GUID: GC3RFZHm9o6tSrkfQ7AEmZAvdFhulNTD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_06,2025-02-05_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1015 suspectscore=0 mlxlogscore=999 impostorscore=0 mlxscore=0 spamscore=0 phishscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502050141 EPSS on SA8775P has two instances, necessitating the creation of two device nodes with different compatibles due to the unique ICC node ID and name limitations in the interconnect framework. Add multidevice support for the OSM-L3 provider to dynamically obtain unique node IDs and register with the framework. Signed-off-by: Raviteja Laggyshetty --- drivers/interconnect/qcom/osm-l3.c | 46 +++++++++++++++++------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/drivers/interconnect/qcom/osm-l3.c b/drivers/interconnect/qcom/osm-l3.c index 6a656ed44d49..da2d82700b5a 100644 --- a/drivers/interconnect/qcom/osm-l3.c +++ b/drivers/interconnect/qcom/osm-l3.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -33,6 +34,7 @@ #define EPSS_REG_PERF_STATE 0x320 #define OSM_L3_MAX_LINKS 1 +#define ALLOC_DYN_ID -1 #define to_osm_l3_provider(_provider) \ container_of(_provider, struct qcom_osm_l3_icc_provider, provider) @@ -55,46 +57,40 @@ struct qcom_osm_l3_icc_provider { */ struct qcom_osm_l3_node { const char *name; - u16 links[OSM_L3_MAX_LINKS]; - u16 id; + struct qcom_osm_l3_node *links[OSM_L3_MAX_LINKS]; + int id; u16 num_links; u16 buswidth; }; struct qcom_osm_l3_desc { - const struct qcom_osm_l3_node * const *nodes; + struct qcom_osm_l3_node * const *nodes; size_t num_nodes; unsigned int lut_row_size; unsigned int reg_freq_lut; unsigned int reg_perf_state; }; -enum { - OSM_L3_MASTER_NODE = 10000, - OSM_L3_SLAVE_NODE, -}; - -#define DEFINE_QNODE(_name, _id, _buswidth, ...) \ - static const struct qcom_osm_l3_node _name = { \ +#define DEFINE_QNODE(_name, _buswidth, ...) \ + static struct qcom_osm_l3_node _name = { \ .name = #_name, \ - .id = _id, \ .buswidth = _buswidth, \ .num_links = COUNT_ARGS(__VA_ARGS__), \ .links = { __VA_ARGS__ }, \ } -DEFINE_QNODE(osm_l3_master, OSM_L3_MASTER_NODE, 16, OSM_L3_SLAVE_NODE); -DEFINE_QNODE(osm_l3_slave, OSM_L3_SLAVE_NODE, 16); +DEFINE_QNODE(osm_l3_slave, 16); +DEFINE_QNODE(osm_l3_master, 16, &osm_l3_slave); -static const struct qcom_osm_l3_node * const osm_l3_nodes[] = { +static struct qcom_osm_l3_node * const osm_l3_nodes[] = { [MASTER_OSM_L3_APPS] = &osm_l3_master, [SLAVE_OSM_L3] = &osm_l3_slave, }; -DEFINE_QNODE(epss_l3_master, OSM_L3_MASTER_NODE, 32, OSM_L3_SLAVE_NODE); -DEFINE_QNODE(epss_l3_slave, OSM_L3_SLAVE_NODE, 32); +DEFINE_QNODE(epss_l3_slave, 32); +DEFINE_QNODE(epss_l3_master, 32, &epss_l3_slave); -static const struct qcom_osm_l3_node * const epss_l3_nodes[] = { +static struct qcom_osm_l3_node * const epss_l3_nodes[] = { [MASTER_EPSS_L3_APPS] = &epss_l3_master, [SLAVE_EPSS_L3_SHARED] = &epss_l3_slave, }; @@ -164,7 +160,7 @@ static int qcom_osm_l3_probe(struct platform_device *pdev) const struct qcom_osm_l3_desc *desc; struct icc_onecell_data *data; struct icc_provider *provider; - const struct qcom_osm_l3_node * const *qnodes; + struct qcom_osm_l3_node * const *qnodes; struct icc_node *node; size_t num_nodes; struct clk *clk; @@ -242,6 +238,10 @@ static int qcom_osm_l3_probe(struct platform_device *pdev) icc_provider_init(provider); + /*Initialize IDs to ALLOC_DYN_ID to indicate dynamic id allocation*/ + for (i = 0; i < num_nodes; i++) + qnodes[i]->id = ALLOC_DYN_ID; + for (i = 0; i < num_nodes; i++) { size_t j; @@ -250,14 +250,19 @@ static int qcom_osm_l3_probe(struct platform_device *pdev) ret = PTR_ERR(node); goto err; } + qnodes[i]->id = node->id; node->name = qnodes[i]->name; /* Cast away const and add it back in qcom_osm_l3_set() */ node->data = (void *)qnodes[i]; icc_node_add(node, provider); - for (j = 0; j < qnodes[i]->num_links; j++) - icc_link_create(node, qnodes[i]->links[j]); + for (j = 0; j < qnodes[i]->num_links; j++) { + struct qcom_osm_l3_node *link_node = qnodes[i]->links[j]; + + icc_link_create(node, link_node->id); + link_node->id = (node->links[node->num_links - 1])->id; + } data->nodes[i] = node; } @@ -278,6 +283,7 @@ static int qcom_osm_l3_probe(struct platform_device *pdev) static const struct of_device_id osm_l3_of_match[] = { { .compatible = "qcom,epss-l3", .data = &epss_l3_l3_vote }, { .compatible = "qcom,osm-l3", .data = &osm_l3 }, + { .compatible = "qcom,sa8775p-epss-l3", .data = &epss_l3_perf_state }, { .compatible = "qcom,sc7180-osm-l3", .data = &osm_l3 }, { .compatible = "qcom,sc7280-epss-l3", .data = &epss_l3_perf_state }, { .compatible = "qcom,sdm845-osm-l3", .data = &osm_l3 }, From patchwork Wed Feb 5 18:27:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raviteja Laggyshetty X-Patchwork-Id: 862619 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 47AAF20FAAB; Wed, 5 Feb 2025 18:28:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780113; cv=none; b=IgD2mOnpPBYi43k75YRmNqYODJ9DY4A3FXONNkfJ8qPAngcxTRN54ebKjF5dO3CuO2Q1ot/X44GahIWghe22IygkJvEx96SkfzNJEbDJhK7Y4XRx3xnV/jvzkUO895tZJDyz/E0JcxVvMoq+GwWnLg7VHvR2WZKjv3+m8bT6kuw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780113; c=relaxed/simple; bh=vHhVnG5kW6lbKXwPHpCSaynYlCCRgtLzp2xiCr5MEMk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OoC/xCsV1wWgHuImnBbPcKpsMdNZAOQp/DyWahoUbp8GJM4xCQ3+XHzHoKntbQe8FqL7r6ddohN1r3k9Nr+mHQT0u1B94TndkaFnmzgb8WnP46KkV07WmYYzg934uj6WD2+6+yBiga2k9DgiJbSnlh4uyjjB80A7ZvOA3a8j1Q4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=MNl3s/00; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="MNl3s/00" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 515FWaZD001694; Wed, 5 Feb 2025 18:28:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= JGXPfmRcBxyZn/L8L7jTYzs6XsomWfsbT2nngtAougw=; b=MNl3s/00VQOD0HQL LPhTwrNOE8BO5eFxGM5+2TlGSBzjJ007TYqzNlrf/F0VcVIeqf4No/ad0JshON4b TbYe4z0uuQSUdVGemYJAejg11equMJmklbzfemXjJvH6Gr9Ya1iFuPgkcpOldEUN 6JoSXHL0rcBrSulBA/vkJlVX1Xx9iu8D41wN5dY5cRj2ooX31STIWVeXqSOIkf1n dCtrvmyweE0nIoSCBjKEQC64aOzsk1eOEmM3FMPoYwbY2rfIfX9whvikX/r2y70O ToJZykzbLZMSCmuX4XXmHnaTxG8okpEO0HvpTbowt17neaY5xzonQNWEYtJAJij3 Rz6ftA== Received: from nasanppmta04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44maqgreu4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Feb 2025 18:28:26 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA04.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 515ISQh5016936 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 5 Feb 2025 18:28:26 GMT Received: from c194c8e2f407.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 5 Feb 2025 10:28:21 -0800 From: Raviteja Laggyshetty To: Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio CC: Odelu Kukatla , Mike Tipton , Jeff Johnson , "Andrew Halaney" , Sibi Sankar , , , , Subject: [PATCH V8 4/7] interconnect: qcom: icc-rpmh: Add dynamic icc node id support Date: Wed, 5 Feb 2025 18:27:40 +0000 Message-ID: <20250205182743.915-5-quic_rlaggysh@quicinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250205182743.915-1-quic_rlaggysh@quicinc.com> References: <20250205182743.915-1-quic_rlaggysh@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: lCq0mdUVImcQM_01nutcj55Eo4VJjDeX X-Proofpoint-ORIG-GUID: lCq0mdUVImcQM_01nutcj55Eo4VJjDeX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_06,2025-02-05_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 mlxlogscore=999 clxscore=1011 phishscore=0 mlxscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502050141 To facilitate dynamic node ID support, the driver now uses node pointers for links instead of static node IDs. Additionally, the default node ID is set to -1 to prompt the ICC framework for dynamic node ID allocation. Signed-off-by: Raviteja Laggyshetty --- drivers/interconnect/qcom/icc-rpmh.c | 16 ++++++++++++++-- drivers/interconnect/qcom/icc-rpmh.h | 3 ++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c index f2d63745be54..2e654917f535 100644 --- a/drivers/interconnect/qcom/icc-rpmh.c +++ b/drivers/interconnect/qcom/icc-rpmh.c @@ -285,13 +285,25 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev) ret = PTR_ERR(node); goto err_remove_nodes; } + qn->id = node->id; node->name = qn->name; node->data = qn; icc_node_add(node, provider); - for (j = 0; j < qn->num_links; j++) - icc_link_create(node, qn->links[j]); + for (j = 0; j < qn->num_links; j++) { + struct qcom_icc_node *qn_link_node = qn->link_nodes[j]; + struct icc_node *link_node; + + if (qn_link_node) { + link_node = icc_node_create(qn_link_node->id); + qn_link_node->id = link_node->id; + icc_link_create(node, qn_link_node->id); + } else { + /* backward compatibility for target using static IDs */ + icc_link_create(node, qn->links[j]); + } + } data->nodes[i] = node; } diff --git a/drivers/interconnect/qcom/icc-rpmh.h b/drivers/interconnect/qcom/icc-rpmh.h index 82344c734091..cf4aa69c707c 100644 --- a/drivers/interconnect/qcom/icc-rpmh.h +++ b/drivers/interconnect/qcom/icc-rpmh.h @@ -95,7 +95,8 @@ struct qcom_icc_qosbox { struct qcom_icc_node { const char *name; u16 links[MAX_LINKS]; - u16 id; + struct qcom_icc_node *link_nodes[MAX_LINKS]; + int id; u16 num_links; u16 channels; u16 buswidth; From patchwork Wed Feb 5 18:27:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raviteja Laggyshetty X-Patchwork-Id: 862618 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 814E31FECC8; Wed, 5 Feb 2025 18:28:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780124; cv=none; b=Cth3qemaoKEaEQO7M7ETp+5/2rxb16mmUayDoMC4N66pT66Sifhgg62oC+5oPgwYyjDildheLE8LhBm5EasmQQ4YmxqsmUR4bHItTgFI3nW7wkIHW96vGj0ADLWg17XvuC1j1TPjk2aufPX0OAt5TT+Q7/jk1s/Qc8OYiPLoz4w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780124; c=relaxed/simple; bh=sCDeZsWyKTFaqA0xzEOIxdRxZ67KDgG8H1MCoPfuUcQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Qwvd5lx8Bj4TjQlNtm1TgVRGPznaxl9sf7gBE/XWKaHmCtNhJ3AI0r8qjdVIh66IqXoWsBW9M2N/8WlcfH3Yyvd97KTHGOqbq6ZybWkN4yVS+739O4+63zXmNiL6/cG/9d0+eF9ChdJZeUCT4N/VsR+zCv5LPwavxe1Y+XcvmOI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=biyg5r16; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="biyg5r16" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 515HdWON031436; Wed, 5 Feb 2025 18:28:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Xa7EsIzbnfx+BbSvzLsnudbUjdwmABNOkNaLSj/LzB0=; b=biyg5r16/wYw+eV5 I6REo3imo3x3SyoH3bLHUkvJw0DY9jWOGrS4QFuqu4kagtzmIDdYmdE7YoNbQ/QR 4J9uqJw2cZp1PKki5MGlW6YtrYmhlzEKAdH4uN07ivz5VJWB4+evyG2+8NM65LU7 wuRA8K2GMDqEZ2iCASgrhTVHr6tHGxx/v0MBUjSzR1x2Z499oDi7Rr7ID/1gDG5A Oc/L3CZtj4aYN/3hj++KYb/PmD2RDtLIhjrs2RlryYjy5N+9OPuEFmHrBT2JeCPQ /LUvCZgAyuhUZrgmBYiQPf0/4GdjQnuVQ6MxBPVNoIiTbmhDrKtqgEU3vs5ls0Gt 68BjaA== Received: from nasanppmta02.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44mck3g4k0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Feb 2025 18:28:32 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA02.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 515ISVtp030508 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 5 Feb 2025 18:28:31 GMT Received: from c194c8e2f407.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 5 Feb 2025 10:28:26 -0800 From: Raviteja Laggyshetty To: Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio CC: Odelu Kukatla , Mike Tipton , Jeff Johnson , "Andrew Halaney" , Sibi Sankar , , , , Subject: [PATCH V8 5/7] interconnect: qcom: sa8775p: Add dynamic icc node id support Date: Wed, 5 Feb 2025 18:27:41 +0000 Message-ID: <20250205182743.915-6-quic_rlaggysh@quicinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250205182743.915-1-quic_rlaggysh@quicinc.com> References: <20250205182743.915-1-quic_rlaggysh@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: lIW8pfGJWP5bBhn8J8LCNSuPHH2xPJfu X-Proofpoint-ORIG-GUID: lIW8pfGJWP5bBhn8J8LCNSuPHH2xPJfu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_06,2025-02-05_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 phishscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 adultscore=0 clxscore=1011 bulkscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502050140 Discard the static IDs from node data and set the default node ID to -1 to indicate the for dynamic ID allocation. Update the topology to use node pointers for links instead of static IDs, and rearrange the node definitions to avoid undefined references. Signed-off-by: Raviteja Laggyshetty --- drivers/interconnect/qcom/sa8775p.c | 2194 ++++++++++++--------------- 1 file changed, 962 insertions(+), 1232 deletions(-) diff --git a/drivers/interconnect/qcom/sa8775p.c b/drivers/interconnect/qcom/sa8775p.c index e2826af3ea2e..f666a24851a6 100644 --- a/drivers/interconnect/qcom/sa8775p.c +++ b/drivers/interconnect/qcom/sa8775p.c @@ -15,1861 +15,1591 @@ #include "bcm-voter.h" #include "icc-rpmh.h" -#define SA8775P_MASTER_GPU_TCU 0 -#define SA8775P_MASTER_PCIE_TCU 1 -#define SA8775P_MASTER_SYS_TCU 2 -#define SA8775P_MASTER_APPSS_PROC 3 -#define SA8775P_MASTER_LLCC 4 -#define SA8775P_MASTER_CNOC_LPASS_AG_NOC 5 -#define SA8775P_MASTER_GIC_AHB 6 -#define SA8775P_MASTER_CDSP_NOC_CFG 7 -#define SA8775P_MASTER_CDSPB_NOC_CFG 8 -#define SA8775P_MASTER_QDSS_BAM 9 -#define SA8775P_MASTER_QUP_0 10 -#define SA8775P_MASTER_QUP_1 11 -#define SA8775P_MASTER_QUP_2 12 -#define SA8775P_MASTER_A1NOC_SNOC 13 -#define SA8775P_MASTER_A2NOC_SNOC 14 -#define SA8775P_MASTER_CAMNOC_HF 15 -#define SA8775P_MASTER_CAMNOC_ICP 16 -#define SA8775P_MASTER_CAMNOC_SF 17 -#define SA8775P_MASTER_COMPUTE_NOC 18 -#define SA8775P_MASTER_COMPUTE_NOC_1 19 -#define SA8775P_MASTER_CNOC_A2NOC 20 -#define SA8775P_MASTER_CNOC_DC_NOC 21 -#define SA8775P_MASTER_GEM_NOC_CFG 22 -#define SA8775P_MASTER_GEM_NOC_CNOC 23 -#define SA8775P_MASTER_GEM_NOC_PCIE_SNOC 24 -#define SA8775P_MASTER_GPDSP_SAIL 25 -#define SA8775P_MASTER_GFX3D 26 -#define SA8775P_MASTER_LPASS_ANOC 27 -#define SA8775P_MASTER_MDP0 28 -#define SA8775P_MASTER_MDP1 29 -#define SA8775P_MASTER_MDP_CORE1_0 30 -#define SA8775P_MASTER_MDP_CORE1_1 31 -#define SA8775P_MASTER_MNOC_HF_MEM_NOC 32 -#define SA8775P_MASTER_CNOC_MNOC_HF_CFG 33 -#define SA8775P_MASTER_MNOC_SF_MEM_NOC 34 -#define SA8775P_MASTER_CNOC_MNOC_SF_CFG 35 -#define SA8775P_MASTER_ANOC_PCIE_GEM_NOC 36 -#define SA8775P_MASTER_SNOC_CFG 37 -#define SA8775P_MASTER_SNOC_GC_MEM_NOC 38 -#define SA8775P_MASTER_SNOC_SF_MEM_NOC 39 -#define SA8775P_MASTER_VIDEO_P0 40 -#define SA8775P_MASTER_VIDEO_P1 41 -#define SA8775P_MASTER_VIDEO_PROC 42 -#define SA8775P_MASTER_VIDEO_V_PROC 43 -#define SA8775P_MASTER_QUP_CORE_0 44 -#define SA8775P_MASTER_QUP_CORE_1 45 -#define SA8775P_MASTER_QUP_CORE_2 46 -#define SA8775P_MASTER_QUP_CORE_3 47 -#define SA8775P_MASTER_CRYPTO_CORE0 48 -#define SA8775P_MASTER_CRYPTO_CORE1 49 -#define SA8775P_MASTER_DSP0 50 -#define SA8775P_MASTER_DSP1 51 -#define SA8775P_MASTER_IPA 52 -#define SA8775P_MASTER_LPASS_PROC 53 -#define SA8775P_MASTER_CDSP_PROC 54 -#define SA8775P_MASTER_CDSP_PROC_B 55 -#define SA8775P_MASTER_PIMEM 56 -#define SA8775P_MASTER_QUP_3 57 -#define SA8775P_MASTER_EMAC 58 -#define SA8775P_MASTER_EMAC_1 59 -#define SA8775P_MASTER_GIC 60 -#define SA8775P_MASTER_PCIE_0 61 -#define SA8775P_MASTER_PCIE_1 62 -#define SA8775P_MASTER_QDSS_ETR_0 63 -#define SA8775P_MASTER_QDSS_ETR_1 64 -#define SA8775P_MASTER_SDC 65 -#define SA8775P_MASTER_UFS_CARD 66 -#define SA8775P_MASTER_UFS_MEM 67 -#define SA8775P_MASTER_USB2 68 -#define SA8775P_MASTER_USB3_0 69 -#define SA8775P_MASTER_USB3_1 70 -#define SA8775P_SLAVE_EBI1 512 -#define SA8775P_SLAVE_AHB2PHY_0 513 -#define SA8775P_SLAVE_AHB2PHY_1 514 -#define SA8775P_SLAVE_AHB2PHY_2 515 -#define SA8775P_SLAVE_AHB2PHY_3 516 -#define SA8775P_SLAVE_ANOC_THROTTLE_CFG 517 -#define SA8775P_SLAVE_AOSS 518 -#define SA8775P_SLAVE_APPSS 519 -#define SA8775P_SLAVE_BOOT_ROM 520 -#define SA8775P_SLAVE_CAMERA_CFG 521 -#define SA8775P_SLAVE_CAMERA_NRT_THROTTLE_CFG 522 -#define SA8775P_SLAVE_CAMERA_RT_THROTTLE_CFG 523 -#define SA8775P_SLAVE_CLK_CTL 524 -#define SA8775P_SLAVE_CDSP_CFG 525 -#define SA8775P_SLAVE_CDSP1_CFG 526 -#define SA8775P_SLAVE_RBCPR_CX_CFG 527 -#define SA8775P_SLAVE_RBCPR_MMCX_CFG 528 -#define SA8775P_SLAVE_RBCPR_MX_CFG 529 -#define SA8775P_SLAVE_CPR_NSPCX 530 -#define SA8775P_SLAVE_CRYPTO_0_CFG 531 -#define SA8775P_SLAVE_CX_RDPM 532 -#define SA8775P_SLAVE_DISPLAY_CFG 533 -#define SA8775P_SLAVE_DISPLAY_RT_THROTTLE_CFG 534 -#define SA8775P_SLAVE_DISPLAY1_CFG 535 -#define SA8775P_SLAVE_DISPLAY1_RT_THROTTLE_CFG 536 -#define SA8775P_SLAVE_EMAC_CFG 537 -#define SA8775P_SLAVE_EMAC1_CFG 538 -#define SA8775P_SLAVE_GP_DSP0_CFG 539 -#define SA8775P_SLAVE_GP_DSP1_CFG 540 -#define SA8775P_SLAVE_GPDSP0_THROTTLE_CFG 541 -#define SA8775P_SLAVE_GPDSP1_THROTTLE_CFG 542 -#define SA8775P_SLAVE_GPU_TCU_THROTTLE_CFG 543 -#define SA8775P_SLAVE_GFX3D_CFG 544 -#define SA8775P_SLAVE_HWKM 545 -#define SA8775P_SLAVE_IMEM_CFG 546 -#define SA8775P_SLAVE_IPA_CFG 547 -#define SA8775P_SLAVE_IPC_ROUTER_CFG 548 -#define SA8775P_SLAVE_LLCC_CFG 549 -#define SA8775P_SLAVE_LPASS 550 -#define SA8775P_SLAVE_LPASS_CORE_CFG 551 -#define SA8775P_SLAVE_LPASS_LPI_CFG 552 -#define SA8775P_SLAVE_LPASS_MPU_CFG 553 -#define SA8775P_SLAVE_LPASS_THROTTLE_CFG 554 -#define SA8775P_SLAVE_LPASS_TOP_CFG 555 -#define SA8775P_SLAVE_MX_RDPM 556 -#define SA8775P_SLAVE_MXC_RDPM 557 -#define SA8775P_SLAVE_PCIE_0_CFG 558 -#define SA8775P_SLAVE_PCIE_1_CFG 559 -#define SA8775P_SLAVE_PCIE_RSC_CFG 560 -#define SA8775P_SLAVE_PCIE_TCU_THROTTLE_CFG 561 -#define SA8775P_SLAVE_PCIE_THROTTLE_CFG 562 -#define SA8775P_SLAVE_PDM 563 -#define SA8775P_SLAVE_PIMEM_CFG 564 -#define SA8775P_SLAVE_PKA_WRAPPER_CFG 565 -#define SA8775P_SLAVE_QDSS_CFG 566 -#define SA8775P_SLAVE_QM_CFG 567 -#define SA8775P_SLAVE_QM_MPU_CFG 568 -#define SA8775P_SLAVE_QUP_0 569 -#define SA8775P_SLAVE_QUP_1 570 -#define SA8775P_SLAVE_QUP_2 571 -#define SA8775P_SLAVE_QUP_3 572 -#define SA8775P_SLAVE_SAIL_THROTTLE_CFG 573 -#define SA8775P_SLAVE_SDC1 574 -#define SA8775P_SLAVE_SECURITY 575 -#define SA8775P_SLAVE_SNOC_THROTTLE_CFG 576 -#define SA8775P_SLAVE_TCSR 577 -#define SA8775P_SLAVE_TLMM 578 -#define SA8775P_SLAVE_TSC_CFG 579 -#define SA8775P_SLAVE_UFS_CARD_CFG 580 -#define SA8775P_SLAVE_UFS_MEM_CFG 581 -#define SA8775P_SLAVE_USB2 582 -#define SA8775P_SLAVE_USB3_0 583 -#define SA8775P_SLAVE_USB3_1 584 -#define SA8775P_SLAVE_VENUS_CFG 585 -#define SA8775P_SLAVE_VENUS_CVP_THROTTLE_CFG 586 -#define SA8775P_SLAVE_VENUS_V_CPU_THROTTLE_CFG 587 -#define SA8775P_SLAVE_VENUS_VCODEC_THROTTLE_CFG 588 -#define SA8775P_SLAVE_A1NOC_SNOC 589 -#define SA8775P_SLAVE_A2NOC_SNOC 590 -#define SA8775P_SLAVE_DDRSS_CFG 591 -#define SA8775P_SLAVE_GEM_NOC_CNOC 592 -#define SA8775P_SLAVE_GEM_NOC_CFG 593 -#define SA8775P_SLAVE_SNOC_GEM_NOC_GC 594 -#define SA8775P_SLAVE_SNOC_GEM_NOC_SF 595 -#define SA8775P_SLAVE_GP_DSP_SAIL_NOC 596 -#define SA8775P_SLAVE_GPDSP_NOC_CFG 597 -#define SA8775P_SLAVE_HCP_A 598 -#define SA8775P_SLAVE_LLCC 599 -#define SA8775P_SLAVE_MNOC_HF_MEM_NOC 600 -#define SA8775P_SLAVE_MNOC_SF_MEM_NOC 601 -#define SA8775P_SLAVE_CNOC_MNOC_HF_CFG 602 -#define SA8775P_SLAVE_CNOC_MNOC_SF_CFG 603 -#define SA8775P_SLAVE_CDSP_MEM_NOC 604 -#define SA8775P_SLAVE_CDSPB_MEM_NOC 605 -#define SA8775P_SLAVE_HCP_B 606 -#define SA8775P_SLAVE_GEM_NOC_PCIE_CNOC 607 -#define SA8775P_SLAVE_PCIE_ANOC_CFG 608 -#define SA8775P_SLAVE_ANOC_PCIE_GEM_NOC 609 -#define SA8775P_SLAVE_SNOC_CFG 610 -#define SA8775P_SLAVE_LPASS_SNOC 611 -#define SA8775P_SLAVE_QUP_CORE_0 612 -#define SA8775P_SLAVE_QUP_CORE_1 613 -#define SA8775P_SLAVE_QUP_CORE_2 614 -#define SA8775P_SLAVE_QUP_CORE_3 615 -#define SA8775P_SLAVE_BOOT_IMEM 616 -#define SA8775P_SLAVE_IMEM 617 -#define SA8775P_SLAVE_PIMEM 618 -#define SA8775P_SLAVE_SERVICE_NSP_NOC 619 -#define SA8775P_SLAVE_SERVICE_NSPB_NOC 620 -#define SA8775P_SLAVE_SERVICE_GEM_NOC_1 621 -#define SA8775P_SLAVE_SERVICE_MNOC_HF 622 -#define SA8775P_SLAVE_SERVICE_MNOC_SF 623 -#define SA8775P_SLAVE_SERVICES_LPASS_AML_NOC 624 -#define SA8775P_SLAVE_SERVICE_LPASS_AG_NOC 625 -#define SA8775P_SLAVE_SERVICE_GEM_NOC_2 626 -#define SA8775P_SLAVE_SERVICE_SNOC 627 -#define SA8775P_SLAVE_SERVICE_GEM_NOC 628 -#define SA8775P_SLAVE_SERVICE_GEM_NOC2 629 -#define SA8775P_SLAVE_PCIE_0 630 -#define SA8775P_SLAVE_PCIE_1 631 -#define SA8775P_SLAVE_QDSS_STM 632 -#define SA8775P_SLAVE_TCU 633 +#define ALLOC_DYN_ID -1 -static struct qcom_icc_node qxm_qup3 = { - .name = "qxm_qup3", - .id = SA8775P_MASTER_QUP_3, - .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, -}; -static struct qcom_icc_node xm_emac_0 = { - .name = "xm_emac_0", - .id = SA8775P_MASTER_EMAC, +static struct qcom_icc_node qup0_core_slave = { + .name = "qup0_core_slave", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_emac_1 = { - .name = "xm_emac_1", - .id = SA8775P_MASTER_EMAC_1, +static struct qcom_icc_node qup1_core_slave = { + .name = "qup1_core_slave", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_sdc1 = { - .name = "xm_sdc1", - .id = SA8775P_MASTER_SDC, +static struct qcom_icc_node qup2_core_slave = { + .name = "qup2_core_slave", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_ufs_mem = { - .name = "xm_ufs_mem", - .id = SA8775P_MASTER_UFS_MEM, +static struct qcom_icc_node qup3_core_slave = { + .name = "qup3_core_slave", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_usb2_2 = { - .name = "xm_usb2_2", - .id = SA8775P_MASTER_USB2, +static struct qcom_icc_node qhs_ahb2phy0 = { + .name = "qhs_ahb2phy0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_usb3_0 = { - .name = "xm_usb3_0", - .id = SA8775P_MASTER_USB3_0, +static struct qcom_icc_node qhs_ahb2phy1 = { + .name = "qhs_ahb2phy1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_usb3_1 = { - .name = "xm_usb3_1", - .id = SA8775P_MASTER_USB3_1, +static struct qcom_icc_node qhs_ahb2phy2 = { + .name = "qhs_ahb2phy2", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qhm_qdss_bam = { - .name = "qhm_qdss_bam", - .id = SA8775P_MASTER_QDSS_BAM, +static struct qcom_icc_node qhs_ahb2phy3 = { + .name = "qhs_ahb2phy3", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, }; -static struct qcom_icc_node qhm_qup0 = { - .name = "qhm_qup0", - .id = SA8775P_MASTER_QUP_0, +static struct qcom_icc_node qhs_anoc_throttle_cfg = { + .name = "qhs_anoc_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, }; -static struct qcom_icc_node qhm_qup1 = { - .name = "qhm_qup1", - .id = SA8775P_MASTER_QUP_1, +static struct qcom_icc_node qhs_aoss = { + .name = "qhs_aoss", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, }; -static struct qcom_icc_node qhm_qup2 = { - .name = "qhm_qup2", - .id = SA8775P_MASTER_QUP_2, +static struct qcom_icc_node qhs_apss = { + .name = "qhs_apss", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 8, }; -static struct qcom_icc_node qnm_cnoc_datapath = { - .name = "qnm_cnoc_datapath", - .id = SA8775P_MASTER_CNOC_A2NOC, +static struct qcom_icc_node qhs_boot_rom = { + .name = "qhs_boot_rom", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_crypto_0 = { - .name = "qxm_crypto_0", - .id = SA8775P_MASTER_CRYPTO_CORE0, +static struct qcom_icc_node qhs_camera_cfg = { + .name = "qhs_camera_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_crypto_1 = { - .name = "qxm_crypto_1", - .id = SA8775P_MASTER_CRYPTO_CORE1, +static struct qcom_icc_node qhs_camera_nrt_throttle_cfg = { + .name = "qhs_camera_nrt_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_ipa = { - .name = "qxm_ipa", - .id = SA8775P_MASTER_IPA, +static struct qcom_icc_node qhs_camera_rt_throttle_cfg = { + .name = "qhs_camera_rt_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_qdss_etr_0 = { - .name = "xm_qdss_etr_0", - .id = SA8775P_MASTER_QDSS_ETR_0, +static struct qcom_icc_node qhs_clk_ctl = { + .name = "qhs_clk_ctl", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_qdss_etr_1 = { - .name = "xm_qdss_etr_1", - .id = SA8775P_MASTER_QDSS_ETR_1, +static struct qcom_icc_node qhs_cpr_cx = { + .name = "qhs_cpr_cx", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_ufs_card = { - .name = "xm_ufs_card", - .id = SA8775P_MASTER_UFS_CARD, +static struct qcom_icc_node qhs_cpr_mmcx = { + .name = "qhs_cpr_mmcx", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qup0_core_master = { - .name = "qup0_core_master", - .id = SA8775P_MASTER_QUP_CORE_0, +static struct qcom_icc_node qhs_cpr_mx = { + .name = "qhs_cpr_mx", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_QUP_CORE_0 }, }; -static struct qcom_icc_node qup1_core_master = { - .name = "qup1_core_master", - .id = SA8775P_MASTER_QUP_CORE_1, +static struct qcom_icc_node qhs_cpr_nspcx = { + .name = "qhs_cpr_nspcx", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_QUP_CORE_1 }, }; -static struct qcom_icc_node qup2_core_master = { - .name = "qup2_core_master", - .id = SA8775P_MASTER_QUP_CORE_2, +static struct qcom_icc_node qhs_crypto0_cfg = { + .name = "qhs_crypto0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_QUP_CORE_2 }, }; -static struct qcom_icc_node qup3_core_master = { - .name = "qup3_core_master", - .id = SA8775P_MASTER_QUP_CORE_3, +static struct qcom_icc_node qhs_cx_rdpm = { + .name = "qhs_cx_rdpm", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_QUP_CORE_3 }, }; -static struct qcom_icc_node qnm_gemnoc_cnoc = { - .name = "qnm_gemnoc_cnoc", - .id = SA8775P_MASTER_GEM_NOC_CNOC, +static struct qcom_icc_node qhs_display0_cfg = { + .name = "qhs_display0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 82, - .links = { SA8775P_SLAVE_AHB2PHY_0, - SA8775P_SLAVE_AHB2PHY_1, - SA8775P_SLAVE_AHB2PHY_2, - SA8775P_SLAVE_AHB2PHY_3, - SA8775P_SLAVE_ANOC_THROTTLE_CFG, - SA8775P_SLAVE_AOSS, - SA8775P_SLAVE_APPSS, - SA8775P_SLAVE_BOOT_ROM, - SA8775P_SLAVE_CAMERA_CFG, - SA8775P_SLAVE_CAMERA_NRT_THROTTLE_CFG, - SA8775P_SLAVE_CAMERA_RT_THROTTLE_CFG, - SA8775P_SLAVE_CLK_CTL, - SA8775P_SLAVE_CDSP_CFG, - SA8775P_SLAVE_CDSP1_CFG, - SA8775P_SLAVE_RBCPR_CX_CFG, - SA8775P_SLAVE_RBCPR_MMCX_CFG, - SA8775P_SLAVE_RBCPR_MX_CFG, - SA8775P_SLAVE_CPR_NSPCX, - SA8775P_SLAVE_CRYPTO_0_CFG, - SA8775P_SLAVE_CX_RDPM, - SA8775P_SLAVE_DISPLAY_CFG, - SA8775P_SLAVE_DISPLAY_RT_THROTTLE_CFG, - SA8775P_SLAVE_DISPLAY1_CFG, - SA8775P_SLAVE_DISPLAY1_RT_THROTTLE_CFG, - SA8775P_SLAVE_EMAC_CFG, - SA8775P_SLAVE_EMAC1_CFG, - SA8775P_SLAVE_GP_DSP0_CFG, - SA8775P_SLAVE_GP_DSP1_CFG, - SA8775P_SLAVE_GPDSP0_THROTTLE_CFG, - SA8775P_SLAVE_GPDSP1_THROTTLE_CFG, - SA8775P_SLAVE_GPU_TCU_THROTTLE_CFG, - SA8775P_SLAVE_GFX3D_CFG, - SA8775P_SLAVE_HWKM, - SA8775P_SLAVE_IMEM_CFG, - SA8775P_SLAVE_IPA_CFG, - SA8775P_SLAVE_IPC_ROUTER_CFG, - SA8775P_SLAVE_LPASS, - SA8775P_SLAVE_LPASS_THROTTLE_CFG, - SA8775P_SLAVE_MX_RDPM, - SA8775P_SLAVE_MXC_RDPM, - SA8775P_SLAVE_PCIE_0_CFG, - SA8775P_SLAVE_PCIE_1_CFG, - SA8775P_SLAVE_PCIE_RSC_CFG, - SA8775P_SLAVE_PCIE_TCU_THROTTLE_CFG, - SA8775P_SLAVE_PCIE_THROTTLE_CFG, - SA8775P_SLAVE_PDM, - SA8775P_SLAVE_PIMEM_CFG, - SA8775P_SLAVE_PKA_WRAPPER_CFG, - SA8775P_SLAVE_QDSS_CFG, - SA8775P_SLAVE_QM_CFG, - SA8775P_SLAVE_QM_MPU_CFG, - SA8775P_SLAVE_QUP_0, - SA8775P_SLAVE_QUP_1, - SA8775P_SLAVE_QUP_2, - SA8775P_SLAVE_QUP_3, - SA8775P_SLAVE_SAIL_THROTTLE_CFG, - SA8775P_SLAVE_SDC1, - SA8775P_SLAVE_SECURITY, - SA8775P_SLAVE_SNOC_THROTTLE_CFG, - SA8775P_SLAVE_TCSR, - SA8775P_SLAVE_TLMM, - SA8775P_SLAVE_TSC_CFG, - SA8775P_SLAVE_UFS_CARD_CFG, - SA8775P_SLAVE_UFS_MEM_CFG, - SA8775P_SLAVE_USB2, - SA8775P_SLAVE_USB3_0, - SA8775P_SLAVE_USB3_1, - SA8775P_SLAVE_VENUS_CFG, - SA8775P_SLAVE_VENUS_CVP_THROTTLE_CFG, - SA8775P_SLAVE_VENUS_V_CPU_THROTTLE_CFG, - SA8775P_SLAVE_VENUS_VCODEC_THROTTLE_CFG, - SA8775P_SLAVE_DDRSS_CFG, - SA8775P_SLAVE_GPDSP_NOC_CFG, - SA8775P_SLAVE_CNOC_MNOC_HF_CFG, - SA8775P_SLAVE_CNOC_MNOC_SF_CFG, - SA8775P_SLAVE_PCIE_ANOC_CFG, - SA8775P_SLAVE_SNOC_CFG, - SA8775P_SLAVE_BOOT_IMEM, - SA8775P_SLAVE_IMEM, - SA8775P_SLAVE_PIMEM, - SA8775P_SLAVE_QDSS_STM, - SA8775P_SLAVE_TCU - }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_gemnoc_pcie = { - .name = "qnm_gemnoc_pcie", - .id = SA8775P_MASTER_GEM_NOC_PCIE_SNOC, +static struct qcom_icc_node qhs_display0_rt_throttle_cfg = { + .name = "qhs_display0_rt_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 2, - .links = { SA8775P_SLAVE_PCIE_0, - SA8775P_SLAVE_PCIE_1 - }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_cnoc_dc_noc = { - .name = "qnm_cnoc_dc_noc", - .id = SA8775P_MASTER_CNOC_DC_NOC, +static struct qcom_icc_node qhs_display1_cfg = { + .name = "qhs_display1_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 2, - .links = { SA8775P_SLAVE_LLCC_CFG, - SA8775P_SLAVE_GEM_NOC_CFG - }, }; -static struct qcom_icc_node alm_gpu_tcu = { - .name = "alm_gpu_tcu", - .id = SA8775P_MASTER_GPU_TCU, +static struct qcom_icc_node qhs_display1_rt_throttle_cfg = { + .name = "qhs_display1_rt_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node alm_pcie_tcu = { - .name = "alm_pcie_tcu", - .id = SA8775P_MASTER_PCIE_TCU, +static struct qcom_icc_node qhs_emac0_cfg = { + .name = "qhs_emac0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node alm_sys_tcu = { - .name = "alm_sys_tcu", - .id = SA8775P_MASTER_SYS_TCU, +static struct qcom_icc_node qhs_emac1_cfg = { + .name = "qhs_emac1_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node chm_apps = { - .name = "chm_apps", - .id = SA8775P_MASTER_APPSS_PROC, - .channels = 4, - .buswidth = 32, - .num_links = 3, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC, - SA8775P_SLAVE_GEM_NOC_PCIE_CNOC - }, +static struct qcom_icc_node qhs_gp_dsp0_cfg = { + .name = "qhs_gp_dsp0_cfg", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 4, }; -static struct qcom_icc_node qnm_cmpnoc0 = { - .name = "qnm_cmpnoc0", - .id = SA8775P_MASTER_COMPUTE_NOC, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, +static struct qcom_icc_node qhs_gp_dsp1_cfg = { + .name = "qhs_gp_dsp1_cfg", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 4, }; -static struct qcom_icc_node qnm_cmpnoc1 = { - .name = "qnm_cmpnoc1", - .id = SA8775P_MASTER_COMPUTE_NOC_1, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, +static struct qcom_icc_node qhs_gpdsp0_throttle_cfg = { + .name = "qhs_gpdsp0_throttle_cfg", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 4, }; -static struct qcom_icc_node qnm_gemnoc_cfg = { - .name = "qnm_gemnoc_cfg", - .id = SA8775P_MASTER_GEM_NOC_CFG, +static struct qcom_icc_node qhs_gpdsp1_throttle_cfg = { + .name = "qhs_gpdsp1_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 4, - .links = { SA8775P_SLAVE_SERVICE_GEM_NOC_1, - SA8775P_SLAVE_SERVICE_GEM_NOC_2, - SA8775P_SLAVE_SERVICE_GEM_NOC, - SA8775P_SLAVE_SERVICE_GEM_NOC2 - }, }; -static struct qcom_icc_node qnm_gpdsp_sail = { - .name = "qnm_gpdsp_sail", - .id = SA8775P_MASTER_GPDSP_SAIL, +static struct qcom_icc_node qhs_gpu_tcu_throttle_cfg = { + .name = "qhs_gpu_tcu_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_gpu = { - .name = "qnm_gpu", - .id = SA8775P_MASTER_GFX3D, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, +static struct qcom_icc_node qhs_gpuss_cfg = { + .name = "qhs_gpuss_cfg", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 8, }; -static struct qcom_icc_node qnm_mnoc_hf = { - .name = "qnm_mnoc_hf", - .id = SA8775P_MASTER_MNOC_HF_MEM_NOC, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_LLCC, - SA8775P_SLAVE_GEM_NOC_PCIE_CNOC - }, +static struct qcom_icc_node qhs_hwkm = { + .name = "qhs_hwkm", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mnoc_sf = { - .name = "qnm_mnoc_sf", - .id = SA8775P_MASTER_MNOC_SF_MEM_NOC, - .channels = 2, - .buswidth = 32, - .num_links = 3, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC, - SA8775P_SLAVE_GEM_NOC_PCIE_CNOC - }, -}; - -static struct qcom_icc_node qnm_pcie = { - .name = "qnm_pcie", - .id = SA8775P_MASTER_ANOC_PCIE_GEM_NOC, +static struct qcom_icc_node qhs_imem_cfg = { + .name = "qhs_imem_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC - }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_snoc_gc = { - .name = "qnm_snoc_gc", - .id = SA8775P_MASTER_SNOC_GC_MEM_NOC, +static struct qcom_icc_node qhs_ipa = { + .name = "qhs_ipa", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_LLCC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_snoc_sf = { - .name = "qnm_snoc_sf", - .id = SA8775P_MASTER_SNOC_SF_MEM_NOC, +static struct qcom_icc_node qhs_ipc_router = { + .name = "qhs_ipc_router", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 3, - .links = { SA8775P_SLAVE_GEM_NOC_CNOC, - SA8775P_SLAVE_LLCC, - SA8775P_SLAVE_GEM_NOC_PCIE_CNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_dsp0 = { - .name = "qxm_dsp0", - .id = SA8775P_MASTER_DSP0, +static struct qcom_icc_node qhs_lpass_throttle_cfg = { + .name = "qhs_lpass_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_GP_DSP_SAIL_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qxm_dsp1 = { - .name = "qxm_dsp1", - .id = SA8775P_MASTER_DSP1, +static struct qcom_icc_node qhs_mx_rdpm = { + .name = "qhs_mx_rdpm", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_GP_DSP_SAIL_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qhm_config_noc = { - .name = "qhm_config_noc", - .id = SA8775P_MASTER_CNOC_LPASS_AG_NOC, +static struct qcom_icc_node qhs_mxc_rdpm = { + .name = "qhs_mxc_rdpm", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 6, - .links = { SA8775P_SLAVE_LPASS_CORE_CFG, - SA8775P_SLAVE_LPASS_LPI_CFG, - SA8775P_SLAVE_LPASS_MPU_CFG, - SA8775P_SLAVE_LPASS_TOP_CFG, - SA8775P_SLAVE_SERVICES_LPASS_AML_NOC, - SA8775P_SLAVE_SERVICE_LPASS_AG_NOC - }, }; -static struct qcom_icc_node qxm_lpass_dsp = { - .name = "qxm_lpass_dsp", - .id = SA8775P_MASTER_LPASS_PROC, +static struct qcom_icc_node qhs_pcie0_cfg = { + .name = "qhs_pcie0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 4, - .links = { SA8775P_SLAVE_LPASS_TOP_CFG, - SA8775P_SLAVE_LPASS_SNOC, - SA8775P_SLAVE_SERVICES_LPASS_AML_NOC, - SA8775P_SLAVE_SERVICE_LPASS_AG_NOC - }, -}; - -static struct qcom_icc_node llcc_mc = { - .name = "llcc_mc", - .id = SA8775P_MASTER_LLCC, - .channels = 8, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_EBI1 }, }; -static struct qcom_icc_node qnm_camnoc_hf = { - .name = "qnm_camnoc_hf", - .id = SA8775P_MASTER_CAMNOC_HF, +static struct qcom_icc_node qhs_pcie1_cfg = { + .name = "qhs_pcie1_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_camnoc_icp = { - .name = "qnm_camnoc_icp", - .id = SA8775P_MASTER_CAMNOC_ICP, +static struct qcom_icc_node qhs_pcie_rsc_cfg = { + .name = "qhs_pcie_rsc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_camnoc_sf = { - .name = "qnm_camnoc_sf", - .id = SA8775P_MASTER_CAMNOC_SF, +static struct qcom_icc_node qhs_pcie_tcu_throttle_cfg = { + .name = "qhs_pcie_tcu_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mdp0_0 = { - .name = "qnm_mdp0_0", - .id = SA8775P_MASTER_MDP0, +static struct qcom_icc_node qhs_pcie_throttle_cfg = { + .name = "qhs_pcie_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mdp0_1 = { - .name = "qnm_mdp0_1", - .id = SA8775P_MASTER_MDP1, +static struct qcom_icc_node qhs_pdm = { + .name = "qhs_pdm", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mdp1_0 = { - .name = "qnm_mdp1_0", - .id = SA8775P_MASTER_MDP_CORE1_0, +static struct qcom_icc_node qhs_pimem_cfg = { + .name = "qhs_pimem_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mdp1_1 = { - .name = "qnm_mdp1_1", - .id = SA8775P_MASTER_MDP_CORE1_1, +static struct qcom_icc_node qhs_pke_wrapper_cfg = { + .name = "qhs_pke_wrapper_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_HF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_mnoc_hf_cfg = { - .name = "qnm_mnoc_hf_cfg", - .id = SA8775P_MASTER_CNOC_MNOC_HF_CFG, +static struct qcom_icc_node qhs_qdss_cfg = { + .name = "qhs_qdss_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_MNOC_HF }, }; -static struct qcom_icc_node qnm_mnoc_sf_cfg = { - .name = "qnm_mnoc_sf_cfg", - .id = SA8775P_MASTER_CNOC_MNOC_SF_CFG, +static struct qcom_icc_node qhs_qm_cfg = { + .name = "qhs_qm_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_MNOC_SF }, }; -static struct qcom_icc_node qnm_video0 = { - .name = "qnm_video0", - .id = SA8775P_MASTER_VIDEO_P0, +static struct qcom_icc_node qhs_qm_mpu_cfg = { + .name = "qhs_qm_mpu_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_video1 = { - .name = "qnm_video1", - .id = SA8775P_MASTER_VIDEO_P1, +static struct qcom_icc_node qhs_qup0 = { + .name = "qhs_qup0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_video_cvp = { - .name = "qnm_video_cvp", - .id = SA8775P_MASTER_VIDEO_PROC, +static struct qcom_icc_node qhs_qup1 = { + .name = "qhs_qup1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_video_v_cpu = { - .name = "qnm_video_v_cpu", - .id = SA8775P_MASTER_VIDEO_V_PROC, +static struct qcom_icc_node qhs_qup2 = { + .name = "qhs_qup2", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_MNOC_SF_MEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qhm_nsp_noc_config = { - .name = "qhm_nsp_noc_config", - .id = SA8775P_MASTER_CDSP_NOC_CFG, +static struct qcom_icc_node qhs_qup3 = { + .name = "qhs_qup3", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_NSP_NOC }, -}; - -static struct qcom_icc_node qxm_nsp = { - .name = "qxm_nsp", - .id = SA8775P_MASTER_CDSP_PROC, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_HCP_A, SLAVE_CDSP_MEM_NOC }, }; -static struct qcom_icc_node qhm_nspb_noc_config = { - .name = "qhm_nspb_noc_config", - .id = SA8775P_MASTER_CDSPB_NOC_CFG, +static struct qcom_icc_node qhs_sail_throttle_cfg = { + .name = "qhs_sail_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_NSPB_NOC }, -}; - -static struct qcom_icc_node qxm_nspb = { - .name = "qxm_nspb", - .id = SA8775P_MASTER_CDSP_PROC_B, - .channels = 2, - .buswidth = 32, - .num_links = 2, - .links = { SA8775P_SLAVE_HCP_B, SLAVE_CDSPB_MEM_NOC }, }; -static struct qcom_icc_node xm_pcie3_0 = { - .name = "xm_pcie3_0", - .id = SA8775P_MASTER_PCIE_0, +static struct qcom_icc_node qhs_sdc1 = { + .name = "qhs_sdc1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_ANOC_PCIE_GEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_pcie3_1 = { - .name = "xm_pcie3_1", - .id = SA8775P_MASTER_PCIE_1, +static struct qcom_icc_node qhs_security = { + .name = "qhs_security", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_ANOC_PCIE_GEM_NOC }, + .buswidth = 4, }; -static struct qcom_icc_node qhm_gic = { - .name = "qhm_gic", - .id = SA8775P_MASTER_GIC_AHB, +static struct qcom_icc_node qhs_snoc_throttle_cfg = { + .name = "qhs_snoc_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_SF }, }; -static struct qcom_icc_node qnm_aggre1_noc = { - .name = "qnm_aggre1_noc", - .id = SA8775P_MASTER_A1NOC_SNOC, +static struct qcom_icc_node qhs_tcsr = { + .name = "qhs_tcsr", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_SF }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_aggre2_noc = { - .name = "qnm_aggre2_noc", - .id = SA8775P_MASTER_A2NOC_SNOC, +static struct qcom_icc_node qhs_tlmm = { + .name = "qhs_tlmm", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_SF }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_lpass_noc = { - .name = "qnm_lpass_noc", - .id = SA8775P_MASTER_LPASS_ANOC, +static struct qcom_icc_node qhs_tsc_cfg = { + .name = "qhs_tsc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_SF }, + .buswidth = 4, }; -static struct qcom_icc_node qnm_snoc_cfg = { - .name = "qnm_snoc_cfg", - .id = SA8775P_MASTER_SNOC_CFG, +static struct qcom_icc_node qhs_ufs_card_cfg = { + .name = "qhs_ufs_card_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_SLAVE_SERVICE_SNOC }, }; -static struct qcom_icc_node qxm_pimem = { - .name = "qxm_pimem", - .id = SA8775P_MASTER_PIMEM, +static struct qcom_icc_node qhs_ufs_mem_cfg = { + .name = "qhs_ufs_mem_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_GC }, + .buswidth = 4, }; -static struct qcom_icc_node xm_gic = { - .name = "xm_gic", - .id = SA8775P_MASTER_GIC, +static struct qcom_icc_node qhs_usb2_0 = { + .name = "qhs_usb2_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, - .num_links = 1, - .links = { SA8775P_SLAVE_SNOC_GEM_NOC_GC }, + .buswidth = 4, }; -static struct qcom_icc_node qns_a1noc_snoc = { - .name = "qns_a1noc_snoc", - .id = SA8775P_SLAVE_A1NOC_SNOC, +static struct qcom_icc_node qhs_usb3_0 = { + .name = "qhs_usb3_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_MASTER_A1NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qns_a2noc_snoc = { - .name = "qns_a2noc_snoc", - .id = SA8775P_SLAVE_A2NOC_SNOC, +static struct qcom_icc_node qhs_usb3_1 = { + .name = "qhs_usb3_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, - .num_links = 1, - .links = { SA8775P_MASTER_A2NOC_SNOC }, + .buswidth = 4, }; -static struct qcom_icc_node qup0_core_slave = { - .name = "qup0_core_slave", - .id = SA8775P_SLAVE_QUP_CORE_0, +static struct qcom_icc_node qhs_venus_cfg = { + .name = "qhs_venus_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qup1_core_slave = { - .name = "qup1_core_slave", - .id = SA8775P_SLAVE_QUP_CORE_1, +static struct qcom_icc_node qhs_venus_cvp_throttle_cfg = { + .name = "qhs_venus_cvp_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qup2_core_slave = { - .name = "qup2_core_slave", - .id = SA8775P_SLAVE_QUP_CORE_2, +static struct qcom_icc_node qhs_venus_v_cpu_throttle_cfg = { + .name = "qhs_venus_v_cpu_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qup3_core_slave = { - .name = "qup3_core_slave", - .id = SA8775P_SLAVE_QUP_CORE_3, +static struct qcom_icc_node qhs_venus_vcodec_throttle_cfg = { + .name = "qhs_venus_vcodec_throttle_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_ahb2phy0 = { - .name = "qhs_ahb2phy0", - .id = SA8775P_SLAVE_AHB2PHY_0, +static struct qcom_icc_node qns_gpdsp_noc_cfg = { + .name = "qns_gpdsp_noc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_ahb2phy1 = { - .name = "qhs_ahb2phy1", - .id = SA8775P_SLAVE_AHB2PHY_1, +static struct qcom_icc_node qns_pcie_anoc_cfg = { + .name = "qns_pcie_anoc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_ahb2phy2 = { - .name = "qhs_ahb2phy2", - .id = SA8775P_SLAVE_AHB2PHY_2, +static struct qcom_icc_node qxs_boot_imem = { + .name = "qxs_boot_imem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, }; -static struct qcom_icc_node qhs_ahb2phy3 = { - .name = "qhs_ahb2phy3", - .id = SA8775P_SLAVE_AHB2PHY_3, +static struct qcom_icc_node qxs_imem = { + .name = "qxs_imem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, }; -static struct qcom_icc_node qhs_anoc_throttle_cfg = { - .name = "qhs_anoc_throttle_cfg", - .id = SA8775P_SLAVE_ANOC_THROTTLE_CFG, +static struct qcom_icc_node qxs_pimem = { + .name = "qxs_pimem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, }; -static struct qcom_icc_node qhs_aoss = { - .name = "qhs_aoss", - .id = SA8775P_SLAVE_AOSS, +static struct qcom_icc_node xs_pcie_0 = { + .name = "xs_pcie_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, }; -static struct qcom_icc_node qhs_apss = { - .name = "qhs_apss", - .id = SA8775P_SLAVE_APPSS, +static struct qcom_icc_node xs_pcie_1 = { + .name = "xs_pcie_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, + .buswidth = 32, }; -static struct qcom_icc_node qhs_boot_rom = { - .name = "qhs_boot_rom", - .id = SA8775P_SLAVE_BOOT_ROM, +static struct qcom_icc_node xs_qdss_stm = { + .name = "xs_qdss_stm", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_camera_cfg = { - .name = "qhs_camera_cfg", - .id = SA8775P_SLAVE_CAMERA_CFG, +static struct qcom_icc_node xs_sys_tcu_cfg = { + .name = "xs_sys_tcu_cfg", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, }; -static struct qcom_icc_node qhs_camera_nrt_throttle_cfg = { - .name = "qhs_camera_nrt_throttle_cfg", - .id = SA8775P_SLAVE_CAMERA_NRT_THROTTLE_CFG, +static struct qcom_icc_node qhs_llcc = { + .name = "qhs_llcc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_camera_rt_throttle_cfg = { - .name = "qhs_camera_rt_throttle_cfg", - .id = SA8775P_SLAVE_CAMERA_RT_THROTTLE_CFG, +static struct qcom_icc_node srvc_even_gemnoc = { + .name = "srvc_even_gemnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_clk_ctl = { - .name = "qhs_clk_ctl", - .id = SA8775P_SLAVE_CLK_CTL, +static struct qcom_icc_node srvc_odd_gemnoc = { + .name = "srvc_odd_gemnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_compute0_cfg = { - .name = "qhs_compute0_cfg", - .id = SA8775P_SLAVE_CDSP_CFG, +static struct qcom_icc_node srvc_sys_gemnoc = { + .name = "srvc_sys_gemnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_MASTER_CDSP_NOC_CFG }, }; -static struct qcom_icc_node qhs_compute1_cfg = { - .name = "qhs_compute1_cfg", - .id = SA8775P_SLAVE_CDSP1_CFG, +static struct qcom_icc_node srvc_sys_gemnoc_2 = { + .name = "srvc_sys_gemnoc_2", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, - .num_links = 1, - .links = { SA8775P_MASTER_CDSPB_NOC_CFG }, }; -static struct qcom_icc_node qhs_cpr_cx = { - .name = "qhs_cpr_cx", - .id = SA8775P_SLAVE_RBCPR_CX_CFG, +static struct qcom_icc_node qhs_lpass_core = { + .name = "qhs_lpass_core", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_cpr_mmcx = { - .name = "qhs_cpr_mmcx", - .id = SA8775P_SLAVE_RBCPR_MMCX_CFG, +static struct qcom_icc_node qhs_lpass_lpi = { + .name = "qhs_lpass_lpi", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_cpr_mx = { - .name = "qhs_cpr_mx", - .id = SA8775P_SLAVE_RBCPR_MX_CFG, +static struct qcom_icc_node qhs_lpass_mpu = { + .name = "qhs_lpass_mpu", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_cpr_nspcx = { - .name = "qhs_cpr_nspcx", - .id = SA8775P_SLAVE_CPR_NSPCX, +static struct qcom_icc_node qhs_lpass_top = { + .name = "qhs_lpass_top", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_crypto0_cfg = { - .name = "qhs_crypto0_cfg", - .id = SA8775P_SLAVE_CRYPTO_0_CFG, +static struct qcom_icc_node srvc_niu_aml_noc = { + .name = "srvc_niu_aml_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_cx_rdpm = { - .name = "qhs_cx_rdpm", - .id = SA8775P_SLAVE_CX_RDPM, +static struct qcom_icc_node srvc_niu_lpass_agnoc = { + .name = "srvc_niu_lpass_agnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_display0_cfg = { - .name = "qhs_display0_cfg", - .id = SA8775P_SLAVE_DISPLAY_CFG, - .channels = 1, +static struct qcom_icc_node ebi = { + .name = "ebi", + .id = ALLOC_DYN_ID, + .channels = 8, .buswidth = 4, }; -static struct qcom_icc_node qhs_display0_rt_throttle_cfg = { - .name = "qhs_display0_rt_throttle_cfg", - .id = SA8775P_SLAVE_DISPLAY_RT_THROTTLE_CFG, +static struct qcom_icc_node srvc_mnoc_hf = { + .name = "srvc_mnoc_hf", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_display1_cfg = { - .name = "qhs_display1_cfg", - .id = SA8775P_SLAVE_DISPLAY1_CFG, +static struct qcom_icc_node srvc_mnoc_sf = { + .name = "srvc_mnoc_sf", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_display1_rt_throttle_cfg = { - .name = "qhs_display1_rt_throttle_cfg", - .id = SA8775P_SLAVE_DISPLAY1_RT_THROTTLE_CFG, - .channels = 1, - .buswidth = 4, +static struct qcom_icc_node qns_hcp = { + .name = "qns_hcp", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, }; -static struct qcom_icc_node qhs_emac0_cfg = { - .name = "qhs_emac0_cfg", - .id = SA8775P_SLAVE_EMAC_CFG, +static struct qcom_icc_node service_nsp_noc = { + .name = "service_nsp_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_emac1_cfg = { - .name = "qhs_emac1_cfg", - .id = SA8775P_SLAVE_EMAC1_CFG, +static struct qcom_icc_node qns_nspb_hcp = { + .name = "qns_nspb_hcp", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, +}; + +static struct qcom_icc_node service_nspb_noc = { + .name = "service_nspb_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_gp_dsp0_cfg = { - .name = "qhs_gp_dsp0_cfg", - .id = SA8775P_SLAVE_GP_DSP0_CFG, +static struct qcom_icc_node srvc_snoc = { + .name = "srvc_snoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, }; -static struct qcom_icc_node qhs_gp_dsp1_cfg = { - .name = "qhs_gp_dsp1_cfg", - .id = SA8775P_SLAVE_GP_DSP1_CFG, +static struct qcom_icc_node qup0_core_master = { + .name = "qup0_core_master", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qup0_core_slave }, }; -static struct qcom_icc_node qhs_gpdsp0_throttle_cfg = { - .name = "qhs_gpdsp0_throttle_cfg", - .id = SA8775P_SLAVE_GPDSP0_THROTTLE_CFG, +static struct qcom_icc_node qup1_core_master = { + .name = "qup1_core_master", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qup1_core_slave }, }; -static struct qcom_icc_node qhs_gpdsp1_throttle_cfg = { - .name = "qhs_gpdsp1_throttle_cfg", - .id = SA8775P_SLAVE_GPDSP1_THROTTLE_CFG, +static struct qcom_icc_node qup2_core_master = { + .name = "qup2_core_master", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qup2_core_slave }, }; -static struct qcom_icc_node qhs_gpu_tcu_throttle_cfg = { - .name = "qhs_gpu_tcu_throttle_cfg", - .id = SA8775P_SLAVE_GPU_TCU_THROTTLE_CFG, +static struct qcom_icc_node qup3_core_master = { + .name = "qup3_core_master", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qup3_core_slave }, }; -static struct qcom_icc_node qhs_gpuss_cfg = { - .name = "qhs_gpuss_cfg", - .id = SA8775P_SLAVE_GFX3D_CFG, +static struct qcom_icc_node qnm_gemnoc_pcie = { + .name = "qnm_gemnoc_pcie", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, + .buswidth = 16, + .num_links = 2, + .link_nodes = { &xs_pcie_0, &xs_pcie_1 }, }; -static struct qcom_icc_node qhs_hwkm = { - .name = "qhs_hwkm", - .id = SA8775P_SLAVE_HWKM, +static struct qcom_icc_node qnm_gemnoc_cfg = { + .name = "qnm_gemnoc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 4, + .link_nodes = { &srvc_even_gemnoc, &srvc_odd_gemnoc, + &srvc_sys_gemnoc, &srvc_sys_gemnoc_2 }, }; -static struct qcom_icc_node qhs_imem_cfg = { - .name = "qhs_imem_cfg", - .id = SA8775P_SLAVE_IMEM_CFG, +static struct qcom_icc_node qhm_config_noc = { + .name = "qhm_config_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 6, + .link_nodes = { &qhs_lpass_core, &qhs_lpass_lpi, + &qhs_lpass_mpu, &qhs_lpass_top, + &srvc_niu_aml_noc, &srvc_niu_lpass_agnoc }, }; -static struct qcom_icc_node qhs_ipa = { - .name = "qhs_ipa", - .id = SA8775P_SLAVE_IPA_CFG, - .channels = 1, +static struct qcom_icc_node llcc_mc = { + .name = "llcc_mc", + .id = ALLOC_DYN_ID, + .channels = 8, .buswidth = 4, + .num_links = 1, + .link_nodes = { &ebi }, }; -static struct qcom_icc_node qhs_ipc_router = { - .name = "qhs_ipc_router", - .id = SA8775P_SLAVE_IPC_ROUTER_CFG, +static struct qcom_icc_node qnm_mnoc_hf_cfg = { + .name = "qnm_mnoc_hf_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &srvc_mnoc_hf }, }; -static struct qcom_icc_node qhs_lpass_cfg = { - .name = "qhs_lpass_cfg", - .id = SA8775P_SLAVE_LPASS, +static struct qcom_icc_node qnm_mnoc_sf_cfg = { + .name = "qnm_mnoc_sf_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, .num_links = 1, - .links = { SA8775P_MASTER_CNOC_LPASS_AG_NOC }, + .link_nodes = { &srvc_mnoc_sf }, }; -static struct qcom_icc_node qhs_lpass_throttle_cfg = { - .name = "qhs_lpass_throttle_cfg", - .id = SA8775P_SLAVE_LPASS_THROTTLE_CFG, +static struct qcom_icc_node qhm_nsp_noc_config = { + .name = "qhm_nsp_noc_config", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &service_nsp_noc }, }; -static struct qcom_icc_node qhs_mx_rdpm = { - .name = "qhs_mx_rdpm", - .id = SA8775P_SLAVE_MX_RDPM, +static struct qcom_icc_node qhm_nspb_noc_config = { + .name = "qhm_nspb_noc_config", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &service_nspb_noc }, }; -static struct qcom_icc_node qhs_mxc_rdpm = { - .name = "qhs_mxc_rdpm", - .id = SA8775P_SLAVE_MXC_RDPM, +static struct qcom_icc_node qnm_snoc_cfg = { + .name = "qnm_snoc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &srvc_snoc }, }; -static struct qcom_icc_node qhs_pcie0_cfg = { - .name = "qhs_pcie0_cfg", - .id = SA8775P_SLAVE_PCIE_0_CFG, +static struct qcom_icc_node qhs_compute0_cfg = { + .name = "qhs_compute0_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qhm_nsp_noc_config }, }; -static struct qcom_icc_node qhs_pcie1_cfg = { - .name = "qhs_pcie1_cfg", - .id = SA8775P_SLAVE_PCIE_1_CFG, +static struct qcom_icc_node qhs_compute1_cfg = { + .name = "qhs_compute1_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qhm_nspb_noc_config }, }; -static struct qcom_icc_node qhs_pcie_rsc_cfg = { - .name = "qhs_pcie_rsc_cfg", - .id = SA8775P_SLAVE_PCIE_RSC_CFG, +static struct qcom_icc_node qhs_lpass_cfg = { + .name = "qhs_lpass_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qhm_config_noc }, }; -static struct qcom_icc_node qhs_pcie_tcu_throttle_cfg = { - .name = "qhs_pcie_tcu_throttle_cfg", - .id = SA8775P_SLAVE_PCIE_TCU_THROTTLE_CFG, +static struct qcom_icc_node qns_mnoc_hf_cfg = { + .name = "qns_mnoc_hf_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_mnoc_hf_cfg }, }; -static struct qcom_icc_node qhs_pcie_throttle_cfg = { - .name = "qhs_pcie_throttle_cfg", - .id = SA8775P_SLAVE_PCIE_THROTTLE_CFG, +static struct qcom_icc_node qns_mnoc_sf_cfg = { + .name = "qns_mnoc_sf_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_mnoc_sf_cfg }, }; -static struct qcom_icc_node qhs_pdm = { - .name = "qhs_pdm", - .id = SA8775P_SLAVE_PDM, +static struct qcom_icc_node qns_snoc_cfg = { + .name = "qns_snoc_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_snoc_cfg }, }; -static struct qcom_icc_node qhs_pimem_cfg = { - .name = "qhs_pimem_cfg", - .id = SA8775P_SLAVE_PIMEM_CFG, +static struct qcom_icc_node qns_gemnoc = { + .name = "qns_gemnoc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_gemnoc_cfg }, }; -static struct qcom_icc_node qhs_pke_wrapper_cfg = { - .name = "qhs_pke_wrapper_cfg", - .id = SA8775P_SLAVE_PKA_WRAPPER_CFG, - .channels = 1, - .buswidth = 4, +static struct qcom_icc_node qns_llcc = { + .name = "qns_llcc", + .id = ALLOC_DYN_ID, + .channels = 6, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &llcc_mc }, }; -static struct qcom_icc_node qhs_qdss_cfg = { - .name = "qhs_qdss_cfg", - .id = SA8775P_SLAVE_QDSS_CFG, +static struct qcom_icc_node qns_pcie = { + .name = "qns_pcie", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_gemnoc_pcie }, }; -static struct qcom_icc_node qhs_qm_cfg = { - .name = "qhs_qm_cfg", - .id = SA8775P_SLAVE_QM_CFG, +static struct qcom_icc_node qnm_cnoc_dc_noc = { + .name = "qnm_cnoc_dc_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 2, + .link_nodes = { &qhs_llcc, &qns_gemnoc }, }; -static struct qcom_icc_node qhs_qm_mpu_cfg = { - .name = "qhs_qm_mpu_cfg", - .id = SA8775P_SLAVE_QM_MPU_CFG, - .channels = 1, - .buswidth = 4, +static struct qcom_icc_node qnm_mnoc_hf = { + .name = "qnm_mnoc_hf", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_llcc, &qns_pcie }, }; -static struct qcom_icc_node qhs_qup0 = { - .name = "qhs_qup0", - .id = SA8775P_SLAVE_QUP_0, +static struct qcom_icc_node qnm_snoc_gc = { + .name = "qnm_snoc_gc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_llcc }, }; -static struct qcom_icc_node qhs_qup1 = { - .name = "qhs_qup1", - .id = SA8775P_SLAVE_QUP_1, +static struct qcom_icc_node qns_ddrss_cfg = { + .name = "qns_ddrss_cfg", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qnm_cnoc_dc_noc }, }; -static struct qcom_icc_node qhs_qup2 = { - .name = "qhs_qup2", - .id = SA8775P_SLAVE_QUP_2, +static struct qcom_icc_node qns_mem_noc_hf = { + .name = "qns_mem_noc_hf", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_mnoc_hf }, +}; + +static struct qcom_icc_node qns_gemnoc_gc = { + .name = "qns_gemnoc_gc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qnm_snoc_gc }, }; -static struct qcom_icc_node qhs_qup3 = { - .name = "qhs_qup3", - .id = SA8775P_SLAVE_QUP_3, +static struct qcom_icc_node qnm_gemnoc_cnoc = { + .name = "qnm_gemnoc_cnoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 82, + .link_nodes = { &qhs_ahb2phy0, &qhs_ahb2phy1, + &qhs_ahb2phy2, &qhs_ahb2phy3, + &qhs_anoc_throttle_cfg, &qhs_aoss, + &qhs_apss, &qhs_boot_rom, + &qhs_camera_cfg, &qhs_camera_nrt_throttle_cfg, + &qhs_camera_rt_throttle_cfg, &qhs_clk_ctl, + &qhs_compute0_cfg, &qhs_compute1_cfg, + &qhs_cpr_cx, &qhs_cpr_mmcx, + &qhs_cpr_mx, &qhs_cpr_nspcx, + &qhs_crypto0_cfg, &qhs_cx_rdpm, + &qhs_display0_cfg, &qhs_display0_rt_throttle_cfg, + &qhs_display1_cfg, &qhs_display1_rt_throttle_cfg, + &qhs_emac0_cfg, &qhs_emac1_cfg, + &qhs_gp_dsp0_cfg, &qhs_gp_dsp1_cfg, + &qhs_gpdsp0_throttle_cfg, &qhs_gpdsp1_throttle_cfg, + &qhs_gpu_tcu_throttle_cfg, &qhs_gpuss_cfg, + &qhs_hwkm, &qhs_imem_cfg, + &qhs_ipa, &qhs_ipc_router, + &qhs_lpass_cfg, &qhs_lpass_throttle_cfg, + &qhs_mx_rdpm, &qhs_mxc_rdpm, + &qhs_pcie0_cfg, &qhs_pcie1_cfg, + &qhs_pcie_rsc_cfg, &qhs_pcie_tcu_throttle_cfg, + &qhs_pcie_throttle_cfg, &qhs_pdm, + &qhs_pimem_cfg, &qhs_pke_wrapper_cfg, + &qhs_qdss_cfg, &qhs_qm_cfg, + &qhs_qm_mpu_cfg, &qhs_qup0, + &qhs_qup1, &qhs_qup2, + &qhs_qup3, &qhs_sail_throttle_cfg, + &qhs_sdc1, &qhs_security, + &qhs_snoc_throttle_cfg, &qhs_tcsr, + &qhs_tlmm, &qhs_tsc_cfg, + &qhs_ufs_card_cfg, &qhs_ufs_mem_cfg, + &qhs_usb2_0, &qhs_usb3_0, + &qhs_usb3_1, &qhs_venus_cfg, + &qhs_venus_cvp_throttle_cfg, &qhs_venus_v_cpu_throttle_cfg, + &qhs_venus_vcodec_throttle_cfg, &qns_ddrss_cfg, + &qns_gpdsp_noc_cfg, &qns_mnoc_hf_cfg, + &qns_mnoc_sf_cfg, &qns_pcie_anoc_cfg, + &qns_snoc_cfg, &qxs_boot_imem, + &qxs_imem, &qxs_pimem, + &xs_qdss_stm, &xs_sys_tcu_cfg }, }; -static struct qcom_icc_node qhs_sail_throttle_cfg = { - .name = "qhs_sail_throttle_cfg", - .id = SA8775P_SLAVE_SAIL_THROTTLE_CFG, +static struct qcom_icc_node qnm_camnoc_hf = { + .name = "qnm_camnoc_hf", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_sdc1 = { - .name = "qhs_sdc1", - .id = SA8775P_SLAVE_SDC1, +static struct qcom_icc_node qnm_mdp0_0 = { + .name = "qnm_mdp0_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_security = { - .name = "qhs_security", - .id = SA8775P_SLAVE_SECURITY, +static struct qcom_icc_node qnm_mdp0_1 = { + .name = "qnm_mdp0_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_snoc_throttle_cfg = { - .name = "qhs_snoc_throttle_cfg", - .id = SA8775P_SLAVE_SNOC_THROTTLE_CFG, +static struct qcom_icc_node qnm_mdp1_0 = { + .name = "qnm_mdp1_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_tcsr = { - .name = "qhs_tcsr", - .id = SA8775P_SLAVE_TCSR, +static struct qcom_icc_node qnm_mdp1_1 = { + .name = "qnm_mdp1_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_hf }, }; -static struct qcom_icc_node qhs_tlmm = { - .name = "qhs_tlmm", - .id = SA8775P_SLAVE_TLMM, +static struct qcom_icc_node qxm_pimem = { + .name = "qxm_pimem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_gemnoc_gc }, }; -static struct qcom_icc_node qhs_tsc_cfg = { - .name = "qhs_tsc_cfg", - .id = SA8775P_SLAVE_TSC_CFG, +static struct qcom_icc_node xm_gic = { + .name = "xm_gic", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_gemnoc_gc }, }; -static struct qcom_icc_node qhs_ufs_card_cfg = { - .name = "qhs_ufs_card_cfg", - .id = SA8775P_SLAVE_UFS_CARD_CFG, +static struct qcom_icc_node qns_gem_noc_cnoc = { + .name = "qns_gem_noc_cnoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_gemnoc_cnoc }, }; -static struct qcom_icc_node qhs_ufs_mem_cfg = { - .name = "qhs_ufs_mem_cfg", - .id = SA8775P_SLAVE_UFS_MEM_CFG, +static struct qcom_icc_node alm_gpu_tcu = { + .name = "alm_gpu_tcu", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_usb2_0 = { - .name = "qhs_usb2_0", - .id = SA8775P_SLAVE_USB2, +static struct qcom_icc_node alm_pcie_tcu = { + .name = "alm_pcie_tcu", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_usb3_0 = { - .name = "qhs_usb3_0", - .id = SA8775P_SLAVE_USB3_0, +static struct qcom_icc_node alm_sys_tcu = { + .name = "alm_sys_tcu", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_usb3_1 = { - .name = "qhs_usb3_1", - .id = SA8775P_SLAVE_USB3_1, +static struct qcom_icc_node chm_apps = { + .name = "chm_apps", + .id = ALLOC_DYN_ID, + .channels = 4, + .buswidth = 32, + .num_links = 3, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc, + &qns_pcie }, +}; + +static struct qcom_icc_node qnm_cmpnoc0 = { + .name = "qnm_cmpnoc0", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, +}; + +static struct qcom_icc_node qnm_cmpnoc1 = { + .name = "qnm_cmpnoc1", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, +}; + +static struct qcom_icc_node qnm_gpdsp_sail = { + .name = "qnm_gpdsp_sail", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_venus_cfg = { - .name = "qhs_venus_cfg", - .id = SA8775P_SLAVE_VENUS_CFG, +static struct qcom_icc_node qnm_gpu = { + .name = "qnm_gpu", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, +}; + +static struct qcom_icc_node qnm_mnoc_sf = { + .name = "qnm_mnoc_sf", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 3, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc, + &qns_pcie }, +}; + +static struct qcom_icc_node qnm_pcie = { + .name = "qnm_pcie", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc }, }; -static struct qcom_icc_node qhs_venus_cvp_throttle_cfg = { - .name = "qhs_venus_cvp_throttle_cfg", - .id = SA8775P_SLAVE_VENUS_CVP_THROTTLE_CFG, +static struct qcom_icc_node qnm_snoc_sf = { + .name = "qnm_snoc_sf", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 3, + .link_nodes = { &qns_gem_noc_cnoc, &qns_llcc, + &qns_pcie }, }; -static struct qcom_icc_node qhs_venus_v_cpu_throttle_cfg = { - .name = "qhs_venus_v_cpu_throttle_cfg", - .id = SA8775P_SLAVE_VENUS_V_CPU_THROTTLE_CFG, +static struct qcom_icc_node qns_gp_dsp_sail_noc = { + .name = "qns_gp_dsp_sail_noc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_gpdsp_sail }, }; -static struct qcom_icc_node qhs_venus_vcodec_throttle_cfg = { - .name = "qhs_venus_vcodec_throttle_cfg", - .id = SA8775P_SLAVE_VENUS_VCODEC_THROTTLE_CFG, +static struct qcom_icc_node qns_mem_noc_sf = { + .name = "qns_mem_noc_sf", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_mnoc_sf }, +}; + +static struct qcom_icc_node qns_nsp_gemnoc = { + .name = "qns_nsp_gemnoc", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_cmpnoc0 }, +}; + +static struct qcom_icc_node qns_nspb_gemnoc = { + .name = "qns_nspb_gemnoc", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_cmpnoc1 }, +}; + +static struct qcom_icc_node qns_pcie_mem_noc = { + .name = "qns_pcie_mem_noc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qnm_pcie }, }; -static struct qcom_icc_node qns_ddrss_cfg = { - .name = "qns_ddrss_cfg", - .id = SA8775P_SLAVE_DDRSS_CFG, +static struct qcom_icc_node qns_gemnoc_sf = { + .name = "qns_gemnoc_sf", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, .num_links = 1, - .links = { SA8775P_MASTER_CNOC_DC_NOC }, + .link_nodes = { &qnm_snoc_sf }, }; -static struct qcom_icc_node qns_gpdsp_noc_cfg = { - .name = "qns_gpdsp_noc_cfg", - .id = SA8775P_SLAVE_GPDSP_NOC_CFG, +static struct qcom_icc_node qxm_dsp0 = { + .name = "qxm_dsp0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qns_gp_dsp_sail_noc }, }; -static struct qcom_icc_node qns_mnoc_hf_cfg = { - .name = "qns_mnoc_hf_cfg", - .id = SA8775P_SLAVE_CNOC_MNOC_HF_CFG, +static struct qcom_icc_node qxm_dsp1 = { + .name = "qxm_dsp1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, .num_links = 1, - .links = { SA8775P_MASTER_CNOC_MNOC_HF_CFG }, + .link_nodes = { &qns_gp_dsp_sail_noc }, }; -static struct qcom_icc_node qns_mnoc_sf_cfg = { - .name = "qns_mnoc_sf_cfg", - .id = SA8775P_SLAVE_CNOC_MNOC_SF_CFG, +static struct qcom_icc_node qnm_camnoc_icp = { + .name = "qnm_camnoc_icp", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_CNOC_MNOC_SF_CFG }, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qns_pcie_anoc_cfg = { - .name = "qns_pcie_anoc_cfg", - .id = SA8775P_SLAVE_PCIE_ANOC_CFG, +static struct qcom_icc_node qnm_camnoc_sf = { + .name = "qnm_camnoc_sf", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qns_snoc_cfg = { - .name = "qns_snoc_cfg", - .id = SA8775P_SLAVE_SNOC_CFG, +static struct qcom_icc_node qnm_video0 = { + .name = "qnm_video0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_SNOC_CFG }, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qxs_boot_imem = { - .name = "qxs_boot_imem", - .id = SA8775P_SLAVE_BOOT_IMEM, +static struct qcom_icc_node qnm_video1 = { + .name = "qnm_video1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qxs_imem = { - .name = "qxs_imem", - .id = SA8775P_SLAVE_IMEM, +static struct qcom_icc_node qnm_video_cvp = { + .name = "qnm_video_cvp", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node qxs_pimem = { - .name = "qxs_pimem", - .id = SA8775P_SLAVE_PIMEM, +static struct qcom_icc_node qnm_video_v_cpu = { + .name = "qnm_video_v_cpu", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_mem_noc_sf }, }; -static struct qcom_icc_node xs_pcie_0 = { - .name = "xs_pcie_0", - .id = SA8775P_SLAVE_PCIE_0, - .channels = 1, - .buswidth = 16, +static struct qcom_icc_node qxm_nsp = { + .name = "qxm_nsp", + .id = ALLOC_DYN_ID, + .channels = 2, + .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_hcp, &qns_nsp_gemnoc }, }; -static struct qcom_icc_node xs_pcie_1 = { - .name = "xs_pcie_1", - .id = SA8775P_SLAVE_PCIE_1, - .channels = 1, +static struct qcom_icc_node qxm_nspb = { + .name = "qxm_nspb", + .id = ALLOC_DYN_ID, + .channels = 2, .buswidth = 32, + .num_links = 2, + .link_nodes = { &qns_nspb_hcp, &qns_nspb_gemnoc }, }; -static struct qcom_icc_node xs_qdss_stm = { - .name = "xs_qdss_stm", - .id = SA8775P_SLAVE_QDSS_STM, +static struct qcom_icc_node xm_pcie3_0 = { + .name = "xm_pcie3_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qns_pcie_mem_noc }, }; -static struct qcom_icc_node xs_sys_tcu_cfg = { - .name = "xs_sys_tcu_cfg", - .id = SA8775P_SLAVE_TCU, +static struct qcom_icc_node xm_pcie3_1 = { + .name = "xm_pcie3_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 8, + .buswidth = 32, + .num_links = 1, + .link_nodes = { &qns_pcie_mem_noc }, }; -static struct qcom_icc_node qhs_llcc = { - .name = "qhs_llcc", - .id = SA8775P_SLAVE_LLCC_CFG, +static struct qcom_icc_node qhm_gic = { + .name = "qhm_gic", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qns_gemnoc_sf }, }; -static struct qcom_icc_node qns_gemnoc = { - .name = "qns_gemnoc", - .id = SA8775P_SLAVE_GEM_NOC_CFG, +static struct qcom_icc_node qnm_aggre1_noc = { + .name = "qnm_aggre1_noc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_GEM_NOC_CFG }, + .link_nodes = { &qns_gemnoc_sf }, }; -static struct qcom_icc_node qns_gem_noc_cnoc = { - .name = "qns_gem_noc_cnoc", - .id = SA8775P_SLAVE_GEM_NOC_CNOC, +static struct qcom_icc_node qnm_aggre2_noc = { + .name = "qnm_aggre2_noc", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 16, .num_links = 1, - .links = { SA8775P_MASTER_GEM_NOC_CNOC }, + .link_nodes = { &qns_gemnoc_sf }, }; -static struct qcom_icc_node qns_llcc = { - .name = "qns_llcc", - .id = SA8775P_SLAVE_LLCC, - .channels = 6, +static struct qcom_icc_node qnm_lpass_noc = { + .name = "qnm_lpass_noc", + .id = ALLOC_DYN_ID, + .channels = 1, .buswidth = 16, .num_links = 1, - .links = { SA8775P_MASTER_LLCC }, + .link_nodes = { &qns_gemnoc_sf }, }; -static struct qcom_icc_node qns_pcie = { - .name = "qns_pcie", - .id = SA8775P_SLAVE_GEM_NOC_PCIE_CNOC, +static struct qcom_icc_node qns_a1noc_snoc = { + .name = "qns_a1noc_snoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_GEM_NOC_PCIE_SNOC }, + .link_nodes = { &qnm_aggre1_noc }, }; -static struct qcom_icc_node srvc_even_gemnoc = { - .name = "srvc_even_gemnoc", - .id = SA8775P_SLAVE_SERVICE_GEM_NOC_1, +static struct qcom_icc_node qns_a2noc_snoc = { + .name = "qns_a2noc_snoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_aggre2_noc }, }; -static struct qcom_icc_node srvc_odd_gemnoc = { - .name = "srvc_odd_gemnoc", - .id = SA8775P_SLAVE_SERVICE_GEM_NOC_2, +static struct qcom_icc_node qns_sysnoc = { + .name = "qns_sysnoc", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 16, + .num_links = 1, + .link_nodes = { &qnm_lpass_noc }, }; -static struct qcom_icc_node srvc_sys_gemnoc = { - .name = "srvc_sys_gemnoc", - .id = SA8775P_SLAVE_SERVICE_GEM_NOC, +static struct qcom_icc_node qxm_qup3 = { + .name = "qxm_qup3", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node srvc_sys_gemnoc_2 = { - .name = "srvc_sys_gemnoc_2", - .id = SA8775P_SLAVE_SERVICE_GEM_NOC2, +static struct qcom_icc_node xm_emac_0 = { + .name = "xm_emac_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qns_gp_dsp_sail_noc = { - .name = "qns_gp_dsp_sail_noc", - .id = SA8775P_SLAVE_GP_DSP_SAIL_NOC, +static struct qcom_icc_node xm_emac_1 = { + .name = "xm_emac_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_GPDSP_SAIL }, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qhs_lpass_core = { - .name = "qhs_lpass_core", - .id = SA8775P_SLAVE_LPASS_CORE_CFG, +static struct qcom_icc_node xm_sdc1 = { + .name = "xm_sdc1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qhs_lpass_lpi = { - .name = "qhs_lpass_lpi", - .id = SA8775P_SLAVE_LPASS_LPI_CFG, +static struct qcom_icc_node xm_ufs_mem = { + .name = "xm_ufs_mem", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qhs_lpass_mpu = { - .name = "qhs_lpass_mpu", - .id = SA8775P_SLAVE_LPASS_MPU_CFG, +static struct qcom_icc_node xm_usb2_2 = { + .name = "xm_usb2_2", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qhs_lpass_top = { - .name = "qhs_lpass_top", - .id = SA8775P_SLAVE_LPASS_TOP_CFG, +static struct qcom_icc_node xm_usb3_0 = { + .name = "xm_usb3_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node qns_sysnoc = { - .name = "qns_sysnoc", - .id = SA8775P_SLAVE_LPASS_SNOC, +static struct qcom_icc_node xm_usb3_1 = { + .name = "xm_usb3_1", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_LPASS_ANOC }, + .link_nodes = { &qns_a1noc_snoc }, }; -static struct qcom_icc_node srvc_niu_aml_noc = { - .name = "srvc_niu_aml_noc", - .id = SA8775P_SLAVE_SERVICES_LPASS_AML_NOC, +static struct qcom_icc_node qhm_qdss_bam = { + .name = "qhm_qdss_bam", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node srvc_niu_lpass_agnoc = { - .name = "srvc_niu_lpass_agnoc", - .id = SA8775P_SLAVE_SERVICE_LPASS_AG_NOC, +static struct qcom_icc_node qhm_qup0 = { + .name = "qhm_qup0", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, -}; - -static struct qcom_icc_node ebi = { - .name = "ebi", - .id = SA8775P_SLAVE_EBI1, - .channels = 8, - .buswidth = 4, -}; - -static struct qcom_icc_node qns_mem_noc_hf = { - .name = "qns_mem_noc_hf", - .id = SA8775P_SLAVE_MNOC_HF_MEM_NOC, - .channels = 2, - .buswidth = 32, - .num_links = 1, - .links = { SA8775P_MASTER_MNOC_HF_MEM_NOC }, -}; - -static struct qcom_icc_node qns_mem_noc_sf = { - .name = "qns_mem_noc_sf", - .id = SA8775P_SLAVE_MNOC_SF_MEM_NOC, - .channels = 2, - .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_MNOC_SF_MEM_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node srvc_mnoc_hf = { - .name = "srvc_mnoc_hf", - .id = SA8775P_SLAVE_SERVICE_MNOC_HF, +static struct qcom_icc_node qhm_qup1 = { + .name = "qhm_qup1", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node srvc_mnoc_sf = { - .name = "srvc_mnoc_sf", - .id = SA8775P_SLAVE_SERVICE_MNOC_SF, +static struct qcom_icc_node qhm_qup2 = { + .name = "qhm_qup2", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 4, -}; - -static struct qcom_icc_node qns_hcp = { - .name = "qns_hcp", - .id = SA8775P_SLAVE_HCP_A, - .channels = 2, - .buswidth = 32, -}; - -static struct qcom_icc_node qns_nsp_gemnoc = { - .name = "qns_nsp_gemnoc", - .id = SA8775P_SLAVE_CDSP_MEM_NOC, - .channels = 2, - .buswidth = 32, .num_links = 1, - .links = { SA8775P_MASTER_COMPUTE_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node service_nsp_noc = { - .name = "service_nsp_noc", - .id = SA8775P_SLAVE_SERVICE_NSP_NOC, +static struct qcom_icc_node qnm_cnoc_datapath = { + .name = "qnm_cnoc_datapath", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_nspb_gemnoc = { - .name = "qns_nspb_gemnoc", - .id = SA8775P_SLAVE_CDSPB_MEM_NOC, - .channels = 2, - .buswidth = 32, +static struct qcom_icc_node qxm_crypto_0 = { + .name = "qxm_crypto_0", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_COMPUTE_NOC_1 }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_nspb_hcp = { - .name = "qns_nspb_hcp", - .id = SA8775P_SLAVE_HCP_B, - .channels = 2, - .buswidth = 32, +static struct qcom_icc_node qxm_crypto_1 = { + .name = "qxm_crypto_1", + .id = ALLOC_DYN_ID, + .channels = 1, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node service_nspb_noc = { - .name = "service_nspb_noc", - .id = SA8775P_SLAVE_SERVICE_NSPB_NOC, +static struct qcom_icc_node qxm_ipa = { + .name = "qxm_ipa", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 1, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_pcie_mem_noc = { - .name = "qns_pcie_mem_noc", - .id = SA8775P_SLAVE_ANOC_PCIE_GEM_NOC, +static struct qcom_icc_node xm_qdss_etr_0 = { + .name = "xm_qdss_etr_0", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 32, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_ANOC_PCIE_GEM_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_gemnoc_gc = { - .name = "qns_gemnoc_gc", - .id = SA8775P_SLAVE_SNOC_GEM_NOC_GC, +static struct qcom_icc_node xm_qdss_etr_1 = { + .name = "xm_qdss_etr_1", + .id = ALLOC_DYN_ID, .channels = 1, .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_SNOC_GC_MEM_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node qns_gemnoc_sf = { - .name = "qns_gemnoc_sf", - .id = SA8775P_SLAVE_SNOC_GEM_NOC_SF, +static struct qcom_icc_node xm_ufs_card = { + .name = "xm_ufs_card", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 16, + .buswidth = 8, .num_links = 1, - .links = { SA8775P_MASTER_SNOC_SF_MEM_NOC }, + .link_nodes = { &qns_a2noc_snoc }, }; -static struct qcom_icc_node srvc_snoc = { - .name = "srvc_snoc", - .id = SA8775P_SLAVE_SERVICE_SNOC, +static struct qcom_icc_node qxm_lpass_dsp = { + .name = "qxm_lpass_dsp", + .id = ALLOC_DYN_ID, .channels = 1, - .buswidth = 4, + .buswidth = 8, + .num_links = 4, + .link_nodes = { &qhs_lpass_top, &qns_sysnoc, + &srvc_niu_aml_noc, &srvc_niu_lpass_agnoc }, }; static struct qcom_icc_bcm bcm_acv = { From patchwork Wed Feb 5 18:27:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raviteja Laggyshetty X-Patchwork-Id: 862176 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 B2613211A0B; Wed, 5 Feb 2025 18:28:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780122; cv=none; b=sbP1D84vCb7OP8XjDqqwOrmc76TBs7X0u1so2W8OCAPp5SXqVptYKQhKWM2/rL1q8z7QTjtz/oYRpgLLSqPjGI76XGkM1iLt45N52Zov5GcUTMRg6S7v6luk5LF4/S2jOEW1P4LSve3wB1QirrvpXpxS+rGWxWxCR1pA69SLhL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780122; c=relaxed/simple; bh=3qcnpGOzLndNcLRNm5vgduVA8vqix1kz3GMebquDK9E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Qkul2/MCsmWRKwFURyWzkF2lKeVoTyYix6Hmvvejy+LBqcSZ6kerVqLnR40wny3tnItSkIWgOohJLxvMYNpUfmWUMAwCAXcRvteP+ZNKt4Uq0OKdqIr+npXQW+ZlL70YQTaLWWjZ92RKUEnAWBARmQq2EUrnH5xnph61m/nKa+A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=mpBC4Uv9; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="mpBC4Uv9" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 515FDm5f030480; Wed, 5 Feb 2025 18:28:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= G1h2zWNR5CKGQZqXhzuz5bSLRjvTisXQ3QJBAsT1mL4=; b=mpBC4Uv9UZTr5Uka BrzS/QQ9gfbRW/0HapXSB0sfn3mHkVuOsje8z538LNezXBYYNyoA7b1cRbJ9XDkW BTmN9ugXQQ1SUrVo/EEXyt4VjwaCFv4c77hZaxIBTMJMELJfeXHBp2LVI979+6qY AwQqLbdSBYpDDtekO5wanQn7rc2c27Ss/a2Fs0LkeEAgzDHfm6sljFyEhrKaROyP t1C88BdzzEo29UOW363v5/HFqKGPInC1OMkpKNcdlO4GCVzNlczFyP0R64MKTA1z 6XF7PMES6Hpjuy2FyVuQzwo1/mJmcPIb4L+06IZqsQlHrH9SdUELk4x58gDSBRlW +o4LhQ== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44maep8gqq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Feb 2025 18:28:36 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 515ISZQl007654 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 5 Feb 2025 18:28:36 GMT Received: from c194c8e2f407.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 5 Feb 2025 10:28:31 -0800 From: Raviteja Laggyshetty To: Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio CC: Odelu Kukatla , Mike Tipton , Jeff Johnson , "Andrew Halaney" , Sibi Sankar , , , , Subject: [PATCH V8 6/7] arm64: dts: qcom: sa8775p: add EPSS l3 interconnect provider Date: Wed, 5 Feb 2025 18:27:42 +0000 Message-ID: <20250205182743.915-7-quic_rlaggysh@quicinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250205182743.915-1-quic_rlaggysh@quicinc.com> References: <20250205182743.915-1-quic_rlaggysh@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: Eb83lo9toIiFDH9xBJeZR-3RCFVdqodh X-Proofpoint-ORIG-GUID: Eb83lo9toIiFDH9xBJeZR-3RCFVdqodh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_06,2025-02-05_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 lowpriorityscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 adultscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 spamscore=0 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502050141 Add Epoch Subsystem (EPSS) L3 interconnect provider node on SA8775P SoCs. L3 instances on this SoC are same as SM8250 and SC7280 SoCs. These SoCs use EPSS_L3_PERF register instead of REG_L3_VOTE register for programming the perf level. This is taken care in the data associated with the target specific compatible. Since, the HW is same in the all SoCs with EPSS support, using the same generic compatible for all. Signed-off-by: Raviteja Laggyshetty --- arch/arm64/boot/dts/qcom/sa8775p.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sa8775p.dtsi b/arch/arm64/boot/dts/qcom/sa8775p.dtsi index 3394ae2d1300..d02b4abe9e8d 100644 --- a/arch/arm64/boot/dts/qcom/sa8775p.dtsi +++ b/arch/arm64/boot/dts/qcom/sa8775p.dtsi @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -4653,6 +4654,15 @@ rpmhpd_opp_turbo_l1: opp-9 { }; }; + epss_l3_cl0: interconnect@18590000 { + compatible = "qcom,sa8775p-epss-l3", + "qcom,epss-l3"; + reg = <0x0 0x18590000 0x0 0x1000>; + clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_GPLL0>; + clock-names = "xo", "alternate"; + #interconnect-cells = <1>; + }; + cpufreq_hw: cpufreq@18591000 { compatible = "qcom,sa8775p-cpufreq-epss", "qcom,cpufreq-epss"; @@ -4666,6 +4676,15 @@ cpufreq_hw: cpufreq@18591000 { #freq-domain-cells = <1>; }; + epss_l3_cl1: interconnect@18592000 { + compatible = "qcom,sa8775p-epss-l3", + "qcom,epss-l3"; + reg = <0x0 0x18592000 0x0 0x1000>; + clocks = <&rpmhcc RPMH_CXO_CLK>, <&gcc GCC_GPLL0>; + clock-names = "xo", "alternate"; + #interconnect-cells = <1>; + }; + remoteproc_gpdsp0: remoteproc@20c00000 { compatible = "qcom,sa8775p-gpdsp0-pas"; reg = <0x0 0x20c00000 0x0 0x10000>; From patchwork Wed Feb 5 18:27:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raviteja Laggyshetty X-Patchwork-Id: 862175 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 4D69F1FF1B9; Wed, 5 Feb 2025 18:28:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780129; cv=none; b=SjijBz5zw3CmSNCOlL2euoGV6EDXKED3gUTLnUMn0+wtSbHoq5I8sok/uoYhq7A2cnP66X6f/LdTCsNYFKHdYRjV0+Eit2z197SRB8b9sc7VHBAP8v71d3iVgk458KTiJ5RqFY93Xpt/CRWfbhSesJKRqUvGynWNS7vxgPf0obM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738780129; c=relaxed/simple; bh=FUtSE/UE1A9Ya3HqBgx1wq++NUUcC8vMx2Nvn4FKgWU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tgBWi4+GYUS1BJHay/dIwyXdgVzQfTWmDpgTu884Y8Z2XbUWd1vLTFC/LXMvfcEKzFMAYmdvzuCEyc9n9r+H+8AYK1z/BtxgRuwprBEiPTiutUQPSmQuGTd/lzzasDYwyJUDZPP2ZujOjUI1peONyADfLiuDxVqWy7JuGIAonlw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=HMuKfM3P; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="HMuKfM3P" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 515EkkqQ019506; Wed, 5 Feb 2025 18:28:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= R8mNYremigxjTzd7LhYMh2Mavq9HiTNMD8SDWGPWAlM=; b=HMuKfM3PfPnhZ/pX iTn1M1IK0F+3FoS7xKHebvI3PDA9VpBKn1SrWmfvr6tVJss9qThwHtISsuBOwGc6 C3aWQJe0rZdmd22kx9xYzvA5rtdYHVep2jxQOjH3zO+r8FRcChshE2lStN+xRA+t m0xGm2MYzbmxJ+utl2eZ8d/E7vTegvZjPe4Hnp81Oy6hOF9Q5dn8CwtK4KCx/tUF 0ME2pnRafOOTJUIlrw5gxjfctbOBq9B46vhbWTTN5qbAmcBe+zTBuL5M78ZmNNDu wRhKvj+oEmS/7mHD+yyDZdF7KSTVKdhmPRn0ngoBsfE5pY3RvXXf/sk6wnuJNRqz 6E/lOw== Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 44m9txgmjh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 05 Feb 2025 18:28:41 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NASANPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 515ISeoK007700 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 5 Feb 2025 18:28:40 GMT Received: from c194c8e2f407.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Wed, 5 Feb 2025 10:28:36 -0800 From: Raviteja Laggyshetty To: Georgi Djakov , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Bjorn Andersson , Konrad Dybcio CC: Odelu Kukatla , Mike Tipton , Jeff Johnson , "Andrew Halaney" , Sibi Sankar , , , , , "Shivnandan Kumar" Subject: [PATCH V8 7/7] arm64: dts: qcom: sa8775p: Add CPU OPP tables to scale DDR/L3 Date: Wed, 5 Feb 2025 18:27:43 +0000 Message-ID: <20250205182743.915-8-quic_rlaggysh@quicinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250205182743.915-1-quic_rlaggysh@quicinc.com> References: <20250205182743.915-1-quic_rlaggysh@quicinc.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: hwIQrOBYoxys8Ixu4EYtY2mZYvQ1FPKq X-Proofpoint-GUID: hwIQrOBYoxys8Ixu4EYtY2mZYvQ1FPKq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_06,2025-02-05_03,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 bulkscore=0 impostorscore=0 adultscore=0 mlxlogscore=999 clxscore=1015 mlxscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502050141 From: Jagadeesh Kona Add OPP tables required to scale DDR and L3 per freq-domain on SA8775P platform. If a single OPP table is used for both CPU domains, then _allocate_opp_table() won't be invoked for CPU4 but instead CPU4 will be added as device under the CPU0 OPP table. Due to this, dev_pm_opp_of_find_icc_paths() won't be invoked for CPU4 device and hence CPU4 won't be able to independently scale it's interconnects. Both CPU0 and CPU4 devices will scale the same ICC path which can lead to one device overwriting the BW vote placed by other device. Hence CPU0 and CPU4 require separate OPP tables to allow independent scaling of DDR and L3 frequencies for each CPU domain, with the final DDR and L3 frequencies being an aggregate of both. Co-developed-by: Shivnandan Kumar Signed-off-by: Shivnandan Kumar Signed-off-by: Jagadeesh Kona Signed-off-by: Raviteja Laggyshetty --- arch/arm64/boot/dts/qcom/sa8775p.dtsi | 210 ++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sa8775p.dtsi b/arch/arm64/boot/dts/qcom/sa8775p.dtsi index d02b4abe9e8d..8b071deb115f 100644 --- a/arch/arm64/boot/dts/qcom/sa8775p.dtsi +++ b/arch/arm64/boot/dts/qcom/sa8775p.dtsi @@ -52,6 +52,11 @@ cpu0: cpu@0 { next-level-cache = <&l2_0>; capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <100>; + operating-points-v2 = <&cpu0_opp_table>; + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>, + <&epss_l3_cl0 MASTER_EPSS_L3_APPS + &epss_l3_cl0 SLAVE_EPSS_L3_SHARED>; l2_0: l2-cache { compatible = "cache"; cache-level = <2>; @@ -76,6 +81,11 @@ cpu1: cpu@100 { next-level-cache = <&l2_1>; capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <100>; + operating-points-v2 = <&cpu0_opp_table>; + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>, + <&epss_l3_cl0 MASTER_EPSS_L3_APPS + &epss_l3_cl0 SLAVE_EPSS_L3_SHARED>; l2_1: l2-cache { compatible = "cache"; cache-level = <2>; @@ -95,6 +105,11 @@ cpu2: cpu@200 { next-level-cache = <&l2_2>; capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <100>; + operating-points-v2 = <&cpu0_opp_table>; + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>, + <&epss_l3_cl0 MASTER_EPSS_L3_APPS + &epss_l3_cl0 SLAVE_EPSS_L3_SHARED>; l2_2: l2-cache { compatible = "cache"; cache-level = <2>; @@ -114,6 +129,11 @@ cpu3: cpu@300 { next-level-cache = <&l2_3>; capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <100>; + operating-points-v2 = <&cpu0_opp_table>; + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>, + <&epss_l3_cl0 MASTER_EPSS_L3_APPS + &epss_l3_cl0 SLAVE_EPSS_L3_SHARED>; l2_3: l2-cache { compatible = "cache"; cache-level = <2>; @@ -133,6 +153,11 @@ cpu4: cpu@10000 { next-level-cache = <&l2_4>; capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <100>; + operating-points-v2 = <&cpu4_opp_table>; + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>, + <&epss_l3_cl1 MASTER_EPSS_L3_APPS + &epss_l3_cl1 SLAVE_EPSS_L3_SHARED>; l2_4: l2-cache { compatible = "cache"; cache-level = <2>; @@ -158,6 +183,11 @@ cpu5: cpu@10100 { next-level-cache = <&l2_5>; capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <100>; + operating-points-v2 = <&cpu4_opp_table>; + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>, + <&epss_l3_cl1 MASTER_EPSS_L3_APPS + &epss_l3_cl1 SLAVE_EPSS_L3_SHARED>; l2_5: l2-cache { compatible = "cache"; cache-level = <2>; @@ -177,6 +207,11 @@ cpu6: cpu@10200 { next-level-cache = <&l2_6>; capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <100>; + operating-points-v2 = <&cpu4_opp_table>; + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>, + <&epss_l3_cl1 MASTER_EPSS_L3_APPS + &epss_l3_cl1 SLAVE_EPSS_L3_SHARED>; l2_6: l2-cache { compatible = "cache"; cache-level = <2>; @@ -196,6 +231,11 @@ cpu7: cpu@10300 { next-level-cache = <&l2_7>; capacity-dmips-mhz = <1024>; dynamic-power-coefficient = <100>; + operating-points-v2 = <&cpu4_opp_table>; + interconnects = <&gem_noc MASTER_APPSS_PROC QCOM_ICC_TAG_ACTIVE_ONLY + &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ACTIVE_ONLY>, + <&epss_l3_cl1 MASTER_EPSS_L3_APPS + &epss_l3_cl1 SLAVE_EPSS_L3_SHARED>; l2_7: l2-cache { compatible = "cache"; cache-level = <2>; @@ -285,6 +325,176 @@ cluster_sleep_apss_rsc_pc: cluster-sleep-1 { }; }; + cpu0_opp_table: opp-table-cpu0 { + compatible = "operating-points-v2"; + opp-shared; + + cpu0_opp_1267mhz: opp-1267200000 { + opp-hz = /bits/ 64 <1267200000>; + opp-peak-kBps = <6220800 29491200>; + }; + + cpu0_opp_1363mhz: opp-1363200000 { + opp-hz = /bits/ 64 <1363200000>; + opp-peak-kBps = <6220800 29491200>; + }; + + cpu0_opp_1459mhz: opp-1459200000 { + opp-hz = /bits/ 64 <1459200000>; + opp-peak-kBps = <6220800 29491200>; + }; + + cpu0_opp_1536mhz: opp-1536000000 { + opp-hz = /bits/ 64 <1536000000>; + opp-peak-kBps = <6220800 29491200>; + }; + + cpu0_opp_1632mhz: opp-1632000000 { + opp-hz = /bits/ 64 <1632000000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu0_opp_1708mhz: opp-1708800000 { + opp-hz = /bits/ 64 <1708800000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu0_opp_1785mhz: opp-1785600000 { + opp-hz = /bits/ 64 <1785600000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu0_opp_1862mhz: opp-1862400000 { + opp-hz = /bits/ 64 <1862400000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu0_opp_1939mhz: opp-1939200000 { + opp-hz = /bits/ 64 <1939200000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu0_opp_2016mhz: opp-2016000000 { + opp-hz = /bits/ 64 <2016000000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu0_opp_2112mhz: opp-2112000000 { + opp-hz = /bits/ 64 <2112000000>; + opp-peak-kBps = <8371200 49766400>; + }; + + cpu0_opp_2188mhz: opp-2188800000 { + opp-hz = /bits/ 64 <2188800000>; + opp-peak-kBps = <8371200 49766400>; + }; + + cpu0_opp_2265mhz: opp-2265600000 { + opp-hz = /bits/ 64 <2265600000>; + opp-peak-kBps = <8371200 49766400>; + }; + + cpu0_opp_2361mhz: opp-2361600000 { + opp-hz = /bits/ 64 <2361600000>; + opp-peak-kBps = <12787200 51609600>; + }; + + cpu0_opp_2457mhz: opp-2457600000 { + opp-hz = /bits/ 64 <2457600000>; + opp-peak-kBps = <12787200 51609600>; + }; + + cpu0_opp_2553mhz: opp-2553600000 { + opp-hz = /bits/ 64 <2553600000>; + opp-peak-kBps = <12787200 54681600>; + }; + }; + + cpu4_opp_table: opp-table-cpu4 { + compatible = "operating-points-v2"; + opp-shared; + + cpu4_opp_1267mhz: opp-1267200000 { + opp-hz = /bits/ 64 <1267200000>; + opp-peak-kBps = <6220800 29491200>; + }; + + cpu4_opp_1363mhz: opp-1363200000 { + opp-hz = /bits/ 64 <1363200000>; + opp-peak-kBps = <6220800 29491200>; + }; + + cpu4_opp_1459mhz: opp-1459200000 { + opp-hz = /bits/ 64 <1459200000>; + opp-peak-kBps = <6220800 29491200>; + }; + + cpu4_opp_1536mhz: opp-1536000000 { + opp-hz = /bits/ 64 <1536000000>; + opp-peak-kBps = <6220800 29491200>; + }; + + cpu4_opp_1632mhz: opp-1632000000 { + opp-hz = /bits/ 64 <1632000000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu4_opp_1708mhz: opp-1708800000 { + opp-hz = /bits/ 64 <1708800000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu4_opp_1785mhz: opp-1785600000 { + opp-hz = /bits/ 64 <1785600000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu4_opp_1862mhz: opp-1862400000 { + opp-hz = /bits/ 64 <1862400000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu4_opp_1939mhz: opp-1939200000 { + opp-hz = /bits/ 64 <1939200000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu4_opp_2016mhz: opp-2016000000 { + opp-hz = /bits/ 64 <2016000000>; + opp-peak-kBps = <6835200 39321600>; + }; + + cpu4_opp_2112mhz: opp-2112000000 { + opp-hz = /bits/ 64 <2112000000>; + opp-peak-kBps = <8371200 49766400>; + }; + + cpu4_opp_2188mhz: opp-2188800000 { + opp-hz = /bits/ 64 <2188800000>; + opp-peak-kBps = <8371200 49766400>; + }; + + cpu4_opp_2265mhz: opp-2265600000 { + opp-hz = /bits/ 64 <2265600000>; + opp-peak-kBps = <8371200 49766400>; + }; + + cpu4_opp_2361mhz: opp-2361600000 { + opp-hz = /bits/ 64 <2361600000>; + opp-peak-kBps = <12787200 51609600>; + }; + + cpu4_opp_2457mhz: opp-2457600000 { + opp-hz = /bits/ 64 <2457600000>; + opp-peak-kBps = <12787200 51609600>; + }; + + cpu4_opp_2553mhz: opp-2553600000 { + opp-hz = /bits/ 64 <2553600000>; + opp-peak-kBps = <12787200 54681600>; + }; + }; + dummy-sink { compatible = "arm,coresight-dummy-sink";