iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

interconnect: qcom: rpmh: fix registration race

Browse Source 
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: 976daac4a1 ("interconnect: qcom: Consolidate interconnect RPMh support")
Cc: stable@vger.kernel.org      # 5.7
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230306075651.2449-11-johan+linaro@kernel.org
Signed-off-by: Georgi Djakov <djakov@kernel.org>
This commit is contained in:
Johan Hovold 2023-03-06 08:56:38 +01:00 committed by Georgi Djakov
parent 6570d1d46e
commit 74240a5beb
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/interconnect/qcom/icc-rpmh.c
View File

@ -192,9 +192,10 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev)
provider->pre_aggregate = qcom_icc_pre_aggregate; provider->pre_aggregate = qcom_icc_pre_aggregate;
provider->aggregate = qcom_icc_aggregate; provider->aggregate = qcom_icc_aggregate;
provider->xlate_extended = qcom_icc_xlate_extended; provider->xlate_extended = qcom_icc_xlate_extended;
INIT_LIST_HEAD(&provider->nodes);
provider->data = data; provider->data = data;
icc_provider_init(provider);
qp->dev = dev; qp->dev = dev;
qp->bcms = desc->bcms; qp->bcms = desc->bcms;
qp->num_bcms = desc->num_bcms; qp->num_bcms = desc->num_bcms;
@ -203,10 +204,6 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev)
if (IS_ERR(qp->voter)) if (IS_ERR(qp->voter))
return PTR_ERR(qp->voter); return PTR_ERR(qp->voter);
ret = icc_provider_add(provider);
if (ret)
return ret;
for (i = 0; i < qp->num_bcms; i++) for (i = 0; i < qp->num_bcms; i++)
qcom_icc_bcm_init(qp->bcms[i], dev); qcom_icc_bcm_init(qp->bcms[i], dev);
@ -218,7 +215,7 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev)
node = icc_node_create(qn->id); node = icc_node_create(qn->id);
if (IS_ERR(node)) { if (IS_ERR(node)) {
ret = PTR_ERR(node); ret = PTR_ERR(node);
goto err; goto err_remove_nodes;
} }
node->name = qn->name; node->name = qn->name;
@ -232,19 +229,27 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev)
} }
data->num_nodes = num_nodes; data->num_nodes = num_nodes;
ret = icc_provider_register(provider);
if (ret)
goto err_remove_nodes;
platform_set_drvdata(pdev, qp); platform_set_drvdata(pdev, qp);
/* Populate child NoC devices if any */ /* Populate child NoC devices if any */
if (of_get_child_count(dev->of_node) > 0) { if (of_get_child_count(dev->of_node) > 0) {
ret = of_platform_populate(dev->of_node, NULL, NULL, dev); ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
if (ret) if (ret)
goto err; goto err_deregister_provider;
} }
return 0; return 0;
err:
err_deregister_provider:
icc_provider_deregister(provider);
err_remove_nodes:
icc_nodes_remove(provider); icc_nodes_remove(provider);
icc_provider_del(provider);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(qcom_icc_rpmh_probe); EXPORT_SYMBOL_GPL(qcom_icc_rpmh_probe);
@ -253,8 +258,8 @@ int qcom_icc_rpmh_remove(struct platform_device *pdev)
{ {
struct qcom_icc_provider *qp = platform_get_drvdata(pdev); struct qcom_icc_provider *qp = platform_get_drvdata(pdev);
icc_provider_deregister(&qp->provider);
icc_nodes_remove(&qp->provider); icc_nodes_remove(&qp->provider);
icc_provider_del(&qp->provider);
return 0; return 0;
} }