Applied "sound: enable interrupt after dma buffer initialization" to the asoc tree

Message ID
State New
Headers show
  • Applied "sound: enable interrupt after dma buffer initialization" to the asoc tree
Related show

Commit Message

Mark Brown Sept. 13, 2018, 11:36 a.m.
The patch

   sound: enable interrupt after dma buffer initialization

has been applied to the asoc tree at 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.


From b61749a89f826eb61fc59794d9e4697bd246eb61 Mon Sep 17 00:00:00 2001
From: Yu Zhao <>

Date: Tue, 11 Sep 2018 15:14:04 -0600
Subject: [PATCH] sound: enable interrupt after dma buffer initialization

In snd_hdac_bus_init_chip(), we enable interrupt before
snd_hdac_bus_init_cmd_io() initializing dma buffers. If irq has
been acquired and irq handler uses the dma buffer, kernel may crash
when interrupt comes in.

Fix the problem by postponing enabling irq after dma buffer
initialization. And warn once on null dma buffer pointer during the

Reviewed-by: Takashi Iwai <>

Signed-off-by: Yu Zhao <>

Signed-off-by: Mark Brown <>

 sound/hda/hdac_controller.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


Alsa-devel mailing list


diff --git a/sound/hda/hdac_controller.c b/sound/hda/hdac_controller.c
index 560ec0986e1a..11057d9f84ec 100644
--- a/sound/hda/hdac_controller.c
+++ b/sound/hda/hdac_controller.c
@@ -40,6 +40,8 @@  static void azx_clear_corbrp(struct hdac_bus *bus)
 void snd_hdac_bus_init_cmd_io(struct hdac_bus *bus)
+	WARN_ON_ONCE(!bus->rb.area);
 	/* CORB set up */
 	bus->corb.addr = bus->rb.addr;
@@ -479,13 +481,15 @@  bool snd_hdac_bus_init_chip(struct hdac_bus *bus, bool full_reset)
 	/* reset controller */
 	azx_reset(bus, full_reset);
-	/* initialize interrupts */
+	/* clear interrupts */
-	azx_int_enable(bus);
 	/* initialize the codec command I/O */
+	/* enable interrupts after CORB/RIRB buffers are initialized above */
+	azx_int_enable(bus);
 	/* program the position buffer */
 	if (bus->use_posbuf && bus->posbuf.addr) {
 		snd_hdac_chip_writel(bus, DPLBASE, (u32)bus->posbuf.addr);