From: Sasha Levin Date: Wed, 6 Nov 2019 02:24:57 +0000 (-0500) Subject: fixes for 4.14 X-Git-Tag: v4.4.199~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e529f9fac4bab0e390b4ae4de0ccbade680656c;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/revert-alsa-hda-flush-interrupts-on-disabling.patch b/queue-4.14/revert-alsa-hda-flush-interrupts-on-disabling.patch new file mode 100644 index 00000000000..54abefa7bb8 --- /dev/null +++ b/queue-4.14/revert-alsa-hda-flush-interrupts-on-disabling.patch @@ -0,0 +1,64 @@ +From 3d073bcb8394c0eb1b8e5632a9f5d27297d80ccd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 28 Oct 2019 09:10:56 +0100 +Subject: Revert "ALSA: hda: Flush interrupts on disabling" + +From: Takashi Iwai + +[ 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: Takashi Iwai +Cc: Chris Wilson +Link: https://lore.kernel.org/r/20191028081056.22010-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/hda/hdac_controller.c | 2 -- + sound/pci/hda/hda_intel.c | 2 +- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c +index 3377f0bc28280..778b42ba90b80 100644 +--- a/sound/hda/hdac_controller.c ++++ b/sound/hda/hdac_controller.c +@@ -442,8 +442,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); + +diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c +index b42ab80ee6078..96e9b3944b925 100644 +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -1413,9 +1413,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) +-- +2.20.1 + diff --git a/queue-4.14/series b/queue-4.14/series index d8deaa550ad..44bb8fe2f1e 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -93,3 +93,4 @@ sctp-not-bind-the-socket-in-sctp_connect.patch xfs-correctly-invert-xfs_buftarg-lru-isolation-logic.patch alsa-timer-simplify-error-path-in-snd_timer_open.patch alsa-timer-fix-mutex-deadlock-at-releasing-card.patch +revert-alsa-hda-flush-interrupts-on-disabling.patch