Skip to content

Commit 62707b5

Browse files
plbossartvinodkoul
authored andcommitted
ASoC: SOF: Intel: hda: disable SoundWire interrupt later
The SoundWire interrupts can be masked at two levels a) in the Cadence IP b) at the HDaudio controller level We have an existing mechanism with cancel_work_sync() and status flags to make sure all existing interrupts are handled in the Cadence IP, and likewise no new interrupts can be generated before turning off the links. However on remove we first use the higher-level mask at the controller level, which is a sledgehammer preventing interrupts from all links. This is very racy and not necessary. We can disable the SoundWire interrupts after all the cleanups are done without any loss of functionality. Signed-off-by: Pierre-Louis Bossart <[email protected]> Signed-off-by: Bard Liao <[email protected]> Acked-by: Mark Brown <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent ce5e811 commit 62707b5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sound/soc/sof/intel/hda.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,12 +384,12 @@ static int hda_sdw_exit(struct snd_sof_dev *sdev)
384384

385385
hdev = sdev->pdata->hw_pdata;
386386

387-
hda_sdw_int_enable(sdev, false);
388-
389387
if (hdev->sdw)
390388
sdw_intel_exit(hdev->sdw);
391389
hdev->sdw = NULL;
392390

391+
hda_sdw_int_enable(sdev, false);
392+
393393
return 0;
394394
}
395395

0 commit comments

Comments
 (0)