accel/ivpu: Fix error handling in ivpu_boot()

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@vger.kernel.org # v6.13+
Reviewed-by: Karol Wachowski <karol.wachowski@intel.com>
Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250129124009.1039982-2-jacek.lawrynowicz@linux.intel.com

diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index ca2bf47ce2484a8e7ecca0f936e5a3438b22ff81..0c4a82271c26dfdebf664cdbc20abcb440986a1d 100644 (file)
--- 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);