Good day,
On Mon, Dec 02, 2024 at 02:28:25PM +0800, Chen-Yu Tsai wrote:
> When multi-core SCP support was added, the driver was made to populate
> platform devices for all the sub-nodes. This ended up adding platform
> devices for the rpmsg sub-nodes as well, which never actually get used,
> since rpmsg devices are registered through the rpmsg interface.
>
> Limit of_platform_populate() to just populating the SCP cores with a
> compatible string match list.
>
> Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP")
> Cc: Tinghan Shen <tinghan.shen@xxxxxxxxxxxx>
> Signed-off-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
> ---
> drivers/remoteproc/mtk_scp.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index 0f4a7065d0bd..8206a1766481 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -1326,6 +1326,11 @@ static int scp_cluster_init(struct platform_device *pdev, struct mtk_scp_of_clus
> return ret;
> }
>
> +static const struct of_device_id scp_core_match[] = {
> + { .compatible = "mediatek,scp-core" },
> + {}
> +};
> +
> static int scp_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -1357,13 +1362,15 @@ static int scp_probe(struct platform_device *pdev)
> INIT_LIST_HEAD(&scp_cluster->mtk_scp_list);
> mutex_init(&scp_cluster->cluster_lock);
>
> - ret = devm_of_platform_populate(dev);
> + ret = of_platform_populate(dev_of_node(dev), scp_core_match, NULL, dev);
> if (ret)
> return dev_err_probe(dev, ret, "Failed to populate platform devices\n");
>
> ret = scp_cluster_init(pdev, scp_cluster);
> - if (ret)
> + if (ret) {
> + of_platform_depopulate(dev);
> return ret;
> + }
>
> return 0;
> }
> @@ -1379,6 +1386,7 @@ static void scp_remove(struct platform_device *pdev)
> rproc_del(scp->rproc);
> scp_free(scp);
> }
> + of_platform_depopulate(&pdev->dev);
This looks like a sensible addition to me but I'll give Angelo some time to
chime in.
Regards,
Mathieu
> mutex_destroy(&scp_cluster->cluster_lock);
> }
>
> --
> 2.47.0.338.g60cca15819-goog
>
