On Wed, Mar 22, 2023 at 08:21:03AM -0600, Jeffrey Hugo wrote:
> On 3/22/2023 3:18 AM, Stanislaw Gruszka wrote:
> > Prevent running recovery_work after device is removed.
> >
> > Signed-off-by: Stanislaw Gruszka <stanislaw.gruszka@xxxxxxxxxxxxxxx>
> > ---
> > drivers/accel/ivpu/ivpu_drv.c | 2 ++
> > drivers/accel/ivpu/ivpu_pm.c | 15 +++++++++++++--
> > drivers/accel/ivpu/ivpu_pm.h | 1 +
> > 3 files changed, 16 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
> > index ac06bbfca920..d9e311b40348 100644
> > --- a/drivers/accel/ivpu/ivpu_drv.c
> > +++ b/drivers/accel/ivpu/ivpu_drv.c
> > @@ -580,6 +580,8 @@ static void ivpu_dev_fini(struct ivpu_device *vdev)
> > ivpu_pm_disable(vdev);
> > ivpu_shutdown(vdev);
> > ivpu_job_done_thread_fini(vdev);
> > + ivpu_pm_cancel_recovery(vdev);
> > +
> > ivpu_ipc_fini(vdev);
> > ivpu_fw_fini(vdev);
> > ivpu_mmu_global_context_fini(vdev);
> > diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c
> > index a880f1dd857e..df2e98cc0a56 100644
> > --- a/drivers/accel/ivpu/ivpu_pm.c
> > +++ b/drivers/accel/ivpu/ivpu_pm.c
> > @@ -98,11 +98,17 @@ static int ivpu_resume(struct ivpu_device *vdev)
> > static void ivpu_pm_recovery_work(struct work_struct *work)
> > {
> > struct ivpu_pm_info *pm = container_of(work, struct ivpu_pm_info, recovery_work);
> > - struct ivpu_device *vdev = pm->vdev;
> > + struct ivpu_device *vdev = pm->vdev;
> > char *evt[2] = {"IVPU_PM_EVENT=IVPU_RECOVER", NULL};
> > int ret;
> > - ret = pci_reset_function(to_pci_dev(vdev->drm.dev));
> > +retry:
> > + ret = pci_try_reset_function(to_pci_dev(vdev->drm.dev));
> > + if (ret == -EAGAIN && !drm_dev_is_unplugged(&vdev->drm)) {
> > + cond_resched();
> > + goto retry;
> > + }
> > +
> > if (ret)
> > ivpu_err(vdev, "Failed to reset VPU: %d\n", ret);
>
> I'm unsure about this now. Yes, you did fail to reset the VPU, but is it an
> error if the device is unplugged? Feels like this message could be
> misleading in that corner case.
Yes, it's not elegant to print error message on unplug.
I'll change this to:
if (ret && ret != -EAGAIN)
ivpu_err(vdev, "Failed to reset VPU: %d\n", ret);
Regards
Stanislaw
