mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC
@ 2025-02-05 18:27 Raviteja Laggyshetty
  2025-02-05 18:27 ` [PATCH V8 1/7] dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P Raviteja Laggyshetty
                   ` (6 more replies)
  0 siblings, 7 replies; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-05 18:27 UTC (permalink / raw)
  To: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel

Add Epoch Subsystem (EPSS) L3 provider support on SA8775P SoCs.

Current interconnect framework is based on static IDs for creating node
and registering with framework. This becomes a limitation for topologies
where there are multiple instances of same interconnect provider.
Modified interconnect framework APIs to create and link icc node with
dynamic IDs, this will help to overcome the dependency on static IDs.

Change since v7:
 - Updated interconnect framework APIs icc_node_create() and
   icc_link_create() to dynamically allocate IDs for interconnect nodes
   during creation.
 - Moved naming conventions to the framework and replaced snprintf() with
   devm_kasprintf() as suggested.
 - Updated the icc-rpmh driver and SA8775P SoC provider driver to support
   dynamic ID allocation.
 - Revised commit text to explain the use of the existing generic 
   compatible "qcom,epss-l3".
 - Addressed other comments regarding the alphabetical ordering of 
   compatible properties.

Change since v6:
 - Added icc_node_create_alloc_id() API to dynamically allocate ID while
   creating the node. Replaced the IDA (ID allocator) with
   icc_node_create_alloc_id() API to allocate node IDs dynamically.
 - Removed qcom,epss-l3-perf generic compatible as per the comment.
 - Added L3 ICC handles for CPU0 and CPU4 in DT, as per Bjorn comment.
   Link to comment:
   https://lore.kernel.org/lkml/ww3t3tu7p36qzlhcetaxif2xzrpgslydmuqo3fqvisbuar4bjh@qc2u43dck3qi/

Change since v5:
 - Reused qcom,sm8250-epss-l3 compatible for sa8775p SoC.
 - Rearranged the patches, moved dt changes to end of series.
 - Updated the commit text.

Changes since v4:
 - Added generic compatible "qcom,epss-l3-perf" and split the driver
   changes accordingly.

Changes since v3:
 - Removed epss-l3-perf generic compatible changes. These will be posted
   as separate patch until then SoC specific compatible will be used for
   probing.

Changes since v2:
 - Updated the commit text to reflect the reason for code change.
 - Added SoC-specific and generic compatible to driver match table.

Changes since v1:
 - Removed the usage of static IDs and implemented dynamic ID assignment
   for icc nodes using IDA.
 - Removed separate compatibles for cl0 and cl1. Both cl0 and cl1
   devices use the same compatible.
 - Added new generic compatible for epss-l3-perf.

Jagadeesh Kona (1):
  arm64: dts: qcom: sa8775p: Add CPU OPP tables to scale DDR/L3

Raviteja Laggyshetty (6):
  dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P
  interconnect: core: Add dynamic id allocation support
  interconnect: qcom: Add multidev EPSS L3 support
  interconnect: qcom: icc-rpmh: Add dynamic icc node id support
  interconnect: qcom: sa8775p: Add dynamic icc node id support
  arm64: dts: qcom: sa8775p: add EPSS l3 interconnect provider

 .../bindings/interconnect/qcom,osm-l3.yaml    |    1 +
 arch/arm64/boot/dts/qcom/sa8775p.dtsi         |  229 ++
 drivers/interconnect/core.c                   |   13 +-
 drivers/interconnect/qcom/icc-rpmh.c          |   16 +-
 drivers/interconnect/qcom/icc-rpmh.h          |    3 +-
 drivers/interconnect/qcom/osm-l3.c            |   46 +-
 drivers/interconnect/qcom/sa8775p.c           | 2194 ++++++++---------
 7 files changed, 1246 insertions(+), 1256 deletions(-)

-- 
2.39.2


^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH V8 1/7] dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P
  2025-02-05 18:27 [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC Raviteja Laggyshetty
@ 2025-02-05 18:27 ` Raviteja Laggyshetty
  2025-02-10 10:11   ` Krzysztof Kozlowski
  2025-02-05 18:27 ` [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support Raviteja Laggyshetty
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-05 18:27 UTC (permalink / raw)
  To: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel

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 <quic_rlaggysh@quicinc.com>
---
 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
-- 
2.39.2


^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support
  2025-02-05 18:27 [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC Raviteja Laggyshetty
  2025-02-05 18:27 ` [PATCH V8 1/7] dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P Raviteja Laggyshetty
@ 2025-02-05 18:27 ` Raviteja Laggyshetty
  2025-02-10 10:50   ` Dmitry Baryshkov
  2025-02-05 18:27 ` [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support Raviteja Laggyshetty
                   ` (4 subsequent siblings)
  6 siblings, 1 reply; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-05 18:27 UTC (permalink / raw)
  To: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel

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 <quic_rlaggysh@quicinc.com>
---
 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);
-- 
2.39.2


^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support
  2025-02-05 18:27 [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC Raviteja Laggyshetty
  2025-02-05 18:27 ` [PATCH V8 1/7] dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P Raviteja Laggyshetty
  2025-02-05 18:27 ` [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support Raviteja Laggyshetty
@ 2025-02-05 18:27 ` Raviteja Laggyshetty
  2025-02-10 10:57   ` Dmitry Baryshkov
  2025-02-05 18:27 ` [PATCH V8 4/7] interconnect: qcom: icc-rpmh: Add dynamic icc node id support Raviteja Laggyshetty
                   ` (3 subsequent siblings)
  6 siblings, 1 reply; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-05 18:27 UTC (permalink / raw)
  To: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel

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 <quic_rlaggysh@quicinc.com>
---
 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 <linux/args.h>
@@ -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 },
-- 
2.39.2


^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH V8 4/7] interconnect: qcom: icc-rpmh: Add dynamic icc node id support
  2025-02-05 18:27 [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC Raviteja Laggyshetty
                   ` (2 preceding siblings ...)
  2025-02-05 18:27 ` [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support Raviteja Laggyshetty
@ 2025-02-05 18:27 ` Raviteja Laggyshetty
  2025-02-05 18:27 ` [PATCH V8 5/7] interconnect: qcom: sa8775p: " Raviteja Laggyshetty
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-05 18:27 UTC (permalink / raw)
  To: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel

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 <quic_rlaggysh@quicinc.com>
---
 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;
-- 
2.39.2


^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH V8 5/7] interconnect: qcom: sa8775p: Add dynamic icc node id support
  2025-02-05 18:27 [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC Raviteja Laggyshetty
                   ` (3 preceding siblings ...)
  2025-02-05 18:27 ` [PATCH V8 4/7] interconnect: qcom: icc-rpmh: Add dynamic icc node id support Raviteja Laggyshetty
@ 2025-02-05 18:27 ` Raviteja Laggyshetty
  2025-02-06  1:00   ` Dmitry Baryshkov
  2025-02-05 18:27 ` [PATCH V8 6/7] arm64: dts: qcom: sa8775p: add EPSS l3 interconnect provider Raviteja Laggyshetty
  2025-02-05 18:27 ` [PATCH V8 7/7] arm64: dts: qcom: sa8775p: Add CPU OPP tables to scale DDR/L3 Raviteja Laggyshetty
  6 siblings, 1 reply; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-05 18:27 UTC (permalink / raw)
  To: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel

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 <quic_rlaggysh@quicinc.com>
---
 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 = {
-- 
2.39.2


^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH V8 6/7] arm64: dts: qcom: sa8775p: add EPSS l3 interconnect provider
  2025-02-05 18:27 [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC Raviteja Laggyshetty
                   ` (4 preceding siblings ...)
  2025-02-05 18:27 ` [PATCH V8 5/7] interconnect: qcom: sa8775p: " Raviteja Laggyshetty
@ 2025-02-05 18:27 ` Raviteja Laggyshetty
  2025-02-11 14:36   ` Konrad Dybcio
  2025-02-05 18:27 ` [PATCH V8 7/7] arm64: dts: qcom: sa8775p: Add CPU OPP tables to scale DDR/L3 Raviteja Laggyshetty
  6 siblings, 1 reply; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-05 18:27 UTC (permalink / raw)
  To: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel

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 <quic_rlaggysh@quicinc.com>
---
 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 <dt-bindings/clock/qcom,sa8775p-gcc.h>
 #include <dt-bindings/clock/qcom,sa8775p-gpucc.h>
 #include <dt-bindings/dma/qcom-gpi.h>
+#include <dt-bindings/interconnect/qcom,osm-l3.h>
 #include <dt-bindings/interconnect/qcom,sa8775p-rpmh.h>
 #include <dt-bindings/mailbox/qcom-ipcc.h>
 #include <dt-bindings/firmware/qcom,scm.h>
@@ -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>;
-- 
2.39.2


^ permalink raw reply	[flat|nested] 21+ messages in thread

* [PATCH V8 7/7] arm64: dts: qcom: sa8775p: Add CPU OPP tables to scale DDR/L3
  2025-02-05 18:27 [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC Raviteja Laggyshetty
                   ` (5 preceding siblings ...)
  2025-02-05 18:27 ` [PATCH V8 6/7] arm64: dts: qcom: sa8775p: add EPSS l3 interconnect provider Raviteja Laggyshetty
@ 2025-02-05 18:27 ` Raviteja Laggyshetty
  2025-02-11 15:31   ` Konrad Dybcio
  6 siblings, 1 reply; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-05 18:27 UTC (permalink / raw)
  To: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel,
	Shivnandan Kumar

From: Jagadeesh Kona <quic_jkona@quicinc.com>

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 <quic_kshivnan@quicinc.com>
Signed-off-by: Shivnandan Kumar <quic_kshivnan@quicinc.com>
Signed-off-by: Jagadeesh Kona <quic_jkona@quicinc.com>
Signed-off-by: Raviteja Laggyshetty <quic_rlaggysh@quicinc.com>
---
 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";
 
-- 
2.39.2


^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 5/7] interconnect: qcom: sa8775p: Add dynamic icc node id support
  2025-02-05 18:27 ` [PATCH V8 5/7] interconnect: qcom: sa8775p: " Raviteja Laggyshetty
@ 2025-02-06  1:00   ` Dmitry Baryshkov
  2025-02-10  6:12     ` Raviteja Laggyshetty
  0 siblings, 1 reply; 21+ messages in thread
From: Dmitry Baryshkov @ 2025-02-06  1:00 UTC (permalink / raw)
  To: Raviteja Laggyshetty
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel

On Wed, Feb 05, 2025 at 06:27:41PM +0000, Raviteja Laggyshetty wrote:
> 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.

I think it might be better to forward-declare all node entries at the
top and then keep currently defined nodes in place. Otherwise the diff
is pretty unreadable.

> 
> Signed-off-by: Raviteja Laggyshetty <quic_rlaggysh@quicinc.com>
> ---
>  drivers/interconnect/qcom/sa8775p.c | 2194 ++++++++++++---------------
>  1 file changed, 962 insertions(+), 1232 deletions(-)
> 

-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 5/7] interconnect: qcom: sa8775p: Add dynamic icc node id support
  2025-02-06  1:00   ` Dmitry Baryshkov
@ 2025-02-10  6:12     ` Raviteja Laggyshetty
  0 siblings, 0 replies; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-10  6:12 UTC (permalink / raw)
  To: Dmitry Baryshkov
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel



On 2/6/2025 6:30 AM, Dmitry Baryshkov wrote:
> On Wed, Feb 05, 2025 at 06:27:41PM +0000, Raviteja Laggyshetty wrote:
>> 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.
> 
> I think it might be better to forward-declare all node entries at the
> top and then keep currently defined nodes in place. Otherwise the diff
> is pretty unreadable.
>

Sure, will upload a new patch with forward declarations.
These forward declarations will be present only for SA8775P and for
upcoming SoCs, topology will be adjusted to avoid the forward declarations.
Please review the other patches in this series, so that I can include
the suggestions in the next patch revision.

Thanks,
Raviteja.

>>
>> Signed-off-by: Raviteja Laggyshetty <quic_rlaggysh@quicinc.com>
>> ---
>>  drivers/interconnect/qcom/sa8775p.c | 2194 ++++++++++++---------------
>>  1 file changed, 962 insertions(+), 1232 deletions(-)
>>
> 


^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 1/7] dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P
  2025-02-05 18:27 ` [PATCH V8 1/7] dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P Raviteja Laggyshetty
@ 2025-02-10 10:11   ` Krzysztof Kozlowski
  0 siblings, 0 replies; 21+ messages in thread
From: Krzysztof Kozlowski @ 2025-02-10 10:11 UTC (permalink / raw)
  To: Raviteja Laggyshetty
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel

On Wed, Feb 05, 2025 at 06:27:37PM +0000, Raviteja Laggyshetty wrote:
> 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 <quic_rlaggysh@quicinc.com>
> ---
>  Documentation/devicetree/bindings/interconnect/qcom,osm-l3.yaml | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support
  2025-02-05 18:27 ` [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support Raviteja Laggyshetty
@ 2025-02-10 10:50   ` Dmitry Baryshkov
  2025-02-16 16:38     ` Raviteja Laggyshetty
  0 siblings, 1 reply; 21+ messages in thread
From: Dmitry Baryshkov @ 2025-02-10 10:50 UTC (permalink / raw)
  To: Raviteja Laggyshetty
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel

On Wed, Feb 05, 2025 at 06:27:38PM +0000, Raviteja Laggyshetty wrote:
> 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 <quic_rlaggysh@quicinc.com>
> ---
>  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)

Nit: I think it might be better to add an explicit define for that and
to decline all other negatdive values. Please leave us some room for
future expansion.

> +		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);
> -- 
> 2.39.2
> 

-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support
  2025-02-05 18:27 ` [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support Raviteja Laggyshetty
@ 2025-02-10 10:57   ` Dmitry Baryshkov
  2025-02-16 16:28     ` Raviteja Laggyshetty
  0 siblings, 1 reply; 21+ messages in thread
From: Dmitry Baryshkov @ 2025-02-10 10:57 UTC (permalink / raw)
  To: Raviteja Laggyshetty
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel

On Wed, Feb 05, 2025 at 06:27:39PM +0000, Raviteja Laggyshetty wrote:
> 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 <quic_rlaggysh@quicinc.com>
> ---
>  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 <linux/args.h>
> @@ -33,6 +34,7 @@
>  #define EPSS_REG_PERF_STATE		0x320
>  
>  #define OSM_L3_MAX_LINKS		1
> +#define ALLOC_DYN_ID			-1

This should be defined by ICC framework.

>  
>  #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;

This can be initialized statically.

> +
>  	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;

Should not be necessary.

>  
>  		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);

Please add icc_link_nodes() (or something like that), taking two struct
icc_node instances. Then you can use it here, instead of reading back
the ID. Ideally the 'ID' should become an internal detail which is of no
concern for the ICC drivers.

> +			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 },
> -- 
> 2.39.2
> 

-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 6/7] arm64: dts: qcom: sa8775p: add EPSS l3 interconnect provider
  2025-02-05 18:27 ` [PATCH V8 6/7] arm64: dts: qcom: sa8775p: add EPSS l3 interconnect provider Raviteja Laggyshetty
@ 2025-02-11 14:36   ` Konrad Dybcio
  0 siblings, 0 replies; 21+ messages in thread
From: Konrad Dybcio @ 2025-02-11 14:36 UTC (permalink / raw)
  To: Raviteja Laggyshetty, Georgi Djakov, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Bjorn Andersson,
	Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel

On 5.02.2025 7:27 PM, Raviteja Laggyshetty wrote:
> 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 <quic_rlaggysh@quicinc.com>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 7/7] arm64: dts: qcom: sa8775p: Add CPU OPP tables to scale DDR/L3
  2025-02-05 18:27 ` [PATCH V8 7/7] arm64: dts: qcom: sa8775p: Add CPU OPP tables to scale DDR/L3 Raviteja Laggyshetty
@ 2025-02-11 15:31   ` Konrad Dybcio
  0 siblings, 0 replies; 21+ messages in thread
From: Konrad Dybcio @ 2025-02-11 15:31 UTC (permalink / raw)
  To: Raviteja Laggyshetty, Georgi Djakov, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Bjorn Andersson,
	Konrad Dybcio
  Cc: Odelu Kukatla, Mike Tipton, Jeff Johnson, Andrew Halaney,
	Sibi Sankar, linux-arm-msm, linux-pm, devicetree, linux-kernel,
	Shivnandan Kumar

On 5.02.2025 7:27 PM, Raviteja Laggyshetty wrote:
> From: Jagadeesh Kona <quic_jkona@quicinc.com>
> 
> 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 <quic_kshivnan@quicinc.com>
> Signed-off-by: Shivnandan Kumar <quic_kshivnan@quicinc.com>
> Signed-off-by: Jagadeesh Kona <quic_jkona@quicinc.com>
> Signed-off-by: Raviteja Laggyshetty <quic_rlaggysh@quicinc.com>
> ---

[...]

> +	cpu0_opp_table: opp-table-cpu0 {
> +		compatible = "operating-points-v2";
> +		opp-shared;
> +
> +		cpu0_opp_1267mhz: opp-1267200000 {

Drop the labels, they're not needed anywhere

> +			opp-hz = /bits/ 64 <1267200000>;
> +			opp-peak-kBps = <6220800 29491200>;

(921600 * 32) etc. to reflect the clock rate, please

Konrad

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support
  2025-02-10 10:57   ` Dmitry Baryshkov
@ 2025-02-16 16:28     ` Raviteja Laggyshetty
  2025-02-17  1:08       ` Dmitry Baryshkov
  0 siblings, 1 reply; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-16 16:28 UTC (permalink / raw)
  To: Dmitry Baryshkov
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel



On 2/10/2025 4:27 PM, Dmitry Baryshkov wrote:
> On Wed, Feb 05, 2025 at 06:27:39PM +0000, Raviteja Laggyshetty wrote:
>> 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 <quic_rlaggysh@quicinc.com>
>> ---
>>  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 <linux/args.h>
>> @@ -33,6 +34,7 @@
>>  #define EPSS_REG_PERF_STATE		0x320
>>  
>>  #define OSM_L3_MAX_LINKS		1
>> +#define ALLOC_DYN_ID			-1
> 
> This should be defined by ICC framework.

ok, I will move this to framework.
> 
>>  
>>  #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;
> 
> This can be initialized statically.

There are two instances of EPSS L3 and the target specific compatible
data is global which requires resetting the IDs for the second instance
probe. If we don't the reset the IDs back to ALLOC_DYN_ID, then ICC
framework assumes that ID has been already allocated and doesn't create
the new ICC nodes for the second instance.

> 
>> +
>>  	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;
> 
> Should not be necessary.
This is required, each qnode corresponds to a ICC node in framework and
some nodes get created in icc_node_create() API and some in
icc_link_create() API, to have a track of node creation qnode->id is
used, hence initializing qnode->id with id allocated during icc node
creation and avoid creation of duplicate nodes.
> 
>>  
>>  		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);
> 
> Please add icc_link_nodes() (or something like that), taking two struct
> icc_node instances. Then you can use it here, instead of reading back
> the ID. Ideally the 'ID' should become an internal detail which is of no
> concern for the ICC drivers.
>

Instead of reading back the link node id from the framework, I will call
icc_node_create before calling the icc_link_create() API and assign the
allocated id to respective qnode in the following way:

struct qcom_osm_l3_node *qn_link_node = qnodes[i]->links[j];
struct icc_node *link_node = icc_node_create(qnodes[i]->links[j]->id);
qn_link_node->id = link_node->id;
icc_link_create(node, link_node->id);

This looks cleaner than reading back the 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 },
>> -- 
>> 2.39.2
>>
> 


^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support
  2025-02-10 10:50   ` Dmitry Baryshkov
@ 2025-02-16 16:38     ` Raviteja Laggyshetty
  2025-02-17  1:02       ` Dmitry Baryshkov
  0 siblings, 1 reply; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-16 16:38 UTC (permalink / raw)
  To: Dmitry Baryshkov
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel



On 2/10/2025 4:20 PM, Dmitry Baryshkov wrote:
> On Wed, Feb 05, 2025 at 06:27:38PM +0000, Raviteja Laggyshetty wrote:
>> 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 <quic_rlaggysh@quicinc.com>
>> ---
>>  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)
> 
> Nit: I think it might be better to add an explicit define for that and
> to decline all other negatdive values. Please leave us some room for
> future expansion.
> 
Do you mean to replace the value of ALLOC_DYN_ID from -1 to some
positive value like 100000 and to use it as initial ID for the nodes
requiring the dynamic allocation ? This explicit define can be used as
check for dynamic allocation and also as argument to idr_alloc min value
argument. Is my interpretation of the comment correct ?

>> +		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);
>> -- 
>> 2.39.2
>>
> 


^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support
  2025-02-16 16:38     ` Raviteja Laggyshetty
@ 2025-02-17  1:02       ` Dmitry Baryshkov
  2025-02-21  6:18         ` Raviteja Laggyshetty
  0 siblings, 1 reply; 21+ messages in thread
From: Dmitry Baryshkov @ 2025-02-17  1:02 UTC (permalink / raw)
  To: Raviteja Laggyshetty
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel

On Sun, Feb 16, 2025 at 10:08:51PM +0530, Raviteja Laggyshetty wrote:
> 
> 
> On 2/10/2025 4:20 PM, Dmitry Baryshkov wrote:
> > On Wed, Feb 05, 2025 at 06:27:38PM +0000, Raviteja Laggyshetty wrote:
> >> 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 <quic_rlaggysh@quicinc.com>
> >> ---
> >>  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)
> > 
> > Nit: I think it might be better to add an explicit define for that and
> > to decline all other negatdive values. Please leave us some room for
> > future expansion.
> > 
> Do you mean to replace the value of ALLOC_DYN_ID from -1 to some
> positive value like 100000 and to use it as initial ID for the nodes
> requiring the dynamic allocation ? This explicit define can be used as
> check for dynamic allocation and also as argument to idr_alloc min value
> argument. Is my interpretation of the comment correct ?

No, it is not. I asked to add an explicit define for -1 in the ICC
framework and make icc_node_create_nolock() reject all other negative
values.

> 
> >> +		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);
> >> -- 
> >> 2.39.2
> >>
> > 
> 

-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support
  2025-02-16 16:28     ` Raviteja Laggyshetty
@ 2025-02-17  1:08       ` Dmitry Baryshkov
  2025-02-21 11:09         ` Raviteja Laggyshetty
  0 siblings, 1 reply; 21+ messages in thread
From: Dmitry Baryshkov @ 2025-02-17  1:08 UTC (permalink / raw)
  To: Raviteja Laggyshetty
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel

On Sun, Feb 16, 2025 at 09:58:41PM +0530, Raviteja Laggyshetty wrote:
> 
> 
> On 2/10/2025 4:27 PM, Dmitry Baryshkov wrote:
> > On Wed, Feb 05, 2025 at 06:27:39PM +0000, Raviteja Laggyshetty wrote:
> >> 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 <quic_rlaggysh@quicinc.com>
> >> ---
> >>  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 <linux/args.h>
> >> @@ -33,6 +34,7 @@
> >>  #define EPSS_REG_PERF_STATE		0x320
> >>  
> >>  #define OSM_L3_MAX_LINKS		1
> >> +#define ALLOC_DYN_ID			-1
> > 
> > This should be defined by ICC framework.
> 
> ok, I will move this to framework.
> > 
> >>  
> >>  #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 = {			\

No. Global data _must_ remain const.

> >>  		.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;
> > 
> > This can be initialized statically.
> 
> There are two instances of EPSS L3 and the target specific compatible
> data is global which requires resetting the IDs for the second instance
> probe. If we don't the reset the IDs back to ALLOC_DYN_ID, then ICC
> framework assumes that ID has been already allocated and doesn't create
> the new ICC nodes for the second instance.

Well, don't use global data for shared purposes. Consider both your
instances probing at the same time. So, please drop the
qcom_osm_l3_node.id, pass ALLOC_DYN_ID directly to the
icc_node_create(), store returned nodes in a local array and pass node
pointers to icc_link_create().

> 
> > 
> >> +
> >>  	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;
> > 
> > Should not be necessary.
> This is required, each qnode corresponds to a ICC node in framework and
> some nodes get created in icc_node_create() API and some in
> icc_link_create() API, to have a track of node creation qnode->id is
> used, hence initializing qnode->id with id allocated during icc node
> creation and avoid creation of duplicate nodes.

Basically, no. You cannot do that. Create nodes first, create links
afterwards.

> > 
> >>  
> >>  		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);
> > 
> > Please add icc_link_nodes() (or something like that), taking two struct
> > icc_node instances. Then you can use it here, instead of reading back
> > the ID. Ideally the 'ID' should become an internal detail which is of no
> > concern for the ICC drivers.
> >
> 
> Instead of reading back the link node id from the framework, I will call
> icc_node_create before calling the icc_link_create() API and assign the
> allocated id to respective qnode in the following way:
> 
> struct qcom_osm_l3_node *qn_link_node = qnodes[i]->links[j];
> struct icc_node *link_node = icc_node_create(qnodes[i]->links[j]->id);
> qn_link_node->id = link_node->id;
> icc_link_create(node, link_node->id);
> 
> This looks cleaner than reading back the id.

As you might have guessed from the the earlier comments, no. Don't write
_anything_ to a global data.

> 
> 
> >> +			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 },
> >> -- 
> >> 2.39.2
> >>
> > 
> 

-- 
With best wishes
Dmitry

^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support
  2025-02-17  1:02       ` Dmitry Baryshkov
@ 2025-02-21  6:18         ` Raviteja Laggyshetty
  0 siblings, 0 replies; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-21  6:18 UTC (permalink / raw)
  To: Dmitry Baryshkov
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel



On 2/17/2025 6:32 AM, Dmitry Baryshkov wrote:
> On Sun, Feb 16, 2025 at 10:08:51PM +0530, Raviteja Laggyshetty wrote:
>>
>>
>> On 2/10/2025 4:20 PM, Dmitry Baryshkov wrote:
>>> On Wed, Feb 05, 2025 at 06:27:38PM +0000, Raviteja Laggyshetty wrote:
>>>> 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 <quic_rlaggysh@quicinc.com>
>>>> ---
>>>>  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)
>>>
>>> Nit: I think it might be better to add an explicit define for that and
>>> to decline all other negatdive values. Please leave us some room for
>>> future expansion.
>>>
>> Do you mean to replace the value of ALLOC_DYN_ID from -1 to some
>> positive value like 100000 and to use it as initial ID for the nodes
>> requiring the dynamic allocation ? This explicit define can be used as
>> check for dynamic allocation and also as argument to idr_alloc min value
>> argument. Is my interpretation of the comment correct ?
> 
> No, it is not. I asked to add an explicit define for -1 in the ICC
> framework and make icc_node_create_nolock() reject all other negative
> values.

Understood, will make the change as suggested.
> 
>>
>>>> +		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);
>>>> -- 
>>>> 2.39.2
>>>>
>>>
>>
> 


^ permalink raw reply	[flat|nested] 21+ messages in thread

* Re: [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support
  2025-02-17  1:08       ` Dmitry Baryshkov
@ 2025-02-21 11:09         ` Raviteja Laggyshetty
  0 siblings, 0 replies; 21+ messages in thread
From: Raviteja Laggyshetty @ 2025-02-21 11:09 UTC (permalink / raw)
  To: Dmitry Baryshkov
  Cc: Georgi Djakov, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
	Bjorn Andersson, Konrad Dybcio, Odelu Kukatla, Mike Tipton,
	Jeff Johnson, Andrew Halaney, Sibi Sankar, linux-arm-msm,
	linux-pm, devicetree, linux-kernel



On 2/17/2025 6:38 AM, Dmitry Baryshkov wrote:
> On Sun, Feb 16, 2025 at 09:58:41PM +0530, Raviteja Laggyshetty wrote:
>>
>>
>> On 2/10/2025 4:27 PM, Dmitry Baryshkov wrote:
>>> On Wed, Feb 05, 2025 at 06:27:39PM +0000, Raviteja Laggyshetty wrote:
>>>> 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 <quic_rlaggysh@quicinc.com>
>>>> ---
>>>>  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 <linux/args.h>
>>>> @@ -33,6 +34,7 @@
>>>>  #define EPSS_REG_PERF_STATE		0x320
>>>>  
>>>>  #define OSM_L3_MAX_LINKS		1
>>>> +#define ALLOC_DYN_ID			-1
>>>
>>> This should be defined by ICC framework.
>>
>> ok, I will move this to framework.
>>>
>>>>  
>>>>  #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 = {			\
> 
> No. Global data _must_ remain const.

Ok, will make the global struct const.

> 
>>>>  		.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;
>>>
>>> This can be initialized statically.
>>
>> There are two instances of EPSS L3 and the target specific compatible
>> data is global which requires resetting the IDs for the second instance
>> probe. If we don't the reset the IDs back to ALLOC_DYN_ID, then ICC
>> framework assumes that ID has been already allocated and doesn't create
>> the new ICC nodes for the second instance.
> 
> Well, don't use global data for shared purposes. Consider both your
> instances probing at the same time. So, please drop the
> qcom_osm_l3_node.id, pass ALLOC_DYN_ID directly to the
> icc_node_create(), store returned nodes in a local array and pass node
> pointers to icc_link_create().
> 

Will pass ALLOC_DYN_ID as argument to create node instead of
qcom_osm_l3_node.id and avoid its usage.
Instead of creating the local array to store the pointers, will make use
of icc_onecell_data which stores all the nodes present in the provider.
>>
>>>
>>>> +
>>>>  	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;
>>>
>>> Should not be necessary.
>> This is required, each qnode corresponds to a ICC node in framework and
>> some nodes get created in icc_node_create() API and some in
>> icc_link_create() API, to have a track of node creation qnode->id is
>> used, hence initializing qnode->id with id allocated during icc node
>> creation and avoid creation of duplicate nodes.
> 
> Basically, no. You cannot do that. Create nodes first, create links
> afterwards.

Sure, Will create nodes first and then create the links.
> 
>>>
>>>>  
>>>>  		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);
>>>
>>> Please add icc_link_nodes() (or something like that), taking two struct
>>> icc_node instances. Then you can use it here, instead of reading back
>>> the ID. Ideally the 'ID' should become an internal detail which is of no
>>> concern for the ICC drivers.
>>>
>>
>> Instead of reading back the link node id from the framework, I will call
>> icc_node_create before calling the icc_link_create() API and assign the
>> allocated id to respective qnode in the following way:
>>
>> struct qcom_osm_l3_node *qn_link_node = qnodes[i]->links[j];
>> struct icc_node *link_node = icc_node_create(qnodes[i]->links[j]->id);
>> qn_link_node->id = link_node->id;
>> icc_link_create(node, link_node->id);
>>
>> This looks cleaner than reading back the id.
> 
> As you might have guessed from the the earlier comments, no. Don't write
> _anything_ to a global data.
> 

Will not modify or update the global data.
>>
>>
>>>> +			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 },
>>>> -- 
>>>> 2.39.2
>>>>
>>>
>>
> 


^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2025-02-21 11:09 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-05 18:27 [PATCH V8 0/7] Add EPSS L3 provider support on SA8775P SoC Raviteja Laggyshetty
2025-02-05 18:27 ` [PATCH V8 1/7] dt-bindings: interconnect: Add EPSS L3 compatible for SA8775P Raviteja Laggyshetty
2025-02-10 10:11   ` Krzysztof Kozlowski
2025-02-05 18:27 ` [PATCH V8 2/7] interconnect: core: Add dynamic id allocation support Raviteja Laggyshetty
2025-02-10 10:50   ` Dmitry Baryshkov
2025-02-16 16:38     ` Raviteja Laggyshetty
2025-02-17  1:02       ` Dmitry Baryshkov
2025-02-21  6:18         ` Raviteja Laggyshetty
2025-02-05 18:27 ` [PATCH V8 3/7] interconnect: qcom: Add multidev EPSS L3 support Raviteja Laggyshetty
2025-02-10 10:57   ` Dmitry Baryshkov
2025-02-16 16:28     ` Raviteja Laggyshetty
2025-02-17  1:08       ` Dmitry Baryshkov
2025-02-21 11:09         ` Raviteja Laggyshetty
2025-02-05 18:27 ` [PATCH V8 4/7] interconnect: qcom: icc-rpmh: Add dynamic icc node id support Raviteja Laggyshetty
2025-02-05 18:27 ` [PATCH V8 5/7] interconnect: qcom: sa8775p: " Raviteja Laggyshetty
2025-02-06  1:00   ` Dmitry Baryshkov
2025-02-10  6:12     ` Raviteja Laggyshetty
2025-02-05 18:27 ` [PATCH V8 6/7] arm64: dts: qcom: sa8775p: add EPSS l3 interconnect provider Raviteja Laggyshetty
2025-02-11 14:36   ` Konrad Dybcio
2025-02-05 18:27 ` [PATCH V8 7/7] arm64: dts: qcom: sa8775p: Add CPU OPP tables to scale DDR/L3 Raviteja Laggyshetty
2025-02-11 15:31   ` Konrad Dybcio

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®