]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: SOF: amd: fix for false dsp interrupts
authorVijendar Mukunda <Vijendar.Mukunda@amd.com>
Thu, 4 Apr 2024 04:17:13 +0000 (09:47 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Apr 2024 14:36:01 +0000 (16:36 +0200)
[ Upstream commit b9846a386734e73a1414950ebfd50f04919f5e24 ]

Before ACP firmware loading, DSP interrupts are not expected.
Sometimes after reboot, it's observed that before ACP firmware is loaded
false DSP interrupt is reported.
Registering the interrupt handler before acp initialization causing false
interrupts sometimes on reboot as ACP reset is not applied.
Correct the sequence by invoking acp initialization sequence prior to
registering interrupt handler.

Fixes: 738a2b5e2cc9 ("ASoC: SOF: amd: Add IPC support for ACP IP block")
Signed-off-by: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
Link: https://msgid.link/r/20240404041717.430545-1-Vijendar.Mukunda@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/sof/amd/acp.c

index 4c54ce212de6a18e0d4c9b901016e739b8b4e26e..cc006d7038d9774a3db8b650c8bae9ca50bf7549 100644 (file)
@@ -522,6 +522,10 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev)
                goto unregister_dev;
        }
 
+       ret = acp_init(sdev);
+       if (ret < 0)
+               goto free_smn_dev;
+
        sdev->ipc_irq = pci->irq;
        ret = request_threaded_irq(sdev->ipc_irq, acp_irq_handler, acp_irq_thread,
                                   IRQF_SHARED, "AudioDSP", sdev);
@@ -531,10 +535,6 @@ int amd_sof_acp_probe(struct snd_sof_dev *sdev)
                goto free_smn_dev;
        }
 
-       ret = acp_init(sdev);
-       if (ret < 0)
-               goto free_ipc_irq;
-
        sdev->dsp_box.offset = 0;
        sdev->dsp_box.size = BOX_SIZE_512;