Patch "ALSA: hda - Workaround for unbalanced i915 power refcount by concurrent probe" has been added to the 4.5-stable tree

Patch "ALSA: hda - Workaround for unbalanced i915 power refcount by concurrent probe" has been added to the 4.5-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    ALSA: hda - Workaround for unbalanced i915 power refcount by concurrent probe

to the 4.5-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     alsa-hda-workaround-for-unbalanced-i915-power-refcount-by-concurrent-probe.patch
and it can be found in the queue-4.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 7169701ad3f9fadd7413b354ae317e67c0b37389 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Sat, 19 Mar 2016 10:40:21 +0100
Subject: ALSA: hda - Workaround for unbalanced i915 power refcount by concurrent probe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Takashi Iwai <tiwai@suse.de>

commit 7169701ad3f9fadd7413b354ae317e67c0b37389 upstream.

The recent addition of on-demand i915 audio component binding in the
codec driver seems leading to the unbalanced i915 power refcount,
according to Intel CI tests.  Typically, it gets a kernel WARNING
like:
  WARNING: CPU: 3 PID: 173 at sound/hda/hdac_i915.c:91 snd_hdac_display_power+0xf1/0x110 [snd_hda_core]()
  Call Trace:
   [<ffffffff813fef15>] dump_stack+0x67/0x92
   [<ffffffff81078a21>] warn_slowpath_common+0x81/0xc0
   [<ffffffff81078b15>] warn_slowpath_null+0x15/0x20
   [<ffffffffa00f77e1>] snd_hdac_display_power+0xf1/0x110 [snd_hda_core]
   [<ffffffffa015039d>] azx_intel_link_power+0xd/0x10 [snd_hda_intel]
   [<ffffffffa011e32a>] azx_link_power+0x1a/0x30 [snd_hda_codec]
   [<ffffffffa00f21f9>] snd_hdac_link_power+0x29/0x40 [snd_hda_core]
   [<ffffffffa01192a6>] hda_codec_runtime_suspend+0x76/0xa0 [snd_hda_codec]
   .....

The scenario is like below:
- HD-audio driver and i915 driver are probed concurrently at the
  (almost) same time; HDA bus tries to bind with i915, but it fails
  because i915 initialization is still being processed.
- Later on, HD-audio probes the HDMI codec, where it again tries to
  bind with i915.  At this time, it succeeds.
- At finishing the probe of HDA, it decreases the refcount as if it
  were already bound at the bus probe, since the component is bound
  now.  This triggers a kernel WARNING due to the unbalance.

As a workaround, in this patch, we just disable the on-demand i915
component binding in the codec driver.  This essentially reverts back
to the state of 4.4 kernel.

We know that this is no real solution, but it's a minimalistic simple
change that can be applied to 4.5.x kernel as stable.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94566
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 sound/pci/hda/patch_hdmi.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -2470,9 +2470,15 @@ static int patch_generic_hdmi(struct hda
 	/* Try to bind with i915 for Intel HSW+ codecs (if not done yet) */
 	if ((codec->core.vendor_id >> 16) == 0x8086 &&
 	    is_haswell_plus(codec)) {
+#if 0
+		/* on-demand binding leads to an unbalanced refcount when
+		 * both i915 and hda drivers are probed concurrently;
+		 * disabled temporarily for now
+		 */
 		if (!codec->bus->core.audio_component)
 			if (!snd_hdac_i915_init(&codec->bus->core))
 				spec->i915_bound = true;
+#endif
 		/* use i915 audio component notifier for hotplug */
 		if (codec->bus->core.audio_component)
 			spec->use_acomp_notifier = true;


Patches currently in stable-queue which might be from tiwai@suse.de are

queue-4.5/alsa-hda-apply-reboot-d3-fix-for-cx20724-codec-too.patch
queue-4.5/alsa-intel8x0-add-clock-quirk-entry-for-ad1981b-on-ibm-thinkpad-x41.patch
queue-4.5/alsa-hda-add-new-gpu-codec-id-0x10de0082-to-snd-hda.patch
queue-4.5/alsa-hda-limit-i915-hdmi-binding-only-for-hsw-and-later.patch
queue-4.5/alsa-hda-fix-unexpected-resume-through-regmap-code-path.patch
queue-4.5/alsa-hda-fix-missing-eld-update-at-unplugging.patch
queue-4.5/alsa-hda-really-restrict-i915-notifier-to-hsw.patch
queue-4.5/alsa-usb-audio-add-microsoft-hd-5001-to-quirks.patch
queue-4.5/alsa-hda-workaround-for-unbalanced-i915-power-refcount-by-concurrent-probe.patch
queue-4.5/alsa-usb-audio-fix-null-dereference-in-create_fixed_stream_quirk.patch
queue-4.5/alsa-hda-fix-spurious-kernel-warning-on-baytrail-hdmi.patch
queue-4.5/alsa-usb-audio-minor-code-cleanup-in-create_fixed_stream_quirk.patch
queue-4.5/alsa-pcm-avoid-bug-string-for-warnings-again.patch
queue-4.5/alsa-usb-audio-fix-double-free-in-error-paths-after-snd_usb_add_audio_stream-call.patch
queue-4.5/alsa-hda-fix-unconditional-gpio-toggle-via-automute.patch
queue-4.5/alsa-hda-don-t-handle-eld-notify-from-invalid-port.patch
queue-4.5/alsa-usb-audio-add-sanity-checks-for-endpoint-accesses.patch
queue-4.5/alsa-hda-fix-the-mic-mute-button-and-led-problem-for-a-lenovo-aio.patch
queue-4.5/alsa-hda-fix-forgotten-hdmi-monitor_present-update.patch