ASoC: Intel: avs: Fix deadlock when the failing IPC is SET_D0IX

The procedure handling IPC timeouts and EXCEPTION_CAUGHT notification
shall cancel any D0IX work before proceeding with DSP recovery. If
SET_D0IX called from delayed_work is the failing IPC the procedure will
deadlock. Conditionally skip cancelling the work to fix that.

Fixes: 335c4cbd201d ("ASoC: Intel: avs: D0ix power state support")
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20250530141025.2942936-3-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/ipc.c b/sound/soc/intel/avs/ipc.c
index 08ed9d96738a05ea88c85c04c73d878b8da921af..0314f9d4ea5f40084bef73c8e065bf1ffe60d087 100644 (file)
--- a/sound/soc/intel/avs/ipc.c
+++ b/sound/soc/intel/avs/ipc.c
@@ -169,7 +169,9 @@ static void avs_dsp_exception_caught(struct avs_dev *adev, union avs_notify_msg
 
        dev_crit(adev->dev, "communication severed, rebooting dsp..\n");
 
-       cancel_delayed_work_sync(&ipc->d0ix_work);
+       /* Avoid deadlock as the exception may be the response to SET_D0IX. */
+       if (current_work() != &ipc->d0ix_work.work)
+               cancel_delayed_work_sync(&ipc->d0ix_work);
        ipc->in_d0ix = false;
        /* Re-enabled on recovery completion. */
        pm_runtime_disable(adev->dev);