interconnect: imx: Switch from imx_icc_node_adj_desc to fsl,icc-id node assignment
Subsystems (2)
PATCH v2 1/3 interconnect: imx: Switch from imx_icc_node_adj_desc to fsl,icc-id node assignment
In order to be able to have more than one NoCs in the interconnect net we need to decouple the NoC from the dram. So instead of using the imx_icc_node_adj_desc, we use the fsl,icc-id property that is in each NoC (or pl301) to the icc node (based on the id) to it. Along with all the NoC and pl301 nodes in the dts we will have a interconnect dedicated node. This node will be the actual device of the icc provider.
---
No changes since v1.
drivers/interconnect/imx/imx.c | 70 +++++++++++++++------------------- 1 file changed, 31 insertions(+), 39 deletions(-)
drivers/interconnect/imx/imx.c +31 -39
@@ -34,8 +34,8 @@ static int imx_icc_node_set(struct icc_node *node)if (!node_data->qos_dev)return 0 ; - freq = (node->avg_bw + node->peak_bw) * node_data->desc->adj->bw_mul; -do_div (freq, node_data->desc->adj->bw_div); + freq =max (node->avg_bw, node->peak_bw); +dev_dbg (dev,"node %s device %s avg_bw %ukBps peak_bw %ukBps min_freq %llukHz\n" , node->name,dev_name (node_data->qos_dev), node->avg_bw, node->peak_bw, freq);
@@ -79,41 +79,35 @@ static int imx_icc_node_init_qos(struct icc_provider *provider, struct icc_node *node) {struct imx_icc_node *node_data = node->data; -const struct imx_icc_node_adj_desc *adj = node_data->desc->adj;struct device *dev = provider->dev; -struct device_node *dn =NULL ;struct platform_device *pdev; +struct device_node *np =NULL , *dn =NULL ; +int idx; -if (adj->main_noc) { - node_data->qos_dev = dev; -dev_dbg (dev,"icc node %s[%d] is main noc itself\n" , - node->name, node->id); - }else { - dn =of_parse_phandle (dev->of_node, adj->phandle_name,0 ); -if (!dn) { -dev_warn (dev,"Failed to parse %s\n" , - adj->phandle_name); -return -ENODEV ; - } -/* Allow scaling to be disabled on a per-node basis */ -if (!of_device_is_available (dn)) { -dev_warn (dev,"Missing property %s, skip scaling %s\n" , - adj->phandle_name, node->name); -of_node_put (dn); -return 0 ; - } +for_each_node_with_property (np,"fsl,icc-id" ) { +of_property_read_u32 (np,"fsl,icc-id" , &idx); +if (idx == node_data->desc->id) + dn = np; + } - pdev =of_find_device_by_node (dn); -of_node_put (dn); -if (!pdev) { -dev_warn (dev,"node %s[%d] missing device for %pOF\n" , - node->name, node->id, dn); -return -EPROBE_DEFER ; - } - node_data->qos_dev = &pdev->dev; -dev_dbg (dev,"node %s[%d] has device node %pOF\n" , - node->name, node->id, dn); +if (!dn) +return 0 ; + +if (!of_device_is_available (dn)) { +dev_warn (dev,"%pOF is disabled\n" , dn); +return 0 ; + } + + pdev =of_find_device_by_node (dn); +of_node_put (dn); +if (!pdev) { +dev_warn (dev,"node %s[%d] missing device for %pOF\n" , + node->name, node->id, dn); +return -EPROBE_DEFER ; } + node_data->qos_dev = &pdev->dev; +dev_dbg (dev,"node %s[%d] has device node %pOF\n" , node->name, + node->id, dn); return dev_pm_qos_add_request(node_data->qos_dev, &node_data->qos_req,
@@ -151,12 +145,10 @@ static struct icc_node *imx_icc_node_add(struct icc_provider *provider, node_data->desc = node_desc;icc_node_add (node, provider); -if (node_desc->adj) { - ret =imx_icc_node_init_qos (provider, node); -if (ret <0 ) { -imx_icc_node_destroy (node); -return ERR_PTR (ret); - } + ret =imx_icc_node_init_qos (provider, node); +if (ret <0 ) { +imx_icc_node_destroy (node); +return ERR_PTR (ret); }return node;
@@ -244,7 +236,7 @@ int imx_icc_register(struct platform_device *pdev, provider->aggregate = icc_std_aggregate; provider->xlate = of_icc_xlate_onecell; provider->data = data; - provider->dev = dev->parent; + provider->dev = dev;platform_set_drvdata (pdev, provider); ret =icc_provider_add (provider);
Signature · 1 line
2.31.1
PATCH v2 2/3 interconnect: imx: Add imx_icc_get_bw and imx_icc_aggregate functions
The aggregate function will return whatever is the highest rate for that specific node. The imx_icc_get_bw sets the initial avg and peak to 0 in order to avoid setting them to INT_MAX by the interconnect core.
---
No changes since v1.
drivers/interconnect/imx/imx.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/interconnect/imx/imx.c +19 -1
@@ -25,6 +25,23 @@ struct imx_icc_node {struct dev_pm_qos_request qos_req; }; +static int imx_icc_get_bw (struct icc_node *node,u32 *avg,u32 *peak) +{ + *avg =0 ; + *peak =0 ; + +return 0 ; +} + +static int imx_icc_aggregate (struct icc_node *node,u32 tag,u32 avg_bw, +u32 peak_bw,u32 *agg_avg,u32 *agg_peak) +{ + *agg_avg =max (*agg_avg, avg_bw); + *agg_peak =max (*agg_peak, peak_bw); + +return 0 ; +} +static int imx_icc_node_set (struct icc_node *node) {struct device *dev = node->provider->dev;
@@ -233,7 +250,8 @@ int imx_icc_register(struct platform_device *pdev,if (!provider)return -ENOMEM ; provider->set = imx_icc_set; - provider->aggregate = icc_std_aggregate; + provider->get_bw = imx_icc_get_bw; + provider->aggregate = imx_icc_aggregate; provider->xlate = of_icc_xlate_onecell; provider->data = data; provider->dev = dev;
Signature · 1 line
2.31.1
Georgi Djakov
maintainerRe: [PATCH v2 2/3] interconnect: imx: Add imx_icc_get_bw and imx_icc_aggregate functions
Hi Abel,
Quoted 2 lines · Abel Vesa
The aggregate function will return whatever is the highest rate for that specific node. The
imx_icc_get_bwsets the
Adding some more details about why we switch from icc_std_aggregate to imx_icc_aggregate would be nice.
Quoted 2 lines
initial avg and peak to 0 in order to avoid setting them to
INT_MAXby the interconnect core.
Do we need a Fixes tag for this?
I would recommend to split imx_icc_get_bw and imx_icc_aggregate changes into separate patches. These also seem to be unrelated to the imx_icc_node_adj_desc patchset.
Thanks,
Georgi
Quoted 46 lines
Signed-off-by Abel Vesa <[email protected]>---
No changes since v1.
drivers/interconnect/imx/imx.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)drivers/interconnect/imx/imx.c +19
-1@@ -25,6 +25,23 @@ struct imx_icc_node {struct dev_pm_qos_request qos_req; }; +static int imx_icc_get_bw (struct icc_node *node,u32 *avg,u32 *peak) +{ + *avg =0 ; + *peak =0 ; + +return 0 ; +} + +static int imx_icc_aggregate (struct icc_node *node,u32 tag,u32 avg_bw, +u32 peak_bw,u32 *agg_avg,u32 *agg_peak) +{ + *agg_avg =max (*agg_avg, avg_bw); + *agg_peak =max (*agg_peak, peak_bw); + +return 0 ; +} +static int imx_icc_node_set (struct icc_node *node) {struct device *dev = node->provider->dev;@@ -233,7 +250,8 @@ int imx_icc_register(struct platform_device *pdev,if (!provider)return -ENOMEM ; provider->set = imx_icc_set; - provider->aggregate = icc_std_aggregate; + provider->get_bw = imx_icc_get_bw; + provider->aggregate = imx_icc_aggregate; provider->xlate = of_icc_xlate_onecell; provider->data = data; provider->dev = dev;
Re: [PATCH v2 2/3] interconnect: imx: Add imx_icc_get_bw and imx_icc_aggregate functions
Quoted 9 lines · Georgi Djakov
Hi Abel,
Quoted 2 lines · Abel Vesa
The aggregate function will return whatever is the highest rate for that specific node. The
imx_icc_get_bwsets theAdding some more details about why we switch from
icc_std_aggregatetoimx_icc_aggregatewould be nice.
On a second look, I think I can drop the imx_icc_aggregate and use the icc_std_aggregate instead, as long as I use the peak_bw and forget about the agg_bw.
Quoted 5 lines
Quoted 2 lines
initial avg and peak to 0 in order to avoid setting them to
INT_MAXby the interconnect core.Do we need a Fixes tag for this?
Neah, the imx interconnect is not used by any platform yet.
Quoted 4 lines
I would recommend to split
imx_icc_get_bwandimx_icc_aggregatechanges into separate patches. These also seem to be unrelated to theimx_icc_node_adj_descpatchset.
Since I can use icc_std_aggregate, the imx_icc_aggregate change will be dropped.
Quoted 49 lines
Thanks,
GeorgiQuoted 45 lines
Signed-off-by Abel Vesa <[email protected]>---
No changes since v1.
drivers/interconnect/imx/imx.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)drivers/interconnect/imx/imx.c +19
-1@@ -25,6 +25,23 @@ struct imx_icc_node {struct dev_pm_qos_request qos_req; }; +static int imx_icc_get_bw (struct icc_node *node,u32 *avg,u32 *peak) +{ + *avg =0 ; + *peak =0 ; + +return 0 ; +} + +static int imx_icc_aggregate (struct icc_node *node,u32 tag,u32 avg_bw, +u32 peak_bw,u32 *agg_avg,u32 *agg_peak) +{ + *agg_avg =max (*agg_avg, avg_bw); + *agg_peak =max (*agg_peak, peak_bw); + +return 0 ; +} +static int imx_icc_node_set (struct icc_node *node) {struct device *dev = node->provider->dev;@@ -233,7 +250,8 @@ int imx_icc_register(struct platform_device *pdev,if (!provider)return -ENOMEM ; provider->set = imx_icc_set; - provider->aggregate = icc_std_aggregate; + provider->get_bw = imx_icc_get_bw; + provider->aggregate = imx_icc_aggregate; provider->xlate = of_icc_xlate_onecell; provider->data = data; provider->dev = dev;
PATCH v2 3/3 interconnect: imx8: Remove the imx_icc_node_adj_desc
In reply to Abel VesaNow that the imx generic interconnect doesn't use the imx_icc_node_adj_desc, we remove it from all the i.MX8M platform drivers.
---
Changes since v1:
* added missing comma for the "PL301_MAIN" node in i.MX8MN which fixes the build
drivers/interconnect/imx/imx.h | 19 ++++------------- drivers/interconnect/imx/imx8mm.c | 32 +++++++++------------------- drivers/interconnect/imx/imx8mn.c | 28 +++++++------------------ drivers/interconnect/imx/imx8mq.c | 35 ++++++++++--------------------- 4 files changed, 33 insertions(+), 81 deletions(-)
drivers/interconnect/imx/imx.h +4 -15
@@ -14,15 +14,6 @@#define IMX_ICC_MAX_LINKS 4 -/* -* struct imx_icc_node_adj - Describe a dynamic adjustable node -*/ -struct imx_icc_node_adj_desc { -unsigned int bw_mul, bw_div; -const char *phandle_name; -bool main_noc; -}; -/* * struct imx_icc_node - Describe an interconnect node * @name: name of the node
@@ -35,23 +26,21 @@ struct imx_icc_node_desc {u16 id;u16 links[IMX_ICC_MAX_LINKS ];u16 num_links; -const struct imx_icc_node_adj_desc *adj; }; -#define DEFINE_BUS_INTERCONNECT (_name, _id, _adj, ...) \ +#define DEFINE_BUS_INTERCONNECT (_name, _id, ...) \ { \ .id = _id, \ .name = _name, \ - .adj = _adj, \ .num_links = ARRAY_SIZE(((int[]){ __VA_ARGS__ })), \ .links = { __VA_ARGS__ }, \ }#define DEFINE_BUS_MASTER (_name, _id, _dest_id) \ - DEFINE_BUS_INTERCONNECT(_name, _id, NULL, _dest_id) + DEFINE_BUS_INTERCONNECT(_name, _id, _dest_id) -#define DEFINE_BUS_SLAVE (_name, _id, _adj) \ - DEFINE_BUS_INTERCONNECT(_name, _id, _adj) +#define DEFINE_BUS_SLAVE (_name, _id) \ + DEFINE_BUS_INTERCONNECT(_name, _id) int imx_icc_register(struct platform_device *pdev, struct imx_icc_node_desc *nodes,
drivers/interconnect/imx/imx8mm.c +10 -22
@@ -14,18 +14,6 @@#include "imx.h" -static const struct imx_icc_node_adj_desc imx8mm_dram_adj = { - .bw_mul =1 , - .bw_div =16 , - .phandle_name ="fsl,ddrc" , -}; - -static const struct imx_icc_node_adj_desc imx8mm_noc_adj = { - .bw_mul =1 , - .bw_div =16 , - .main_noc = true, -}; -/* * Describe bus masters, slaves and connections between them *
@@ -33,43 +21,43 @@ static const struct imx_icc_node_adj_desc imx8mm_noc_adj = {* PL301 nics which are skipped/merged into PL301_MAIN */ static struct imx_icc_node_desc nodes[] = { -DEFINE_BUS_INTERCONNECT ("NOC" ,IMX8MM_ICN_NOC , &imx8mm_noc_adj, +DEFINE_BUS_INTERCONNECT ("NOC" ,IMX8MM_ICN_NOC ,IMX8MM_ICS_DRAM ,IMX8MM_ICN_MAIN ), -DEFINE_BUS_SLAVE ("DRAM" ,IMX8MM_ICS_DRAM , &imx8mm_dram_adj), -DEFINE_BUS_SLAVE ("OCRAM" ,IMX8MM_ICS_OCRAM ,NULL ), +DEFINE_BUS_SLAVE ("DRAM" ,IMX8MM_ICS_DRAM ), +DEFINE_BUS_SLAVE ("OCRAM" ,IMX8MM_ICS_OCRAM ),DEFINE_BUS_MASTER ("A53" ,IMX8MM_ICM_A53 ,IMX8MM_ICN_NOC ),/* VPUMIX */ DEFINE_BUS_MASTER ("VPU H1" ,IMX8MM_ICM_VPU_H1 ,IMX8MM_ICN_VIDEO ),DEFINE_BUS_MASTER ("VPU G1" ,IMX8MM_ICM_VPU_G1 ,IMX8MM_ICN_VIDEO ),DEFINE_BUS_MASTER ("VPU G2" ,IMX8MM_ICM_VPU_G2 ,IMX8MM_ICN_VIDEO ), -DEFINE_BUS_INTERCONNECT ("PL301_VIDEO" ,IMX8MM_ICN_VIDEO ,NULL ,IMX8MM_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_VIDEO" ,IMX8MM_ICN_VIDEO ,IMX8MM_ICN_NOC ),/* GPUMIX */ DEFINE_BUS_MASTER ("GPU 2D" ,IMX8MM_ICM_GPU2D ,IMX8MM_ICN_GPU ),DEFINE_BUS_MASTER ("GPU 3D" ,IMX8MM_ICM_GPU3D ,IMX8MM_ICN_GPU ), -DEFINE_BUS_INTERCONNECT ("PL301_GPU" ,IMX8MM_ICN_GPU ,NULL ,IMX8MM_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_GPU" ,IMX8MM_ICN_GPU ,IMX8MM_ICN_NOC ),/* DISPLAYMIX */ DEFINE_BUS_MASTER ("CSI" ,IMX8MM_ICM_CSI ,IMX8MM_ICN_MIPI ),DEFINE_BUS_MASTER ("LCDIF" ,IMX8MM_ICM_LCDIF ,IMX8MM_ICN_MIPI ), -DEFINE_BUS_INTERCONNECT ("PL301_MIPI" ,IMX8MM_ICN_MIPI ,NULL ,IMX8MM_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_MIPI" ,IMX8MM_ICN_MIPI ,IMX8MM_ICN_NOC ),/* HSIO */ DEFINE_BUS_MASTER ("USB1" ,IMX8MM_ICM_USB1 ,IMX8MM_ICN_HSIO ),DEFINE_BUS_MASTER ("USB2" ,IMX8MM_ICM_USB2 ,IMX8MM_ICN_HSIO ),DEFINE_BUS_MASTER ("PCIE" ,IMX8MM_ICM_PCIE ,IMX8MM_ICN_HSIO ), -DEFINE_BUS_INTERCONNECT ("PL301_HSIO" ,IMX8MM_ICN_HSIO ,NULL ,IMX8MM_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_HSIO" ,IMX8MM_ICN_HSIO ,IMX8MM_ICN_NOC ),/* Audio */ DEFINE_BUS_MASTER ("SDMA2" ,IMX8MM_ICM_SDMA2 ,IMX8MM_ICN_AUDIO ),DEFINE_BUS_MASTER ("SDMA3" ,IMX8MM_ICM_SDMA3 ,IMX8MM_ICN_AUDIO ), -DEFINE_BUS_INTERCONNECT ("PL301_AUDIO" ,IMX8MM_ICN_AUDIO ,NULL ,IMX8MM_ICN_MAIN ), +DEFINE_BUS_INTERCONNECT ("PL301_AUDIO" ,IMX8MM_ICN_AUDIO ,IMX8MM_ICN_MAIN ),/* Ethernet */ DEFINE_BUS_MASTER ("ENET" ,IMX8MM_ICM_ENET ,IMX8MM_ICN_ENET ), -DEFINE_BUS_INTERCONNECT ("PL301_ENET" ,IMX8MM_ICN_ENET ,NULL ,IMX8MM_ICN_MAIN ), +DEFINE_BUS_INTERCONNECT ("PL301_ENET" ,IMX8MM_ICN_ENET ,IMX8MM_ICN_MAIN ),/* Other */ DEFINE_BUS_MASTER ("SDMA1" ,IMX8MM_ICM_SDMA1 ,IMX8MM_ICN_MAIN ),
@@ -77,7 +65,7 @@ static struct imx_icc_node_desc nodes[] = {DEFINE_BUS_MASTER ("USDHC1" ,IMX8MM_ICM_USDHC1 ,IMX8MM_ICN_MAIN ),DEFINE_BUS_MASTER ("USDHC2" ,IMX8MM_ICM_USDHC2 ,IMX8MM_ICN_MAIN ),DEFINE_BUS_MASTER ("USDHC3" ,IMX8MM_ICM_USDHC3 ,IMX8MM_ICN_MAIN ), -DEFINE_BUS_INTERCONNECT ("PL301_MAIN" ,IMX8MM_ICN_MAIN ,NULL , +DEFINE_BUS_INTERCONNECT ("PL301_MAIN" ,IMX8MM_ICN_MAIN , IMX8MM_ICN_NOC, IMX8MM_ICS_OCRAM), };
drivers/interconnect/imx/imx8mn.c +8 -20
@@ -11,18 +11,6 @@#include "imx.h" -static const struct imx_icc_node_adj_desc imx8mn_dram_adj = { - .bw_mul =1 , - .bw_div =4 , - .phandle_name ="fsl,ddrc" , -}; - -static const struct imx_icc_node_adj_desc imx8mn_noc_adj = { - .bw_mul =1 , - .bw_div =4 , - .main_noc = true, -}; -/* * Describe bus masters, slaves and connections between them *
@@ -30,23 +18,23 @@ static const struct imx_icc_node_adj_desc imx8mn_noc_adj = {* PL301 nics which are skipped/merged into PL301_MAIN */ static struct imx_icc_node_desc nodes[] = { -DEFINE_BUS_INTERCONNECT ("NOC" ,IMX8MN_ICN_NOC , &imx8mn_noc_adj, +DEFINE_BUS_INTERCONNECT ("NOC" ,IMX8MN_ICN_NOC ,IMX8MN_ICS_DRAM ,IMX8MN_ICN_MAIN ), -DEFINE_BUS_SLAVE ("DRAM" ,IMX8MN_ICS_DRAM , &imx8mn_dram_adj), -DEFINE_BUS_SLAVE ("OCRAM" ,IMX8MN_ICS_OCRAM ,NULL ), +DEFINE_BUS_SLAVE ("DRAM" ,IMX8MN_ICS_DRAM ), +DEFINE_BUS_SLAVE ("OCRAM" ,IMX8MN_ICS_OCRAM ),DEFINE_BUS_MASTER ("A53" ,IMX8MN_ICM_A53 ,IMX8MN_ICN_NOC ),/* GPUMIX */ DEFINE_BUS_MASTER ("GPU" ,IMX8MN_ICM_GPU ,IMX8MN_ICN_GPU ), -DEFINE_BUS_INTERCONNECT ("PL301_GPU" ,IMX8MN_ICN_GPU ,NULL ,IMX8MN_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_GPU" ,IMX8MN_ICN_GPU ,IMX8MN_ICN_NOC ),/* DISPLAYMIX */ DEFINE_BUS_MASTER ("CSI1" ,IMX8MN_ICM_CSI1 ,IMX8MN_ICN_MIPI ),DEFINE_BUS_MASTER ("CSI2" ,IMX8MN_ICM_CSI2 ,IMX8MN_ICN_MIPI ),DEFINE_BUS_MASTER ("ISI" ,IMX8MN_ICM_ISI ,IMX8MN_ICN_MIPI ),DEFINE_BUS_MASTER ("LCDIF" ,IMX8MN_ICM_LCDIF ,IMX8MN_ICN_MIPI ), -DEFINE_BUS_INTERCONNECT ("PL301_MIPI" ,IMX8MN_ICN_MIPI ,NULL ,IMX8MN_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_MIPI" ,IMX8MN_ICN_MIPI ,IMX8MN_ICN_NOC ),/* USB goes straight to NOC */ DEFINE_BUS_MASTER ("USB" ,IMX8MN_ICM_USB ,IMX8MN_ICN_NOC ),
@@ -54,11 +42,11 @@ static struct imx_icc_node_desc nodes[] = {/* Audio */ DEFINE_BUS_MASTER ("SDMA2" ,IMX8MN_ICM_SDMA2 ,IMX8MN_ICN_AUDIO ),DEFINE_BUS_MASTER ("SDMA3" ,IMX8MN_ICM_SDMA3 ,IMX8MN_ICN_AUDIO ), -DEFINE_BUS_INTERCONNECT ("PL301_AUDIO" ,IMX8MN_ICN_AUDIO ,NULL ,IMX8MN_ICN_MAIN ), +DEFINE_BUS_INTERCONNECT ("PL301_AUDIO" ,IMX8MN_ICN_AUDIO ,IMX8MN_ICN_MAIN ),/* Ethernet */ DEFINE_BUS_MASTER ("ENET" ,IMX8MN_ICM_ENET ,IMX8MN_ICN_ENET ), -DEFINE_BUS_INTERCONNECT ("PL301_ENET" ,IMX8MN_ICN_ENET ,NULL ,IMX8MN_ICN_MAIN ), +DEFINE_BUS_INTERCONNECT ("PL301_ENET" ,IMX8MN_ICN_ENET ,IMX8MN_ICN_MAIN ),/* Other */ DEFINE_BUS_MASTER("SDMA1", IMX8MN_ICM_SDMA1, IMX8MN_ICN_MAIN),
@@ -66,7 +54,7 @@ static struct imx_icc_node_desc nodes[] = {DEFINE_BUS_MASTER ("USDHC1" ,IMX8MN_ICM_USDHC1 ,IMX8MN_ICN_MAIN ),DEFINE_BUS_MASTER ("USDHC2" ,IMX8MN_ICM_USDHC2 ,IMX8MN_ICN_MAIN ),DEFINE_BUS_MASTER ("USDHC3" ,IMX8MN_ICM_USDHC3 ,IMX8MN_ICN_MAIN ), -DEFINE_BUS_INTERCONNECT ("PL301_MAIN" ,IMX8MN_ICN_MAIN ,NULL , +DEFINE_BUS_INTERCONNECT ("PL301_MAIN" ,IMX8MN_ICN_MAIN , IMX8MN_ICN_NOC, IMX8MN_ICS_OCRAM), };
drivers/interconnect/imx/imx8mq.c +11 -24
@@ -12,18 +12,6 @@#include "imx.h" -static const struct imx_icc_node_adj_desc imx8mq_dram_adj = { - .bw_mul =1 , - .bw_div =4 , - .phandle_name ="fsl,ddrc" , -}; - -static const struct imx_icc_node_adj_desc imx8mq_noc_adj = { - .bw_mul =1 , - .bw_div =4 , - .main_noc = true, -}; -/* * Describe bus masters, slaves and connections between them *
@@ -31,43 +19,42 @@ static const struct imx_icc_node_adj_desc imx8mq_noc_adj = {* PL301 nics which are skipped/merged into PL301_MAIN */ static struct imx_icc_node_desc nodes[] = { -DEFINE_BUS_INTERCONNECT ("NOC" ,IMX8MQ_ICN_NOC , &imx8mq_noc_adj, -IMX8MQ_ICS_DRAM ,IMX8MQ_ICN_MAIN ), +DEFINE_BUS_INTERCONNECT ("NOC" ,IMX8MQ_ICN_NOC ,IMX8MQ_ICS_DRAM ,IMX8MQ_ICN_MAIN ), -DEFINE_BUS_SLAVE ("DRAM" ,IMX8MQ_ICS_DRAM , &imx8mq_dram_adj), -DEFINE_BUS_SLAVE ("OCRAM" ,IMX8MQ_ICS_OCRAM ,NULL ), +DEFINE_BUS_SLAVE ("DRAM" ,IMX8MQ_ICS_DRAM ), +DEFINE_BUS_SLAVE ("OCRAM" ,IMX8MQ_ICS_OCRAM ),DEFINE_BUS_MASTER ("A53" ,IMX8MQ_ICM_A53 ,IMX8MQ_ICN_NOC ),/* VPUMIX */ DEFINE_BUS_MASTER ("VPU" ,IMX8MQ_ICM_VPU ,IMX8MQ_ICN_VIDEO ), -DEFINE_BUS_INTERCONNECT ("PL301_VIDEO" ,IMX8MQ_ICN_VIDEO ,NULL ,IMX8MQ_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_VIDEO" ,IMX8MQ_ICN_VIDEO ,IMX8MQ_ICN_NOC ),/* GPUMIX */ DEFINE_BUS_MASTER ("GPU" ,IMX8MQ_ICM_GPU ,IMX8MQ_ICN_GPU ), -DEFINE_BUS_INTERCONNECT ("PL301_GPU" ,IMX8MQ_ICN_GPU ,NULL ,IMX8MQ_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_GPU" ,IMX8MQ_ICN_GPU ,IMX8MQ_ICN_NOC ),/* DISPMIX (only for DCSS) */ DEFINE_BUS_MASTER ("DC" ,IMX8MQ_ICM_DCSS ,IMX8MQ_ICN_DCSS ), -DEFINE_BUS_INTERCONNECT ("PL301_DC" ,IMX8MQ_ICN_DCSS ,NULL ,IMX8MQ_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_DC" ,IMX8MQ_ICN_DCSS ,IMX8MQ_ICN_NOC ),/* USBMIX */ DEFINE_BUS_MASTER ("USB1" ,IMX8MQ_ICM_USB1 ,IMX8MQ_ICN_USB ),DEFINE_BUS_MASTER ("USB2" ,IMX8MQ_ICM_USB2 ,IMX8MQ_ICN_USB ), -DEFINE_BUS_INTERCONNECT ("PL301_USB" ,IMX8MQ_ICN_USB ,NULL ,IMX8MQ_ICN_NOC ), +DEFINE_BUS_INTERCONNECT ("PL301_USB" ,IMX8MQ_ICN_USB ,IMX8MQ_ICN_NOC ),/* PL301_DISPLAY (IPs other than DCSS, inside SUPERMIX) */ DEFINE_BUS_MASTER ("CSI1" ,IMX8MQ_ICM_CSI1 ,IMX8MQ_ICN_DISPLAY ),DEFINE_BUS_MASTER ("CSI2" ,IMX8MQ_ICM_CSI2 ,IMX8MQ_ICN_DISPLAY ),DEFINE_BUS_MASTER ("LCDIF" ,IMX8MQ_ICM_LCDIF ,IMX8MQ_ICN_DISPLAY ), -DEFINE_BUS_INTERCONNECT ("PL301_DISPLAY" ,IMX8MQ_ICN_DISPLAY ,NULL ,IMX8MQ_ICN_MAIN ), +DEFINE_BUS_INTERCONNECT ("PL301_DISPLAY" ,IMX8MQ_ICN_DISPLAY ,IMX8MQ_ICN_MAIN ),/* AUDIO */ DEFINE_BUS_MASTER ("SDMA2" ,IMX8MQ_ICM_SDMA2 ,IMX8MQ_ICN_AUDIO ), -DEFINE_BUS_INTERCONNECT ("PL301_AUDIO" ,IMX8MQ_ICN_AUDIO ,NULL ,IMX8MQ_ICN_DISPLAY ), +DEFINE_BUS_INTERCONNECT ("PL301_AUDIO" ,IMX8MQ_ICN_AUDIO ,IMX8MQ_ICN_DISPLAY ),/* ENET */ DEFINE_BUS_MASTER ("ENET" ,IMX8MQ_ICM_ENET ,IMX8MQ_ICN_ENET ), -DEFINE_BUS_INTERCONNECT ("PL301_ENET" ,IMX8MQ_ICN_ENET ,NULL ,IMX8MQ_ICN_MAIN ), +DEFINE_BUS_INTERCONNECT ("PL301_ENET" ,IMX8MQ_ICN_ENET ,IMX8MQ_ICN_MAIN ),/* OTHER */ DEFINE_BUS_MASTER ("SDMA1" ,IMX8MQ_ICM_SDMA1 ,IMX8MQ_ICN_MAIN ),
@@ -76,7 +63,7 @@ static struct imx_icc_node_desc nodes[] = {DEFINE_BUS_MASTER ("USDHC2" ,IMX8MQ_ICM_USDHC2 ,IMX8MQ_ICN_MAIN ),DEFINE_BUS_MASTER ("PCIE1" ,IMX8MQ_ICM_PCIE1 ,IMX8MQ_ICN_MAIN ),DEFINE_BUS_MASTER ("PCIE2" ,IMX8MQ_ICM_PCIE2 ,IMX8MQ_ICN_MAIN ), -DEFINE_BUS_INTERCONNECT ("PL301_MAIN" ,IMX8MQ_ICN_MAIN ,NULL , +DEFINE_BUS_INTERCONNECT ("PL301_MAIN" ,IMX8MQ_ICN_MAIN , IMX8MQ_ICN_NOC, IMX8MQ_ICS_OCRAM), };
Signature · 1 line
2.31.1
Georgi Djakov
maintainerHi Abel,
Thanks for working on this!
Quoted 4 lines · Abel Vesa
In order to be able to have more than one NoCs in the interconnect net we need to decouple the NoC from the dram. So instead of using the
imx_icc_node_adj_desc, we use the fsl,icc-id property that is in each NoC (or pl301) to the icc node (based on the id) to it.
I believe that this DT property should be documented somewhere. Maybe in Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml?
BR,
Georgi
Quoted 11 lines
Along with all the NoC and pl301 nodes in the dts we will have a interconnect dedicated node. This node will be the actual device of the icc provider.
Signed-off-by Abel Vesa <[email protected]>---
No changes since v1.
drivers/interconnect/imx/imx.c | 70 +++++++++++++++------------------- 1 file changed, 31 insertions(+), 39 deletions(-)