Good day Joakim,
On Sun, Dec 17, 2023 at 01:36:59PM +0800, joakim.zhang@xxxxxxxxxxx wrote:
> From: Joakim Zhang <joakim.zhang@xxxxxxxxxxx>
>
> Recovery remote processor failed when wdg irq received:
> [ 0.842574] remoteproc remoteproc0: crash detected in cix-dsp-rproc: type watchdog
> [ 0.842750] remoteproc remoteproc0: handling crash #1 in cix-dsp-rproc
> [ 0.842824] remoteproc remoteproc0: recovering cix-dsp-rproc
> [ 0.843342] remoteproc remoteproc0: stopped remote processor cix-dsp-rproc
> [ 0.847901] rproc-virtio rproc-virtio.0.auto: Failed to associate buffer
> [ 0.847979] remoteproc remoteproc0: failed to probe subdevices for cix-dsp-rproc: -16
>
> The reason is that dma coherent mem would not be released when
> recovering the remote processor, due to rproc_virtio_remove()
> would not be called, where the mem released. It will fail when
> it try to allocate and associate buffer again.
>
> Releasing reserved memory from rproc_virtio_dev_release(), instead of
> rproc_virtio_remove().
>
> Fixes: 1d7b61c06dc3 ("remoteproc: virtio: Create platform device for the remoteproc_virtio")
> Signed-off-by: Joakim Zhang <joakim.zhang@xxxxxxxxxxx>
I am in agreement with your patch. I will apply it when 6.8-rc1 comes out.
Thanks,
Mathieu
> ---
> ChangeLogs:
> V1->V2:
> * the same for of_reserved_mem_device_release()
> V2->V3:
> * release reserved memory in rproc_virtio_dev_release()
> ---
> drivers/remoteproc/remoteproc_virtio.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
> index 83d76915a6ad..25b66b113b69 100644
> --- a/drivers/remoteproc/remoteproc_virtio.c
> +++ b/drivers/remoteproc/remoteproc_virtio.c
> @@ -351,6 +351,9 @@ static void rproc_virtio_dev_release(struct device *dev)
>
> kfree(vdev);
>
> + of_reserved_mem_device_release(&rvdev->pdev->dev);
> + dma_release_coherent_memory(&rvdev->pdev->dev);
> +
> put_device(&rvdev->pdev->dev);
> }
>
> @@ -584,9 +587,6 @@ static void rproc_virtio_remove(struct platform_device *pdev)
> rproc_remove_subdev(rproc, &rvdev->subdev);
> rproc_remove_rvdev(rvdev);
>
> - of_reserved_mem_device_release(&pdev->dev);
> - dma_release_coherent_memory(&pdev->dev);
> -
> put_device(&rproc->dev);
> }
>
> --
> 2.25.1
>
