From: Jacek Lawrynowicz <jacek.lawrynowicz@xxxxxxxxxxxxxxx>
commit f3be8a9b1afffbcc70f8e41063b151b1038d7813 upstream.
Ensure IRQs and IPC are properly disabled if HW sched or DCT
initialization fails.
Fixes: cc3c72c7e610 ("accel/ivpu: Refactor failure diagnostics during boot")
Cc: stable@xxxxxxxxxxxxxxx # v6.13+
Reviewed-by: Karol Wachowski <karol.wachowski@xxxxxxxxx>
Reviewed-by: Jeffrey Hugo <quic_jhugo@xxxxxxxxxxx>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@xxxxxxxxxxxxxxx>
Link: https://patchwork.freedesktop.org/patch/msgid/20250129124009.1039982-2-jacek.lawrynowicz@xxxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/accel/ivpu/ivpu_drv.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index ca2bf47ce248..0c4a82271c26 100644
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@ -397,15 +397,19 @@ int ivpu_boot(struct ivpu_device *vdev)
if (ivpu_fw_is_cold_boot(vdev)) {
ret = ivpu_pm_dct_init(vdev);
if (ret)
- goto err_diagnose_failure;
+ goto err_disable_ipc;
ret = ivpu_hw_sched_init(vdev);
if (ret)
- goto err_diagnose_failure;
+ goto err_disable_ipc;
}
return 0;
+err_disable_ipc:
+ ivpu_ipc_disable(vdev);
+ ivpu_hw_irq_disable(vdev);
+ disable_irq(vdev->irq);
err_diagnose_failure:
ivpu_hw_diagnose_failure(vdev);
ivpu_mmu_evtq_dump(vdev);
--
2.48.1
Patches currently in stable-queue which might be from jacek.lawrynowicz@xxxxxxxxxxxxxxx are
queue-6.13/accel-ivpu-fix-error-handling-in-recovery-reset.patch
queue-6.13/accel-ivpu-fix-qemu-crash-when-running-in-passthrough.patch
queue-6.13/accel-ivpu-clear-runtime_error-after-pm_runtime_resume_and_get-fails.patch
queue-6.13/accel-ivpu-fix-error-handling-in-ivpu_boot.patch
