Re: [V2, 2/3] interconnect: qcom: Add SC7180 interconnect provider driver

[Stephen Boyd <swboyd@chromium.org>]

Quoting Odelu Kukatla (2019-12-31 00:58:56)
> diff --git a/drivers/interconnect/qcom/sc7180.c b/drivers/interconnect/qcom/sc7180.c
> new file mode 100644
> index 0000000..4a398e0
> --- /dev/null
> +++ b/drivers/interconnect/qcom/sc7180.c
> @@ -0,0 +1,788 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (c) 2019, The Linux Foundation. All rights reserved.
> + *
> + */
> +
> +#include <dt-bindings/interconnect/qcom,sc7180.h>

Can you include this after linux/ headers? That is the "preferred" way
to include headers.

> +#include <linux/device.h>
> +#include <linux/interconnect.h>
> +#include <linux/interconnect-provider.h>
> +#include <linux/module.h>
> +#include <linux/of_device.h>

Hopefully this include isn't used and can be removed.

> +#include <linux/of_platform.h>

Is this include used?

> +#include <linux/platform_device.h>
> +
> +#include "icc-rpmh.h"
> +#include "bcm-voter.h"
> +
[...]
> +
> +static struct qcom_icc_node *system_noc_nodes[] = {
> +       [MASTER_SNOC_CFG] = &qhm_snoc_cfg,
> +       [MASTER_A1NOC_SNOC] = &qnm_aggre1_noc,
> +       [MASTER_A2NOC_SNOC] = &qnm_aggre2_noc,
> +       [MASTER_GEM_NOC_SNOC] = &qnm_gemnoc,
> +       [MASTER_PIMEM] = &qxm_pimem,
> +       [SLAVE_APPSS] = &qhs_apss,
> +       [SLAVE_SNOC_CNOC] = &qns_cnoc,
> +       [SLAVE_SNOC_GEM_NOC_GC] = &qns_gemnoc_gc,
> +       [SLAVE_SNOC_GEM_NOC_SF] = &qns_gemnoc_sf,
> +       [SLAVE_IMEM] = &qxs_imem,
> +       [SLAVE_PIMEM] = &qxs_pimem,
> +       [SLAVE_SERVICE_SNOC] = &srvc_snoc,
> +       [SLAVE_QDSS_STM] = &xs_qdss_stm,
> +       [SLAVE_TCU] = &xs_sys_tcu_cfg,
> +};
> +
> +static struct qcom_icc_desc sc7180_system_noc = {

Can this be const? And the other ones?

> +       .nodes = system_noc_nodes,
> +       .num_nodes = ARRAY_SIZE(system_noc_nodes),
> +       .bcms = system_noc_bcms,
> +       .num_bcms = ARRAY_SIZE(system_noc_bcms),
> +};
> +
> +static int qnoc_probe(struct platform_device *pdev)
> +{
> +       const struct qcom_icc_desc *desc;
> +       struct icc_onecell_data *data;
> +       struct icc_provider *provider;
> +       struct qcom_icc_node **qnodes;
> +       struct qcom_icc_provider *qp;
> +       struct icc_node *node;
> +       size_t num_nodes, i;
> +       int ret;
> +
> +       desc = of_device_get_match_data(&pdev->dev);

Use device_get_match_data() instead?

> +       if (!desc)
> +               return -EINVAL;
> +
> +       qnodes = desc->nodes;
> +       num_nodes = desc->num_nodes;
> +
> +       qp = devm_kzalloc(&pdev->dev, sizeof(*qp), GFP_KERNEL);
> +       if (!qp)
> +               return -ENOMEM;
> +
> +       data = devm_kcalloc(&pdev->dev, num_nodes, sizeof(*node), GFP_KERNEL);
> +       if (!data)
> +               return -ENOMEM;
> +
> +       provider = &qp->provider;
> +       provider->dev = &pdev->dev;
> +       provider->set = qcom_icc_set;
> +       provider->pre_aggregate = qcom_icc_pre_aggregate;
> +       provider->aggregate = qcom_icc_aggregate;
> +       provider->xlate = of_icc_xlate_onecell;
> +       INIT_LIST_HEAD(&provider->nodes);
> +       provider->data = data;
> +
> +       qp->dev = &pdev->dev;
> +       qp->bcms = desc->bcms;
> +       qp->num_bcms = desc->num_bcms;
> +
> +       qp->voter = of_bcm_voter_get(qp->dev, NULL);
> +       if (IS_ERR(qp->voter))
> +               return PTR_ERR(qp->voter);
> +
> +       ret = icc_provider_add(provider);
> +       if (ret) {
> +               dev_err(&pdev->dev, "error adding interconnect provider\n");
> +               return ret;
> +       }
> +
> +       for (i = 0; i < num_nodes; i++) {
> +               size_t j;
> +
> +               if (!qnodes[i])
> +                       continue;
> +
> +               node = icc_node_create(qnodes[i]->id);
> +               if (IS_ERR(node)) {
> +                       ret = PTR_ERR(node);
> +                       goto err;
> +               }
> +
> +               node->name = qnodes[i]->name;
> +               node->data = qnodes[i];
> +               icc_node_add(node, provider);
> +
> +               dev_dbg(&pdev->dev, "registered node %pK %s %d\n", node,
> +                       qnodes[i]->name, node->id);

Is this more debug junk? Maybe if it is useful it can be part of the
core framework instead of in this driver?

> +
> +               /* populate links */

Useless comment.

> +               for (j = 0; j < qnodes[i]->num_links; j++)
> +                       icc_link_create(node, qnodes[i]->links[j]);
> +
> +               data->nodes[i] = node;
> +       }
> +       data->num_nodes = num_nodes;
> +
> +       for (i = 0; i < qp->num_bcms; i++)
> +               qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);
> +
> +       platform_set_drvdata(pdev, qp);
> +
> +       dev_dbg(&pdev->dev, "Registered SC7180 ICC\n");

This driver debug message is pretty useless. Please remove it.

> +
> +       return ret;

return 0?

> +err:
> +       icc_nodes_remove(provider);
> +       icc_provider_del(provider);
> +       return ret;
> +}
> +
> +static int qnoc_remove(struct platform_device *pdev)
> +{
> +       struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
> +
> +       icc_nodes_remove(&qp->provider);
> +       return icc_provider_del(&qp->provider);
> +}
> +
> +static const struct of_device_id qnoc_of_match[] = {
> +       { .compatible = "qcom,sc7180-aggre1-noc",
> +         .data = &sc7180_aggre1_noc},
> +       { .compatible = "qcom,sc7180-aggre2-noc",
> +         .data = &sc7180_aggre2_noc},
> +       { .compatible = "qcom,sc7180-camnoc-virt",
> +         .data = &sc7180_camnoc_virt},
> +       { .compatible = "qcom,sc7180-compute-noc",
> +         .data = &sc7180_compute_noc},
> +       { .compatible = "qcom,sc7180-config-noc",
> +         .data = &sc7180_config_noc},
> +       { .compatible = "qcom,sc7180-dc-noc",
> +         .data = &sc7180_dc_noc},
> +       { .compatible = "qcom,sc7180-gem-noc",
> +         .data = &sc7180_gem_noc},
> +       { .compatible = "qcom,sc7180-ipa-virt",
> +         .data = &sc7180_ipa_virt},
> +       { .compatible = "qcom,sc7180-mc-virt",
> +         .data = &sc7180_mc_virt},
> +       { .compatible = "qcom,sc7180-mmss-noc",
> +         .data = &sc7180_mmss_noc},
> +       { .compatible = "qcom,sc7180-npu-noc",
> +         .data = &sc7180_npu_noc},
> +       { .compatible = "qcom,sc7180-qup-virt",
> +         .data = &sc7180_qup_virt},
> +       { .compatible = "qcom,sc7180-system-noc",
> +         .data = &sc7180_system_noc},
> +       { },

Nitpick: Drop the comma as it's the sentinel and nothing can come after.

> +};
> +MODULE_DEVICE_TABLE(of, qnoc_of_match);