On Wed, Jul 03, 2024 at 07:53:08PM +0800, Shun-yi Wang wrote:
> From: "shun-yi.wang" <shun-yi.wang@xxxxxxxxxxxx>
>
> SCP supports multiple reserved memory regions, intended for
> specific hardwards.
>
> Signed-off-by: shun-yi.wang <shun-yi.wang@xxxxxxxxxxxx>
> ---
> drivers/remoteproc/mtk_scp.c | 25 +++++++++++++++++--------
> 1 file changed, 17 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
> index 9ecd5ea04b5f3..1902826cea0af 100644
> --- a/drivers/remoteproc/mtk_scp.c
> +++ b/drivers/remoteproc/mtk_scp.c
> @@ -1006,22 +1006,31 @@ EXPORT_SYMBOL_GPL(scp_mapping_dm_addr);
>
> static int scp_map_memory_region(struct mtk_scp *scp)
> {
> - int ret;
> + int ret, i, err;
> const struct mtk_scp_sizes_data *scp_sizes;
> + struct device_node *node = scp->dev->of_node;
> + struct of_phandle_iterator it;
> +
> + i = 0;
> + of_for_each_phandle(&it, err, node, "memory-region", NULL, 0) {
> + ret = of_reserved_mem_device_init_by_idx(scp->dev, node, i);
> +
> + if (ret) {
> + dev_err(scp->dev, "failed to assign memory-region: %s\n",
> + it.node->name);
> + of_node_put(it.node);
> + return -ENOMEM;
> + }
With this patch the code is out of sync with the bindings which are still
specifying a maxItems of 1 - please address.
Thanks,
Mathieu
>
> - ret = of_reserved_mem_device_init(scp->dev);
> + i++;
> + }
>
> /* reserved memory is optional. */
> - if (ret == -ENODEV) {
> + if (!i) {
> dev_info(scp->dev, "skipping reserved memory initialization.");
> return 0;
> }
>
> - if (ret) {
> - dev_err(scp->dev, "failed to assign memory-region: %d\n", ret);
> - return -ENOMEM;
> - }
> -
> /* Reserved SCP code size */
> scp_sizes = scp->data->scp_sizes;
> scp->cpu_addr = dma_alloc_coherent(scp->dev, scp_sizes->max_dram_size,
> --
> 2.18.0
>
