Commit ba2247f9 authored Oct 28, 2019 by Takashi Iwai Committed by Greg Kroah-Hartman Dec 13, 2019

ALSA: hda - Fix pending unsol events at shutdown

[ Upstream commit ca58f55108fee41d87c9123f85ad4863e5de7f45 ]

This is an alternative fix attemp for the issue reported in the commit
caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling") that was
reverted later due to regressions.  Instead of tweaking the hardware
disablement order and the enforced irq flushing, do calling
cancel_work_sync() of the unsol work early enough, and explicitly
ignore the unsol events during the shutdown by checking the
bus->shutdown flag.

Fixes: caa8422d01e9 ("ALSA: hda: Flush interrupts on disabling")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://lore.kernel.org/r/s5h1ruxt9cz.wl-tiwai@suse.de


Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent af0174a6

sound/pci/hda/hda_bind.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,10 @@ static void hda_codec_unsol_event(struct hdac_device *dev, unsigned int ev)
		{
		struct hda_codec *codec = container_of(dev, struct hda_codec, core);

		/* ignore unsol events during shutdown */
		if (codec->bus->shutdown)
		return;

		if (codec->patch_ops.unsol_event)
		codec->patch_ops.unsol_event(codec, ev);
		}

sound/pci/hda/hda_intel.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1492,8 +1492,11 @@ static int azx_free(struct azx *chip)
		static int azx_dev_disconnect(struct snd_device *device)
		{
		struct azx *chip = device->device_data;
		struct hdac_bus *bus = azx_bus(chip);

		chip->bus.shutdown = 1;
		cancel_work_sync(&bus->unsol_work);

		return 0;
		}