Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c4e0663 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman
Browse files

Revert "ALSA: hda: Flush interrupts on disabling" 

[ Upstream commit 1a7f60b9df614bb36d14dc0c0bc898a31b2b506f ]

This reverts commit caa8422d01e983782548648e125fd617cadcec3f.

It turned out that this commit caused a regression at shutdown /
reboot, as the synchronize_irq() calls seems blocking the whole
shutdown.  Also another part of the change about shuffling the call
order looks suspicious; the azx_stop_chip() call disables the CORB /
RIRB while the others may still need the CORB/RIRB update.

Since the original commit itself was a cargo-fix, let's revert the
whole patch.

Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling")
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=205333
BugLinK: https://bugs.freedesktop.org/show_bug.cgi?id=111174


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://lore.kernel.org/r/20191028081056.22010-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3a3385ad

sound/hda/hdac_controller.c

+0 −2
Original line number Diff line number Diff line
@@ -441,8 +441,6 @@ static void azx_int_disable(struct hdac_bus *bus) 
	list_for_each_entry(azx_dev, &bus->stream_list, list)

		snd_hdac_stream_updateb(azx_dev, SD_CTL, SD_INT_MASK, 0);



	synchronize_irq(bus->irq);



	/* disable SIE for all streams */

	snd_hdac_chip_writeb(bus, INTCTL, 0);

sound/pci/hda/hda_intel.c

+1 −1
Original line number Diff line number Diff line
@@ -1239,9 +1239,9 @@ static int azx_free(struct azx *chip) 
	}



	if (bus->chip_init) {

		azx_stop_chip(chip);

		azx_clear_irq_pending(chip);

		azx_stop_all_streams(chip);

		azx_stop_chip(chip);

	}



	if (bus->irq >= 0)