From c0b96f52493b9933968d08d78d8499bb173b834b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 14 Dec 2014 12:14:54 -0800 Subject: [PATCH] 3.18-stable patches added patches: alsa-hda-add-eapd-fixup-for-asus-z99he-laptop.patch alsa-hda-fix-built-in-mic-at-resume-on-lenovo-ideapad-s210.patch alsa-usb-audio-don-t-resubmit-pending-urbs-at-midi-error-recovery.patch --- ...add-eapd-fixup-for-asus-z99he-laptop.patch | 30 +++++++++ ...mic-at-resume-on-lenovo-ideapad-s210.patch | 31 +++++++++ ...-pending-urbs-at-midi-error-recovery.patch | 67 +++++++++++++++++++ queue-3.18/series | 3 + 4 files changed, 131 insertions(+) create mode 100644 queue-3.18/alsa-hda-add-eapd-fixup-for-asus-z99he-laptop.patch create mode 100644 queue-3.18/alsa-hda-fix-built-in-mic-at-resume-on-lenovo-ideapad-s210.patch create mode 100644 queue-3.18/alsa-usb-audio-don-t-resubmit-pending-urbs-at-midi-error-recovery.patch diff --git a/queue-3.18/alsa-hda-add-eapd-fixup-for-asus-z99he-laptop.patch b/queue-3.18/alsa-hda-add-eapd-fixup-for-asus-z99he-laptop.patch new file mode 100644 index 00000000000..ad037cd9bfa --- /dev/null +++ b/queue-3.18/alsa-hda-add-eapd-fixup-for-asus-z99he-laptop.patch @@ -0,0 +1,30 @@ +From f62f5eff3d40a56ad1cf0d81a6cac8dd8743e8a1 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 9 Dec 2014 19:58:53 +0100 +Subject: ALSA: hda - Add EAPD fixup for ASUS Z99He laptop + +From: Takashi Iwai + +commit f62f5eff3d40a56ad1cf0d81a6cac8dd8743e8a1 upstream. + +The same fixup to enable EAPD is needed for ASUS Z99He with AD1986A +codec like another ASUS machine. + +Reported-and-tested-by: Dmitry V. Zimin +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_analog.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_analog.c ++++ b/sound/pci/hda/patch_analog.c +@@ -332,6 +332,7 @@ static const struct hda_fixup ad1986a_fi + + static const struct snd_pci_quirk ad1986a_fixup_tbl[] = { + SND_PCI_QUIRK(0x103c, 0x30af, "HP B2800", AD1986A_FIXUP_LAPTOP_IMIC), ++ SND_PCI_QUIRK(0x1043, 0x1443, "ASUS Z99He", AD1986A_FIXUP_EAPD), + SND_PCI_QUIRK(0x1043, 0x1447, "ASUS A8JN", AD1986A_FIXUP_EAPD), + SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8100, "ASUS P5", AD1986A_FIXUP_3STACK), + SND_PCI_QUIRK_MASK(0x1043, 0xff00, 0x8200, "ASUS M2", AD1986A_FIXUP_3STACK), diff --git a/queue-3.18/alsa-hda-fix-built-in-mic-at-resume-on-lenovo-ideapad-s210.patch b/queue-3.18/alsa-hda-fix-built-in-mic-at-resume-on-lenovo-ideapad-s210.patch new file mode 100644 index 00000000000..bd94d94dbc8 --- /dev/null +++ b/queue-3.18/alsa-hda-fix-built-in-mic-at-resume-on-lenovo-ideapad-s210.patch @@ -0,0 +1,31 @@ +From fedb2245cbb8d823e449ebdd48ba9bb35c071ce0 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Thu, 13 Nov 2014 07:11:38 +0100 +Subject: ALSA: hda - Fix built-in mic at resume on Lenovo Ideapad S210 + +From: Takashi Iwai + +commit fedb2245cbb8d823e449ebdd48ba9bb35c071ce0 upstream. + +The built-in mic boost volume gets almost muted after suspend/resume +on Lenovo Ideapad S210. + +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=88121 +Reported-and-tested-by: Roman Kagan +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/pci/hda/patch_realtek.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_realtek.c ++++ b/sound/pci/hda/patch_realtek.c +@@ -4887,6 +4887,7 @@ static const struct snd_pci_quirk alc269 + SND_PCI_QUIRK(0x17aa, 0x2212, "Thinkpad T440", ALC292_FIXUP_TPT440_DOCK), + SND_PCI_QUIRK(0x17aa, 0x2214, "Thinkpad X240", ALC292_FIXUP_TPT440_DOCK), + SND_PCI_QUIRK(0x17aa, 0x2215, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), ++ SND_PCI_QUIRK(0x17aa, 0x3977, "IdeaPad S210", ALC283_FIXUP_INT_MIC), + SND_PCI_QUIRK(0x17aa, 0x3978, "IdeaPad Y410P", ALC269_FIXUP_NO_SHUTUP), + SND_PCI_QUIRK(0x17aa, 0x5013, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), + SND_PCI_QUIRK(0x17aa, 0x501a, "Thinkpad", ALC283_FIXUP_INT_MIC), diff --git a/queue-3.18/alsa-usb-audio-don-t-resubmit-pending-urbs-at-midi-error-recovery.patch b/queue-3.18/alsa-usb-audio-don-t-resubmit-pending-urbs-at-midi-error-recovery.patch new file mode 100644 index 00000000000..b038646134f --- /dev/null +++ b/queue-3.18/alsa-usb-audio-don-t-resubmit-pending-urbs-at-midi-error-recovery.patch @@ -0,0 +1,67 @@ +From 66139a48cee1530c91f37c145384b4ee7043f0b7 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Sat, 6 Dec 2014 18:02:55 +0100 +Subject: ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery + +From: Takashi Iwai + +commit 66139a48cee1530c91f37c145384b4ee7043f0b7 upstream. + +In snd_usbmidi_error_timer(), the driver tries to resubmit MIDI input +URBs to reactivate the MIDI stream, but this causes the error when +some of URBs are still pending like: + + WARNING: CPU: 0 PID: 0 at ../drivers/usb/core/urb.c:339 usb_submit_urb+0x5f/0x70() + URB ef705c40 submitted while active + CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.16.6-2-desktop #1 + Hardware name: FOXCONN TPS01/TPS01, BIOS 080015 03/23/2010 + c0984bfa f4009ed4 c078deaf f4009ee4 c024c884 c09a135c f4009f00 00000000 + c0984bfa 00000153 c061ac4f c061ac4f 00000009 00000001 ef705c40 e854d1c0 + f4009eec c024c8d3 00000009 f4009ee4 c09a135c f4009f00 f4009f04 c061ac4f + Call Trace: + [] try_stack_unwind+0x156/0x170 + [] dump_trace+0x5a/0x1b0 + [] show_trace_log_lvl+0x46/0x50 + [] show_stack_log_lvl+0x51/0xe0 + [] show_stack+0x27/0x50 + [] dump_stack+0x45/0x65 + [] warn_slowpath_common+0x84/0xa0 + [] warn_slowpath_fmt+0x33/0x40 + [] usb_submit_urb+0x5f/0x70 + [] snd_usbmidi_submit_urb+0x14/0x60 [snd_usbmidi_lib] + [] snd_usbmidi_error_timer+0x6a/0xa0 [snd_usbmidi_lib] + [] call_timer_fn+0x30/0x130 + [] run_timer_softirq+0x1c2/0x260 + [] __do_softirq+0xc3/0x270 + [] do_softirq_own_stack+0x22/0x30 + [] irq_exit+0x8d/0xa0 + [] smp_apic_timer_interrupt+0x38/0x50 + [] apic_timer_interrupt+0x34/0x3c + [] cpuidle_enter_state+0x3e/0xd0 + [] cpu_idle_loop+0x29d/0x3e0 + [] cpu_startup_entry+0x53/0x60 + [] start_kernel+0x415/0x41a + +For avoiding these errors, check the pending URBs and skip +resubmitting such ones. + +Reported-and-tested-by: Stefan Seyfried +Acked-by: Clemens Ladisch +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/usb/midi.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/sound/usb/midi.c ++++ b/sound/usb/midi.c +@@ -365,6 +365,8 @@ static void snd_usbmidi_error_timer(unsi + if (in && in->error_resubmit) { + in->error_resubmit = 0; + for (j = 0; j < INPUT_URBS; ++j) { ++ if (atomic_read(&in->urbs[j]->use_count)) ++ continue; + in->urbs[j]->dev = umidi->dev; + snd_usbmidi_submit_urb(in->urbs[j], GFP_ATOMIC); + } diff --git a/queue-3.18/series b/queue-3.18/series index 13862e4cf38..e963aaad181 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -14,3 +14,6 @@ rtlwifi-rtl8192ce-fix-kernel-crashes-due-to-missing-callback-entry.patch rtlwifi-rtl8192ce-fix-missing-interrupt-ready-flag.patch move-d_rcu-from-overlapping-d_child-to-overlapping-d_alias.patch deal-with-deadlock-in-d_walk.patch +alsa-hda-add-eapd-fixup-for-asus-z99he-laptop.patch +alsa-hda-fix-built-in-mic-at-resume-on-lenovo-ideapad-s210.patch +alsa-usb-audio-don-t-resubmit-pending-urbs-at-midi-error-recovery.patch -- 2.47.3