[PATCH v2 0/2] remoteproc: imx_dsp_rproc: Add coredump and recovery support

[PATCH v2 0/2] remoteproc: imx_dsp_rproc: Add coredump and recovery support

[Shengjiu Wang]

When recovery is triggered, rproc_stop() is called first then
rproc_start(), but there is no rproc_unprepare_device() and
rproc_prepare_device() in the flow. As the software reset is needed
before DSP starts, so move software reset from imx_dsp_runtime_resume()
to .load() to make the recovery work. And make sure memory is cleared
before loading firmware.

Add call rproc_coredump_set_elf_info() to initialize the elf info for
coredump, otherwise coredump will report error "ELF class is not set".

changes in v2:
- move .reset() from runtime resume to .load()
- IRAM and DRAM still in the coredump scope.

Shengjiu Wang (2):
  remoteproc: imx_dsp_rproc: Add support of recovery process
  remoteproc: imx_dsp_rproc: Add support of coredump

 drivers/remoteproc/imx_dsp_rproc.c | 45 +++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 16 deletions(-)

-- 
2.34.1

[PATCH v2 1/2] remoteproc: imx_dsp_rproc: Add support of recovery process

[Shengjiu Wang]

When recovery is triggered, rproc_stop() is called first then
rproc_start(), but there is no rproc_unprepare_device() and
rproc_prepare_device() in the flow. As the software reset is needed
before DSP starts, so move software reset from imx_dsp_runtime_resume()
to .load() to make the recovery work. And make sure memory is cleared
before loading firmware.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 drivers/remoteproc/imx_dsp_rproc.c | 43 +++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
index 5ee622bf5352..ba764fc55686 100644
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@ -774,7 +774,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
 {
 	struct imx_dsp_rproc *priv = rproc->priv;
 	struct device *dev = rproc->dev.parent;
-	struct rproc_mem_entry *carveout;
 	int ret;
 
 	ret = imx_dsp_rproc_add_carveout(priv);
@@ -785,15 +784,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
 
 	pm_runtime_get_sync(dev);
 
-	/*
-	 * Clear buffers after pm rumtime for internal ocram is not
-	 * accessible if power and clock are not enabled.
-	 */
-	list_for_each_entry(carveout, &rproc->carveouts, node) {
-		if (carveout->va)
-			memset(carveout->va, 0, carveout->len);
-	}
-
 	return  0;
 }
 
@@ -1022,13 +1012,39 @@ static int imx_dsp_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw
 	return 0;
 }
 
+static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw)
+{
+	struct imx_dsp_rproc *priv = rproc->priv;
+	const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
+	struct rproc_mem_entry *carveout;
+	int ret;
+
+	/* Reset DSP if needed */
+	if (dsp_dcfg->reset)
+		dsp_dcfg->reset(priv);
+	/*
+	 * Clear buffers after pm rumtime for internal ocram is not
+	 * accessible if power and clock are not enabled.
+	 */
+	list_for_each_entry(carveout, &rproc->carveouts, node) {
+		if (carveout->va)
+			memset(carveout->va, 0, carveout->len);
+	}
+
+	ret = imx_dsp_rproc_elf_load_segments(rproc, fw);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
 static const struct rproc_ops imx_dsp_rproc_ops = {
 	.prepare	= imx_dsp_rproc_prepare,
 	.unprepare	= imx_dsp_rproc_unprepare,
 	.start		= imx_dsp_rproc_start,
 	.stop		= imx_dsp_rproc_stop,
 	.kick		= imx_dsp_rproc_kick,
-	.load		= imx_dsp_rproc_elf_load_segments,
+	.load		= imx_dsp_rproc_load,
 	.parse_fw	= imx_dsp_rproc_parse_fw,
 	.handle_rsc	= imx_dsp_rproc_handle_rsc,
 	.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
@@ -1214,7 +1230,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
 {
 	struct rproc *rproc = dev_get_drvdata(dev);
 	struct imx_dsp_rproc *priv = rproc->priv;
-	const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
 	int ret;
 
 	/*
@@ -1235,10 +1250,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
 		return ret;
 	}
 
-	/* Reset DSP if needed */
-	if (dsp_dcfg->reset)
-		dsp_dcfg->reset(priv);
-
 	return 0;
 }
 
-- 
2.34.1

[PATCH v2 2/2] remoteproc: imx_dsp_rproc: Add support of coredump

[Shengjiu Wang]

Add call rproc_coredump_set_elf_info() to initialize the elf info for
coredump, otherwise coredump will report error "ELF class is not set".

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 drivers/remoteproc/imx_dsp_rproc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
index ba764fc55686..6e78a01755c7 100644
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@ -1205,6 +1205,8 @@ static int imx_dsp_rproc_probe(struct platform_device *pdev)
 		goto err_detach_domains;
 	}
 
+	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_XTENSA);
+
 	pm_runtime_enable(dev);
 
 	return 0;
-- 
2.34.1

Re: [PATCH v2 1/2] remoteproc: imx_dsp_rproc: Add support of recovery process

[Mathieu Poirier]

On Fri, Jul 04, 2025 at 01:25:28PM +0800, Shengjiu Wang wrote:
> When recovery is triggered, rproc_stop() is called first then
> rproc_start(), but there is no rproc_unprepare_device() and
> rproc_prepare_device() in the flow. As the software reset is needed
> before DSP starts, so move software reset from imx_dsp_runtime_resume()
> to .load() to make the recovery work. And make sure memory is cleared
> before loading firmware.
> 
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
>  drivers/remoteproc/imx_dsp_rproc.c | 43 +++++++++++++++++++-----------
>  1 file changed, 27 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
> index 5ee622bf5352..ba764fc55686 100644
> --- a/drivers/remoteproc/imx_dsp_rproc.c
> +++ b/drivers/remoteproc/imx_dsp_rproc.c
> @@ -774,7 +774,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
>  {
>  	struct imx_dsp_rproc *priv = rproc->priv;
>  	struct device *dev = rproc->dev.parent;
> -	struct rproc_mem_entry *carveout;
>  	int ret;
>  
>  	ret = imx_dsp_rproc_add_carveout(priv);
> @@ -785,15 +784,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
>  
>  	pm_runtime_get_sync(dev);
>  
> -	/*
> -	 * Clear buffers after pm rumtime for internal ocram is not
> -	 * accessible if power and clock are not enabled.
> -	 */
> -	list_for_each_entry(carveout, &rproc->carveouts, node) {
> -		if (carveout->va)
> -			memset(carveout->va, 0, carveout->len);
> -	}
> -
>  	return  0;
>  }
>  
> @@ -1022,13 +1012,39 @@ static int imx_dsp_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw
>  	return 0;
>  }
>  
> +static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw)
> +{
> +	struct imx_dsp_rproc *priv = rproc->priv;
> +	const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
> +	struct rproc_mem_entry *carveout;
> +	int ret;
> +
> +	/* Reset DSP if needed */
> +	if (dsp_dcfg->reset)
> +		dsp_dcfg->reset(priv);
> +	/*
> +	 * Clear buffers after pm rumtime for internal ocram is not
> +	 * accessible if power and clock are not enabled.
> +	 */
> +	list_for_each_entry(carveout, &rproc->carveouts, node) {
> +		if (carveout->va)
> +			memset(carveout->va, 0, carveout->len);
> +	}
> +
> +	ret = imx_dsp_rproc_elf_load_segments(rproc, fw);
> +	if (ret)
> +		return ret;
> +
> +	return 0;
> +}
> +

This is a much better approach.  During my last review I said that I would not
move forward with this work until Daniel or Iuliana provide their R-B and yet,
they have not been added to the recipient list.

>  static const struct rproc_ops imx_dsp_rproc_ops = {
>  	.prepare	= imx_dsp_rproc_prepare,
>  	.unprepare	= imx_dsp_rproc_unprepare,
>  	.start		= imx_dsp_rproc_start,
>  	.stop		= imx_dsp_rproc_stop,
>  	.kick		= imx_dsp_rproc_kick,
> -	.load		= imx_dsp_rproc_elf_load_segments,
> +	.load		= imx_dsp_rproc_load,
>  	.parse_fw	= imx_dsp_rproc_parse_fw,
>  	.handle_rsc	= imx_dsp_rproc_handle_rsc,
>  	.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
> @@ -1214,7 +1230,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
>  {
>  	struct rproc *rproc = dev_get_drvdata(dev);
>  	struct imx_dsp_rproc *priv = rproc->priv;
> -	const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
>  	int ret;
>  
>  	/*
> @@ -1235,10 +1250,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
>  		return ret;
>  	}
>  
> -	/* Reset DSP if needed */
> -	if (dsp_dcfg->reset)
> -		dsp_dcfg->reset(priv);
> -
>  	return 0;
>  }
>  
> -- 
> 2.34.1
> 

Re: [PATCH v2 2/2] remoteproc: imx_dsp_rproc: Add support of coredump

[Mathieu Poirier]

On Fri, Jul 04, 2025 at 01:25:29PM +0800, Shengjiu Wang wrote:
> Add call rproc_coredump_set_elf_info() to initialize the elf info for
> coredump, otherwise coredump will report error "ELF class is not set".
> 
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
>  drivers/remoteproc/imx_dsp_rproc.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
> index ba764fc55686..6e78a01755c7 100644
> --- a/drivers/remoteproc/imx_dsp_rproc.c
> +++ b/drivers/remoteproc/imx_dsp_rproc.c
> @@ -1205,6 +1205,8 @@ static int imx_dsp_rproc_probe(struct platform_device *pdev)
>  		goto err_detach_domains;
>  	}
>  
> +	rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_XTENSA);
> +

The previous patch is small enough that this should be folded in it.

Thanks,
Mathieu

>  	pm_runtime_enable(dev);
>  
>  	return 0;
> -- 
> 2.34.1
> 

Re: [PATCH v2 1/2] remoteproc: imx_dsp_rproc: Add support of recovery process

[Iuliana Prodan]

Hello Mathieu, Shengjiu,

On 7/10/2025 5:48 PM, Mathieu Poirier wrote:
> On Fri, Jul 04, 2025 at 01:25:28PM +0800, Shengjiu Wang wrote:
>> When recovery is triggered, rproc_stop() is called first then
>> rproc_start(), but there is no rproc_unprepare_device() and
>> rproc_prepare_device() in the flow. As the software reset is needed
>> before DSP starts, so move software reset from imx_dsp_runtime_resume()
>> to .load() to make the recovery work. And make sure memory is cleared
>> before loading firmware.
>>
>> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
>> ---
>>   drivers/remoteproc/imx_dsp_rproc.c | 43 +++++++++++++++++++-----------
>>   1 file changed, 27 insertions(+), 16 deletions(-)
>>
>> diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
>> index 5ee622bf5352..ba764fc55686 100644
>> --- a/drivers/remoteproc/imx_dsp_rproc.c
>> +++ b/drivers/remoteproc/imx_dsp_rproc.c
>> @@ -774,7 +774,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
>>   {
>>   	struct imx_dsp_rproc *priv = rproc->priv;
>>   	struct device *dev = rproc->dev.parent;
>> -	struct rproc_mem_entry *carveout;
>>   	int ret;
>>   
>>   	ret = imx_dsp_rproc_add_carveout(priv);
>> @@ -785,15 +784,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
>>   
>>   	pm_runtime_get_sync(dev);
>>   
>> -	/*
>> -	 * Clear buffers after pm rumtime for internal ocram is not
>> -	 * accessible if power and clock are not enabled.
>> -	 */
>> -	list_for_each_entry(carveout, &rproc->carveouts, node) {
>> -		if (carveout->va)
>> -			memset(carveout->va, 0, carveout->len);
>> -	}
>> -
>>   	return  0;
>>   }
>>   
>> @@ -1022,13 +1012,39 @@ static int imx_dsp_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw
>>   	return 0;
>>   }
>>   
>> +static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw)
>> +{
>> +	struct imx_dsp_rproc *priv = rproc->priv;
>> +	const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
>> +	struct rproc_mem_entry *carveout;
>> +	int ret;
>> +
>> +	/* Reset DSP if needed */
>> +	if (dsp_dcfg->reset)
>> +		dsp_dcfg->reset(priv);
>> +	/*
>> +	 * Clear buffers after pm rumtime for internal ocram is not
>> +	 * accessible if power and clock are not enabled.
>> +	 */
>> +	list_for_each_entry(carveout, &rproc->carveouts, node) {
>> +		if (carveout->va)
>> +			memset(carveout->va, 0, carveout->len);
>> +	}
>> +
>> +	ret = imx_dsp_rproc_elf_load_segments(rproc, fw);
>> +	if (ret)
>> +		return ret;
>> +
>> +	return 0;
>> +}
>> +
> 
> This is a much better approach.  During my last review I said that I would not
> move forward with this work until Daniel or Iuliana provide their R-B and yet,
> they have not been added to the recipient list.
> 

I will have a look at this patchset at the beginning of next week.
I also plan to test it.

Iulia

>>   static const struct rproc_ops imx_dsp_rproc_ops = {
>>   	.prepare	= imx_dsp_rproc_prepare,
>>   	.unprepare	= imx_dsp_rproc_unprepare,
>>   	.start		= imx_dsp_rproc_start,
>>   	.stop		= imx_dsp_rproc_stop,
>>   	.kick		= imx_dsp_rproc_kick,
>> -	.load		= imx_dsp_rproc_elf_load_segments,
>> +	.load		= imx_dsp_rproc_load,
>>   	.parse_fw	= imx_dsp_rproc_parse_fw,
>>   	.handle_rsc	= imx_dsp_rproc_handle_rsc,
>>   	.find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
>> @@ -1214,7 +1230,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
>>   {
>>   	struct rproc *rproc = dev_get_drvdata(dev);
>>   	struct imx_dsp_rproc *priv = rproc->priv;
>> -	const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
>>   	int ret;
>>   
>>   	/*
>> @@ -1235,10 +1250,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
>>   		return ret;
>>   	}
>>   
>> -	/* Reset DSP if needed */
>> -	if (dsp_dcfg->reset)
>> -		dsp_dcfg->reset(priv);
>> -
>>   	return 0;
>>   }
>>   
>> -- 
>> 2.34.1
>>

Re: [PATCH v2 1/2] remoteproc: imx_dsp_rproc: Add support of recovery process

[Daniel Baluta]

> This is a much better approach.  During my last review I said that I would not
> move forward with this work until Daniel or Iuliana provide their R-B and yet,
> they have not been added to the recipient list.

Thanks Mathieu, we will have a look at this asap.

We are part of imx@lists.linux.dev so we got the mail.

Re: [PATCH v2 1/2] remoteproc: imx_dsp_rproc: Add support of recovery process

[Daniel Baluta]

On Fri, Jul 4, 2025 at 8:29 AM Shengjiu Wang <shengjiu.wang@nxp.com> wrote:
>
> When recovery is triggered, rproc_stop() is called first then
> rproc_start(), but there is no rproc_unprepare_device() and
> rproc_prepare_device() in the flow. As the software reset is needed
> before DSP starts, so move software reset from imx_dsp_runtime_resume()
> to .load() to make the recovery work. And make sure memory is cleared
> before loading firmware.

Hello Shengjiu,

Commit mostly looking good but the key point when writing a commit
is to explain why the commit is needed and less about what the
commit does (this should be obvious from the source code).


So, I would start with the context and that is:

Following commit: 6eed169c7fefd9cdbbccb5ba7a98470cc0c09c63
    remoteproc: imx_rproc: Enable attach recovery for i.MX8QM/QXP

enabled FW recovery, but is broken because <and here explain the reason that
you mostly described in the original commit>.

Then at the end add the Fixes tag.

Also, allow me on more day on Monday to test this patch.

Thanks,
Daniel.

>
> Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> ---
>  drivers/remoteproc/imx_dsp_rproc.c | 43 +++++++++++++++++++-----------
>  1 file changed, 27 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
> index 5ee622bf5352..ba764fc55686 100644
> --- a/drivers/remoteproc/imx_dsp_rproc.c
> +++ b/drivers/remoteproc/imx_dsp_rproc.c
> @@ -774,7 +774,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
>  {
>         struct imx_dsp_rproc *priv = rproc->priv;
>         struct device *dev = rproc->dev.parent;
> -       struct rproc_mem_entry *carveout;
>         int ret;
>
>         ret = imx_dsp_rproc_add_carveout(priv);
> @@ -785,15 +784,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
>
>         pm_runtime_get_sync(dev);
>
> -       /*
> -        * Clear buffers after pm rumtime for internal ocram is not
> -        * accessible if power and clock are not enabled.
> -        */
> -       list_for_each_entry(carveout, &rproc->carveouts, node) {
> -               if (carveout->va)
> -                       memset(carveout->va, 0, carveout->len);
> -       }
> -
>         return  0;
>  }
>
> @@ -1022,13 +1012,39 @@ static int imx_dsp_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw
>         return 0;
>  }
>
> +static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw)
> +{
> +       struct imx_dsp_rproc *priv = rproc->priv;
> +       const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
> +       struct rproc_mem_entry *carveout;
> +       int ret;
> +
> +       /* Reset DSP if needed */
> +       if (dsp_dcfg->reset)
> +               dsp_dcfg->reset(priv);
> +       /*
> +        * Clear buffers after pm rumtime for internal ocram is not
> +        * accessible if power and clock are not enabled.
> +        */
> +       list_for_each_entry(carveout, &rproc->carveouts, node) {
> +               if (carveout->va)
> +                       memset(carveout->va, 0, carveout->len);
> +       }
> +
> +       ret = imx_dsp_rproc_elf_load_segments(rproc, fw);
> +       if (ret)
> +               return ret;
> +
> +       return 0;
> +}
> +
>  static const struct rproc_ops imx_dsp_rproc_ops = {
>         .prepare        = imx_dsp_rproc_prepare,
>         .unprepare      = imx_dsp_rproc_unprepare,
>         .start          = imx_dsp_rproc_start,
>         .stop           = imx_dsp_rproc_stop,
>         .kick           = imx_dsp_rproc_kick,
> -       .load           = imx_dsp_rproc_elf_load_segments,
> +       .load           = imx_dsp_rproc_load,
>         .parse_fw       = imx_dsp_rproc_parse_fw,
>         .handle_rsc     = imx_dsp_rproc_handle_rsc,
>         .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
> @@ -1214,7 +1230,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
>  {
>         struct rproc *rproc = dev_get_drvdata(dev);
>         struct imx_dsp_rproc *priv = rproc->priv;
> -       const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
>         int ret;
>
>         /*
> @@ -1235,10 +1250,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
>                 return ret;
>         }
>
> -       /* Reset DSP if needed */
> -       if (dsp_dcfg->reset)
> -               dsp_dcfg->reset(priv);
> -
>         return 0;
>  }
>
> --
> 2.34.1
>
>

Re: [PATCH v2 1/2] remoteproc: imx_dsp_rproc: Add support of recovery process

[Shengjiu Wang]

On Fri, Jul 18, 2025 at 7:24 PM Daniel Baluta <daniel.baluta@gmail.com> wrote:
>
> On Fri, Jul 4, 2025 at 8:29 AM Shengjiu Wang <shengjiu.wang@nxp.com> wrote:
> >
> > When recovery is triggered, rproc_stop() is called first then
> > rproc_start(), but there is no rproc_unprepare_device() and
> > rproc_prepare_device() in the flow. As the software reset is needed
> > before DSP starts, so move software reset from imx_dsp_runtime_resume()
> > to .load() to make the recovery work. And make sure memory is cleared
> > before loading firmware.
>
> Hello Shengjiu,
>
> Commit mostly looking good but the key point when writing a commit
> is to explain why the commit is needed and less about what the
> commit does (this should be obvious from the source code).
>
>
> So, I would start with the context and that is:
>
> Following commit: 6eed169c7fefd9cdbbccb5ba7a98470cc0c09c63
>     remoteproc: imx_rproc: Enable attach recovery for i.MX8QM/QXP
>
> enabled FW recovery, but is broken because <and here explain the reason that
> you mostly described in the original commit>.
>
> Then at the end add the Fixes tag.

Thanks for comments, will update in next version.

Best regards
Shengjiu Wang
>
> Also, allow me on more day on Monday to test this patch.
>
> Thanks,
> Daniel.
>
> >
> > Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
> > ---
> >  drivers/remoteproc/imx_dsp_rproc.c | 43 +++++++++++++++++++-----------
> >  1 file changed, 27 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
> > index 5ee622bf5352..ba764fc55686 100644
> > --- a/drivers/remoteproc/imx_dsp_rproc.c
> > +++ b/drivers/remoteproc/imx_dsp_rproc.c
> > @@ -774,7 +774,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
> >  {
> >         struct imx_dsp_rproc *priv = rproc->priv;
> >         struct device *dev = rproc->dev.parent;
> > -       struct rproc_mem_entry *carveout;
> >         int ret;
> >
> >         ret = imx_dsp_rproc_add_carveout(priv);
> > @@ -785,15 +784,6 @@ static int imx_dsp_rproc_prepare(struct rproc *rproc)
> >
> >         pm_runtime_get_sync(dev);
> >
> > -       /*
> > -        * Clear buffers after pm rumtime for internal ocram is not
> > -        * accessible if power and clock are not enabled.
> > -        */
> > -       list_for_each_entry(carveout, &rproc->carveouts, node) {
> > -               if (carveout->va)
> > -                       memset(carveout->va, 0, carveout->len);
> > -       }
> > -
> >         return  0;
> >  }
> >
> > @@ -1022,13 +1012,39 @@ static int imx_dsp_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw
> >         return 0;
> >  }
> >
> > +static int imx_dsp_rproc_load(struct rproc *rproc, const struct firmware *fw)
> > +{
> > +       struct imx_dsp_rproc *priv = rproc->priv;
> > +       const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
> > +       struct rproc_mem_entry *carveout;
> > +       int ret;
> > +
> > +       /* Reset DSP if needed */
> > +       if (dsp_dcfg->reset)
> > +               dsp_dcfg->reset(priv);
> > +       /*
> > +        * Clear buffers after pm rumtime for internal ocram is not
> > +        * accessible if power and clock are not enabled.
> > +        */
> > +       list_for_each_entry(carveout, &rproc->carveouts, node) {
> > +               if (carveout->va)
> > +                       memset(carveout->va, 0, carveout->len);
> > +       }
> > +
> > +       ret = imx_dsp_rproc_elf_load_segments(rproc, fw);
> > +       if (ret)
> > +               return ret;
> > +
> > +       return 0;
> > +}
> > +
> >  static const struct rproc_ops imx_dsp_rproc_ops = {
> >         .prepare        = imx_dsp_rproc_prepare,
> >         .unprepare      = imx_dsp_rproc_unprepare,
> >         .start          = imx_dsp_rproc_start,
> >         .stop           = imx_dsp_rproc_stop,
> >         .kick           = imx_dsp_rproc_kick,
> > -       .load           = imx_dsp_rproc_elf_load_segments,
> > +       .load           = imx_dsp_rproc_load,
> >         .parse_fw       = imx_dsp_rproc_parse_fw,
> >         .handle_rsc     = imx_dsp_rproc_handle_rsc,
> >         .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table,
> > @@ -1214,7 +1230,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
> >  {
> >         struct rproc *rproc = dev_get_drvdata(dev);
> >         struct imx_dsp_rproc *priv = rproc->priv;
> > -       const struct imx_dsp_rproc_dcfg *dsp_dcfg = priv->dsp_dcfg;
> >         int ret;
> >
> >         /*
> > @@ -1235,10 +1250,6 @@ static int imx_dsp_runtime_resume(struct device *dev)
> >                 return ret;
> >         }
> >
> > -       /* Reset DSP if needed */
> > -       if (dsp_dcfg->reset)
> > -               dsp_dcfg->reset(priv);
> > -
> >         return 0;
> >  }
> >
> > --
> > 2.34.1
> >
> >
>