This is a note to let you know that I've just added the patch titled interconnect: qcom: rpm: fix registration race to the 6.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: interconnect-qcom-rpm-fix-registration-race.patch and it can be found in the queue-6.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 90ae93d8affc1061cd87ca8ddd9a838c7d31a158 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan+linaro@xxxxxxxxxx> Date: Mon, 6 Mar 2023 08:56:36 +0100 Subject: interconnect: qcom: rpm: fix registration race From: Johan Hovold <johan+linaro@xxxxxxxxxx> commit 90ae93d8affc1061cd87ca8ddd9a838c7d31a158 upstream. The current interconnect provider registration interface is inherently racy as nodes are not added until the after adding the provider. This can specifically cause racing DT lookups to fail. Switch to using the new API where the provider is not registered until after it has been fully initialised. Fixes: 62feb14ee8a3 ("interconnect: qcom: Consolidate interconnect RPM support") Fixes: 30c8fa3ec61a ("interconnect: qcom: Add MSM8916 interconnect provider driver") Cc: stable@xxxxxxxxxxxxxxx # 5.7 Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx> Reviewed-by: Jun Nie <jun.nie@xxxxxxxxxx> Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx> Link: https://lore.kernel.org/r/20230306075651.2449-9-johan+linaro@xxxxxxxxxx Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/interconnect/qcom/icc-rpm.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -506,7 +506,6 @@ regmap_done: } provider = &qp->provider; - INIT_LIST_HEAD(&provider->nodes); provider->dev = dev; provider->set = qcom_icc_set; provider->pre_aggregate = qcom_icc_pre_bw_aggregate; @@ -514,12 +513,7 @@ regmap_done: provider->xlate_extended = qcom_icc_xlate_extended; provider->data = data; - ret = icc_provider_add(provider); - if (ret) { - dev_err(dev, "error adding interconnect provider: %d\n", ret); - clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); - return ret; - } + icc_provider_init(provider); for (i = 0; i < num_nodes; i++) { size_t j; @@ -527,7 +521,7 @@ regmap_done: node = icc_node_create(qnodes[i]->id); if (IS_ERR(node)) { ret = PTR_ERR(node); - goto err; + goto err_remove_nodes; } node->name = qnodes[i]->name; @@ -541,20 +535,26 @@ regmap_done: } data->num_nodes = num_nodes; + ret = icc_provider_register(provider); + if (ret) + goto err_remove_nodes; + platform_set_drvdata(pdev, qp); /* Populate child NoC devices if any */ if (of_get_child_count(dev->of_node) > 0) { ret = of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) - goto err; + goto err_deregister_provider; } return 0; -err: + +err_deregister_provider: + icc_provider_deregister(provider); +err_remove_nodes: icc_nodes_remove(provider); clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); - icc_provider_del(provider); return ret; } @@ -564,9 +564,9 @@ int qnoc_remove(struct platform_device * { struct qcom_icc_provider *qp = platform_get_drvdata(pdev); + icc_provider_deregister(&qp->provider); icc_nodes_remove(&qp->provider); clk_bulk_disable_unprepare(qp->num_clks, qp->bus_clks); - icc_provider_del(&qp->provider); return 0; } Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are queue-6.1/memory-tegra20-emc-fix-interconnect-registration-race.patch queue-6.1/memory-tegra124-emc-fix-interconnect-registration-race.patch queue-6.1/serial-qcom-geni-fix-console-shutdown-hang.patch queue-6.1/interconnect-exynos-fix-registration-race.patch queue-6.1/interconnect-imx-fix-registration-race.patch queue-6.1/memory-tegra30-emc-fix-interconnect-registration-race.patch queue-6.1/interconnect-qcom-msm8974-fix-registration-race.patch queue-6.1/memory-tegra-fix-interconnect-registration-race.patch queue-6.1/interconnect-qcom-rpm-fix-probe-child-node-error-handling.patch queue-6.1/interconnect-qcom-rpm-fix-registration-race.patch queue-6.1/interconnect-fix-provider-registration-api.patch queue-6.1/interconnect-fix-icc_provider_del-error-handling.patch queue-6.1/interconnect-qcom-rpmh-fix-registration-race.patch queue-6.1/interconnect-fix-mem-leak-when-freeing-nodes.patch queue-6.1/interconnect-qcom-rpmh-fix-probe-child-node-error-handling.patch queue-6.1/interconnect-exynos-fix-node-leak-in-probe-pm-qos-error-path.patch queue-6.1/interconnect-qcom-osm-l3-fix-registration-race.patch