diff mbox series

remoteproc: imx_dsp_rproc: Make rsc_table optional

Message ID 20220331103237.340796-1-daniel.baluta@oss.nxp.com (mailing list archive)
State Accepted
Headers show
Series remoteproc: imx_dsp_rproc: Make rsc_table optional | expand

Commit Message

Daniel Baluta (OSS) March 31, 2022, 10:32 a.m. UTC
From: Daniel Baluta <daniel.baluta@nxp.com>

There are cases when we want to test a simple "hello world"
app on the DSP and we do not need a resource table.

remoteproc core allows us having an optional rsc_table.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 drivers/remoteproc/imx_dsp_rproc.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

Comments

Shengjiu Wang April 6, 2022, 10:18 a.m. UTC | #1
> 
> There are cases when we want to test a simple "hello world"
> app on the DSP and we do not need a resource table.
> 
> remoteproc core allows us having an optional rsc_table.
> 
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>

Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>

Best regards
Wang Shengjiu

> ---
>  drivers/remoteproc/imx_dsp_rproc.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/remoteproc/imx_dsp_rproc.c
> b/drivers/remoteproc/imx_dsp_rproc.c
> index 2abee78df96e..987ab1add761 100644
> --- a/drivers/remoteproc/imx_dsp_rproc.c
> +++ b/drivers/remoteproc/imx_dsp_rproc.c
> @@ -802,6 +802,14 @@ static void imx_dsp_rproc_kick(struct rproc *rproc,
> int vqid)
>  		dev_err(dev, "%s: failed (%d, err:%d)\n", __func__, vqid,
> err);  }
> 
> +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;
> +}
> +
>  static const struct rproc_ops imx_dsp_rproc_ops = {
>  	.prepare	= imx_dsp_rproc_prepare,
>  	.unprepare	= imx_dsp_rproc_unprepare,
> @@ -809,7 +817,7 @@ static const struct rproc_ops imx_dsp_rproc_ops = {
>  	.stop		= imx_dsp_rproc_stop,
>  	.kick		= imx_dsp_rproc_kick,
>  	.load		= imx_dsp_rproc_elf_load_segments,
> -	.parse_fw	= rproc_elf_load_rsc_table,
> +	.parse_fw	= imx_dsp_rproc_parse_fw,
>  	.sanity_check	= rproc_elf_sanity_check,
>  	.get_boot_addr	= rproc_elf_get_boot_addr,
>  };
> --
> 2.27.0
Mathieu Poirier April 13, 2022, 5:59 p.m. UTC | #2
Hi Daniel,

On Thu, Mar 31, 2022 at 01:32:37PM +0300, Daniel Baluta wrote:
> From: Daniel Baluta <daniel.baluta@nxp.com>
> 
> There are cases when we want to test a simple "hello world"
> app on the DSP and we do not need a resource table.
> 
> remoteproc core allows us having an optional rsc_table.
> 
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> ---
>  drivers/remoteproc/imx_dsp_rproc.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
> index 2abee78df96e..987ab1add761 100644
> --- a/drivers/remoteproc/imx_dsp_rproc.c
> +++ b/drivers/remoteproc/imx_dsp_rproc.c
> @@ -802,6 +802,14 @@ static void imx_dsp_rproc_kick(struct rproc *rproc, int vqid)
>  		dev_err(dev, "%s: failed (%d, err:%d)\n", __func__, vqid, err);
>  }
>  
> +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;
> +}
> +
>  static const struct rproc_ops imx_dsp_rproc_ops = {
>  	.prepare	= imx_dsp_rproc_prepare,
>  	.unprepare	= imx_dsp_rproc_unprepare,
> @@ -809,7 +817,7 @@ static const struct rproc_ops imx_dsp_rproc_ops = {
>  	.stop		= imx_dsp_rproc_stop,
>  	.kick		= imx_dsp_rproc_kick,
>  	.load		= imx_dsp_rproc_elf_load_segments,
> -	.parse_fw	= rproc_elf_load_rsc_table,
> +	.parse_fw	= imx_dsp_rproc_parse_fw,

Applied.

Thanks,
Mathieu

>  	.sanity_check	= rproc_elf_sanity_check,
>  	.get_boot_addr	= rproc_elf_get_boot_addr,
>  };
> -- 
> 2.27.0
>
diff mbox series

Patch

diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
index 2abee78df96e..987ab1add761 100644
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@ -802,6 +802,14 @@  static void imx_dsp_rproc_kick(struct rproc *rproc, int vqid)
 		dev_err(dev, "%s: failed (%d, err:%d)\n", __func__, vqid, err);
 }
 
+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;
+}
+
 static const struct rproc_ops imx_dsp_rproc_ops = {
 	.prepare	= imx_dsp_rproc_prepare,
 	.unprepare	= imx_dsp_rproc_unprepare,
@@ -809,7 +817,7 @@  static const struct rproc_ops imx_dsp_rproc_ops = {
 	.stop		= imx_dsp_rproc_stop,
 	.kick		= imx_dsp_rproc_kick,
 	.load		= imx_dsp_rproc_elf_load_segments,
-	.parse_fw	= rproc_elf_load_rsc_table,
+	.parse_fw	= imx_dsp_rproc_parse_fw,
 	.sanity_check	= rproc_elf_sanity_check,
 	.get_boot_addr	= rproc_elf_get_boot_addr,
 };