@@ -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);
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. Signed-off-by: Abel Vesa <abel.vesa@nxp.com> --- drivers/interconnect/imx/imx.c | 70 +++++++++++++++------------------- 1 file changed, 31 insertions(+), 39 deletions(-)