Skip to content

Commit 181563b

Browse files
stephan-ghandersson
authored andcommitted
rpmsg: qcom_smd: Use qcom_smem_is_available()
Rather than looking up a dummy item from SMEM, use the new qcom_smem_is_available() function to make the code more clear (and reduce the overhead slightly). Add the same check to qcom_smd_register_edge() as well to ensure that it only succeeds if SMEM is already available - if a driver calls the function and SMEM is not available yet then the initial state will be read incorrectly and the RPMSG devices might never become available. Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Link: https://lore.kernel.org/r/20230531-rpm-rproc-v3-8-a07dcdefd918@gerhold.net Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 4dbb9e2 commit 181563b

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/rpmsg/qcom_smd.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,6 +1479,9 @@ struct qcom_smd_edge *qcom_smd_register_edge(struct device *parent,
14791479
struct qcom_smd_edge *edge;
14801480
int ret;
14811481

1482+
if (!qcom_smem_is_available())
1483+
return ERR_PTR(-EPROBE_DEFER);
1484+
14821485
edge = kzalloc(sizeof(*edge), GFP_KERNEL);
14831486
if (!edge)
14841487
return ERR_PTR(-ENOMEM);
@@ -1553,12 +1556,9 @@ EXPORT_SYMBOL(qcom_smd_unregister_edge);
15531556
static int qcom_smd_probe(struct platform_device *pdev)
15541557
{
15551558
struct device_node *node;
1556-
void *p;
15571559

1558-
/* Wait for smem */
1559-
p = qcom_smem_get(QCOM_SMEM_HOST_ANY, smem_items[0].alloc_tbl_id, NULL);
1560-
if (PTR_ERR(p) == -EPROBE_DEFER)
1561-
return PTR_ERR(p);
1560+
if (!qcom_smem_is_available())
1561+
return -EPROBE_DEFER;
15621562

15631563
for_each_available_child_of_node(pdev->dev.of_node, node)
15641564
qcom_smd_register_edge(&pdev->dev, node);

0 commit comments

Comments
 (0)