Subject: Re: [PATCH v2 5/5] remoteproc: switch drivers to optional resource-table helper

From: Mathieu Poirier <[email-masked]>
Date: Wed, 27 May 2026 11:44:53 -0600

On Thu, May 14, 2026 at 09:21:29AM -0700, Ben Levinsky wrote:
> Use the shared optional resource-table helper in the remoteproc
> drivers that already treat a missing resource table as non-fatal:
> xlnx_r5_remoteproc, rcar_rproc, stm32_rproc, imx_rproc, and
> imx_dsp_rproc.
> 
> Keep thin local parse_fw() wrappers in each driver so the helper only
> centralizes the return-value handling. That lets each platform retain
> control over whether the missing-table case is logged and at what
> severity, while other parsing failures continue to propagate to the
> caller.
> 
> Signed-off-by: Ben Levinsky <[email-masked]>
> ---
>  drivers/remoteproc/imx_dsp_rproc.c      | 24 ++++++++++-----
>  drivers/remoteproc/imx_rproc.c          | 25 ++++++++-------
>  drivers/remoteproc/rcar_rproc.c         | 25 ++++++++-------
>  drivers/remoteproc/stm32_rproc.c        | 23 +++++++++-----
>  drivers/remoteproc/xlnx_r5_remoteproc.c | 41 +++++++++----------------
>  5 files changed, 73 insertions(+), 65 deletions(-)
> 
> diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
> index 2d9f14fbef1d..2ff74f7938f6 100644
> --- a/drivers/remoteproc/imx_dsp_rproc.c
> +++ b/drivers/remoteproc/imx_dsp_rproc.c
> @@ -954,14 +954,6 @@ static int imx_dsp_rproc_elf_load_segments(struct rproc *rproc, const struct fir
>  	return ret;
>  }
>  
> -static int imx_dsp_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> -{
> -	if (rproc_elf_load_rsc_table(rproc, fw))
> -		dev_warn(&rproc->dev, "no resource table found for this firmware\n");
> -
> -	return 0;
> -}
> -

Why is this getting moved after imx_dsp_rproc_load()?

>  static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw)
>  {
>  	struct imx_dsp_rproc *priv = rproc->priv;
> @@ -990,6 +982,22 @@ static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw)
>  	return 0;
>  }
>  
> +static int imx_dsp_rproc_parse_fw(struct rproc *rproc,
> +				  const struct firmware *fw)
> +{
> +	int ret;
> +
> +	ret = rproc_elf_load_rsc_table_optional(rproc, fw);
> +	if (ret)
> +		return ret;
> +
> +	if (!rproc->table_ptr)
> +		dev_warn(&rproc->dev,
> +			 "no resource table found for this firmware\n");
> +
> +	return 0;
> +}
> +

I am not overly fond of having to check rproc->table_ptr for the printout.  How
about:

#define rproc_elf_load_rsc_table_optional(rproc, fw, dev_func, fmt, ...)        \
        ({                                                                      \
                int ret = rproc_elf_load_rsc_table(rproc, fw);                  \
                if (ret == -EINVAL) {                                           \
                        dev_func(&rproc->dev, fmt, ##__VA_ARGS__);              \
                        return 0;                                               \
                } else {                                                        \
                        return ret;                                             \
                }                                                               \
        })

in remoteproc_internal.h and something like:

static int imx_dsp_rproc_parse_fw(struct rproc *rproc,
                                  const struct firmware *fw)
{
        rproc_elf_load_rsc_table_optional(rproc, fw, dev_warn,
                "no resource table found for this firmware\n");
}

in the clients?

>  static const struct rproc_ops imx_dsp_rproc_ops = {
>  	.prepare	= imx_dsp_rproc_prepare,
>  	.unprepare	= imx_dsp_rproc_unprepare,
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index 6249815b54d8..58c63f97ebf7 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -680,17 +680,6 @@ static int imx_rproc_prepare(struct rproc *rproc)
>  	return 0;
>  }
>  
> -static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> -{
> -	int ret;
> -
> -	ret = rproc_elf_load_rsc_table(rproc, fw);
> -	if (ret)
> -		dev_info(&rproc->dev, "No resource table in elf\n");
> -
> -	return 0;
> -}
> -
>  static void imx_rproc_kick(struct rproc *rproc, int vqid)
>  {
>  	struct imx_rproc *priv = rproc->priv;
> @@ -768,6 +757,20 @@ imx_rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware *
>  	return rproc_elf_find_loaded_rsc_table(rproc, fw);
>  }
>  
> +static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> +{
> +	int ret;
> +
> +	ret = rproc_elf_load_rsc_table_optional(rproc, fw);
> +	if (ret)
> +		return ret;
> +
> +	if (!rproc->table_ptr)
> +		dev_info(&rproc->dev, "No resource table in elf\n");
> +
> +	return 0;
> +}
> +
>  static const struct rproc_ops imx_rproc_ops = {
>  	.prepare	= imx_rproc_prepare,
>  	.attach		= imx_rproc_attach,
> diff --git a/drivers/remoteproc/rcar_rproc.c b/drivers/remoteproc/rcar_rproc.c
> index e3121fadd292..b7a39014b6bb 100644
> --- a/drivers/remoteproc/rcar_rproc.c
> +++ b/drivers/remoteproc/rcar_rproc.c
> @@ -55,17 +55,6 @@ static int rcar_rproc_prepare(struct rproc *rproc)
>  	}
>  }
>  
> -static int rcar_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> -{
> -	int ret;
> -
> -	ret = rproc_elf_load_rsc_table(rproc, fw);
> -	if (ret)
> -		dev_info(&rproc->dev, "No resource table in elf\n");
> -
> -	return 0;
> -}
> -
>  static int rcar_rproc_start(struct rproc *rproc)
>  {
>  	struct rcar_rproc *priv = rproc->priv;
> @@ -99,6 +88,20 @@ static int rcar_rproc_stop(struct rproc *rproc)
>  	return err;
>  }
>  
> +static int rcar_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> +{
> +	int ret;
> +
> +	ret = rproc_elf_load_rsc_table_optional(rproc, fw);
> +	if (ret)
> +		return ret;
> +
> +	if (!rproc->table_ptr)
> +		dev_info(&rproc->dev, "No resource table in elf\n");
> +
> +	return 0;
> +}
> +
>  static struct rproc_ops rcar_rproc_ops = {
>  	.prepare	= rcar_rproc_prepare,
>  	.start		= rcar_rproc_start,
> diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
> index 7ac8265b60ac..a4d42b755c74 100644
> --- a/drivers/remoteproc/stm32_rproc.c
> +++ b/drivers/remoteproc/stm32_rproc.c
> @@ -232,14 +232,6 @@ static int stm32_rproc_prepare(struct rproc *rproc)
>  	}
>  }
>  
> -static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> -{
> -	if (rproc_elf_load_rsc_table(rproc, fw))
> -		dev_warn(&rproc->dev, "no resource table found for this firmware\n");
> -
> -	return 0;
> -}
> -
>  static irqreturn_t stm32_rproc_wdg(int irq, void *data)
>  {
>  	struct platform_device *pdev = data;
> @@ -623,6 +615,21 @@ stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz)
>  	return (__force struct resource_table *)ddata->rsc_va;
>  }
>  
> +static int stm32_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw)
> +{
> +	int ret;
> +
> +	ret = rproc_elf_load_rsc_table_optional(rproc, fw);
> +	if (ret)
> +		return ret;
> +
> +	if (!rproc->table_ptr)
> +		dev_warn(&rproc->dev,
> +			 "no resource table found for this firmware\n");
> +
> +	return 0;
> +}
> +
>  static const struct rproc_ops st_rproc_ops = {
>  	.prepare	= stm32_rproc_prepare,
>  	.start		= stm32_rproc_start,
> diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/xlnx_r5_remoteproc.c
> index e5d1903c9636..9b9f07d152e6 100644
> --- a/drivers/remoteproc/xlnx_r5_remoteproc.c
> +++ b/drivers/remoteproc/xlnx_r5_remoteproc.c
> @@ -664,33 +664,6 @@ static int add_tcm_banks(struct rproc *rproc)
>  	return ret;
>  }
>  
> -/*
> - * zynqmp_r5_parse_fw()
> - * @rproc: single R5 core's corresponding rproc instance
> - * @fw: ptr to firmware to be loaded onto r5 core
> - *
> - * get resource table if available
> - *
> - * return 0 on success, otherwise non-zero value on failure
> - */
> -static int zynqmp_r5_parse_fw(struct rproc *rproc, const struct firmware *fw)
> -{
> -	int ret;
> -
> -	ret = rproc_elf_load_rsc_table(rproc, fw);
> -	if (ret == -EINVAL) {
> -		/*
> -		 * resource table only required for IPC.
> -		 * if not present, this is not necessarily an error;
> -		 * for example, loading r5 hello world application
> -		 * so simply inform user and keep going.
> -		 */
> -		dev_info(&rproc->dev, "no resource table found.\n");
> -		ret = 0;
> -	}
> -	return ret;
> -}
> -
>  /**
>   * zynqmp_r5_rproc_prepare() - prepare core to boot/attach
>   * adds carveouts for TCM bank and reserved memory regions
> @@ -843,6 +816,20 @@ static int zynqmp_r5_detach(struct rproc *rproc)
>  	return 0;
>  }
>  
> +static int zynqmp_r5_parse_fw(struct rproc *rproc, const struct firmware *fw)
> +{
> +	int ret;
> +
> +	ret = rproc_elf_load_rsc_table_optional(rproc, fw);
> +	if (ret)
> +		return ret;
> +
> +	if (!rproc->table_ptr)
> +		dev_info(&rproc->dev, "no resource table found.\n");
> +
> +	return 0;
> +}
> +
>  static const struct rproc_ops zynqmp_r5_rproc_ops = {
>  	.prepare	= zynqmp_r5_rproc_prepare,
>  	.unprepare	= zynqmp_r5_rproc_unprepare,
> -- 
> 2.34.1
>