]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 Jan 2016 22:23:34 +0000 (14:23 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 24 Jan 2016 22:23:34 +0000 (14:23 -0800)
added patches:
alsa-hda-add-intel-lewisburg-device-ids-audio.patch
alsa-hda-apply-pin-fixup-for-hp-probook-6550b.patch
ipmi-move-timer-init-to-before-irq-is-setup.patch

queue-3.14/alsa-hda-add-intel-lewisburg-device-ids-audio.patch [new file with mode: 0644]
queue-3.14/alsa-hda-apply-pin-fixup-for-hp-probook-6550b.patch [new file with mode: 0644]
queue-3.14/ipmi-move-timer-init-to-before-irq-is-setup.patch [new file with mode: 0644]
queue-3.14/series

diff --git a/queue-3.14/alsa-hda-add-intel-lewisburg-device-ids-audio.patch b/queue-3.14/alsa-hda-add-intel-lewisburg-device-ids-audio.patch
new file mode 100644 (file)
index 0000000..708d3a9
--- /dev/null
@@ -0,0 +1,35 @@
+From 5cf92c8b3dc5da59e05dc81bdc069cedf6f38313 Mon Sep 17 00:00:00 2001
+From: Alexandra Yates <alexandra.yates@linux.intel.com>
+Date: Wed, 4 Nov 2015 15:56:09 -0800
+Subject: ALSA: hda - Add Intel Lewisburg device IDs Audio
+
+From: Alexandra Yates <alexandra.yates@linux.intel.com>
+
+commit 5cf92c8b3dc5da59e05dc81bdc069cedf6f38313 upstream.
+
+Adding Intel codename Lewisburg platform device IDs for audio.
+
+[rearranged the position by tiwai]
+
+Signed-off-by: Alexandra Yates <alexandra.yates@linux.intel.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/hda_intel.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -3996,6 +3996,11 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids)
+         .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+       { PCI_DEVICE(0x8086, 0x8d21),
+         .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
++      /* Lewisburg */
++      { PCI_DEVICE(0x8086, 0xa1f0),
++        .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
++      { PCI_DEVICE(0x8086, 0xa270),
++        .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
+       /* Lynx Point-LP */
+       { PCI_DEVICE(0x8086, 0x9c20),
+         .driver_data = AZX_DRIVER_PCH | AZX_DCAPS_INTEL_PCH },
diff --git a/queue-3.14/alsa-hda-apply-pin-fixup-for-hp-probook-6550b.patch b/queue-3.14/alsa-hda-apply-pin-fixup-for-hp-probook-6550b.patch
new file mode 100644 (file)
index 0000000..53aa43c
--- /dev/null
@@ -0,0 +1,31 @@
+From c932b98c1e47312822d911c1bb76e81ef50e389c Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Wed, 4 Nov 2015 22:39:16 +0100
+Subject: ALSA: hda - Apply pin fixup for HP ProBook 6550b
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit c932b98c1e47312822d911c1bb76e81ef50e389c upstream.
+
+HP ProBook 6550b needs the same pin fixup applied to other HP B-series
+laptops with docks for making its headphone and dock headphone jacks
+working properly.  We just need to add the codec SSID to the list.
+
+Bugzilla: https://bugzilla.kernel.org/attachment.cgi?id=191971
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_sigmatel.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/pci/hda/patch_sigmatel.c
++++ b/sound/pci/hda/patch_sigmatel.c
+@@ -723,6 +723,7 @@ static bool hp_bnb2011_with_dock(struct
+ static bool hp_blike_system(u32 subsystem_id)
+ {
+       switch (subsystem_id) {
++      case 0x103c1473: /* HP ProBook 6550b */
+       case 0x103c1520:
+       case 0x103c1521:
+       case 0x103c1523:
diff --git a/queue-3.14/ipmi-move-timer-init-to-before-irq-is-setup.patch b/queue-3.14/ipmi-move-timer-init-to-before-irq-is-setup.patch
new file mode 100644 (file)
index 0000000..44bc80d
--- /dev/null
@@ -0,0 +1,75 @@
+From 27f972d3e00b50639deb4cc1392afaeb08d3cecc Mon Sep 17 00:00:00 2001
+From: Jan Stancek <jstancek@redhat.com>
+Date: Tue, 8 Dec 2015 13:57:51 -0500
+Subject: ipmi: move timer init to before irq is setup
+
+From: Jan Stancek <jstancek@redhat.com>
+
+commit 27f972d3e00b50639deb4cc1392afaeb08d3cecc upstream.
+
+We encountered a panic on boot in ipmi_si on a dell per320 due to an
+uninitialized timer as follows.
+
+static int smi_start_processing(void       *send_info,
+                                ipmi_smi_t intf)
+{
+        /* Try to claim any interrupts. */
+        if (new_smi->irq_setup)
+                new_smi->irq_setup(new_smi);
+
+ --> IRQ arrives here and irq handler tries to modify uninitialized timer
+
+    which triggers BUG_ON(!timer->function) in __mod_timer().
+
+ Call Trace:
+   <IRQ>
+   [<ffffffffa0532617>] start_new_msg+0x47/0x80 [ipmi_si]
+   [<ffffffffa053269e>] start_check_enables+0x4e/0x60 [ipmi_si]
+   [<ffffffffa0532bd8>] smi_event_handler+0x1e8/0x640 [ipmi_si]
+   [<ffffffff810f5584>] ? __rcu_process_callbacks+0x54/0x350
+   [<ffffffffa053327c>] si_irq_handler+0x3c/0x60 [ipmi_si]
+   [<ffffffff810efaf0>] handle_IRQ_event+0x60/0x170
+   [<ffffffff810f245e>] handle_edge_irq+0xde/0x180
+   [<ffffffff8100fc59>] handle_irq+0x49/0xa0
+   [<ffffffff8154643c>] do_IRQ+0x6c/0xf0
+   [<ffffffff8100ba53>] ret_from_intr+0x0/0x11
+
+        /* Set up the timer that drives the interface. */
+        setup_timer(&new_smi->si_timer, smi_timeout, (long)new_smi);
+
+The following patch fixes the problem.
+
+To: Openipmi-developer@lists.sourceforge.net
+To: Corey Minyard <minyard@acm.org>
+CC: linux-kernel@vger.kernel.org
+
+Signed-off-by: Jan Stancek <jstancek@redhat.com>
+Signed-off-by: Tony Camuso <tcamuso@redhat.com>
+Signed-off-by: Corey Minyard <cminyard@mvista.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/char/ipmi/ipmi_si_intf.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/char/ipmi/ipmi_si_intf.c
++++ b/drivers/char/ipmi/ipmi_si_intf.c
+@@ -1152,14 +1152,14 @@ static int smi_start_processing(void
+       new_smi->intf = intf;
+-      /* Try to claim any interrupts. */
+-      if (new_smi->irq_setup)
+-              new_smi->irq_setup(new_smi);
+-
+       /* Set up the timer that drives the interface. */
+       setup_timer(&new_smi->si_timer, smi_timeout, (long)new_smi);
+       smi_mod_timer(new_smi, jiffies + SI_TIMEOUT_JIFFIES);
++      /* Try to claim any interrupts. */
++      if (new_smi->irq_setup)
++              new_smi->irq_setup(new_smi);
++
+       /*
+        * Check if the user forcefully enabled the daemon.
+        */
index 4a5480949899b508c774363fed08f4fa5a5b096d..ff2709e6a0c81d5fc8263ef277aeb67f77157bab 100644 (file)
@@ -4,3 +4,6 @@ x86-xen-don-t-reset-vcpu_info-on-a-cancelled-suspend.patch
 kvm-ppc-book3s-hv-prohibit-setting-illegal-transaction-state-in-msr.patch
 x86-reboot-quirks-add-imac10-1-to-pci_reboot_dmi_table.patch
 x86-boot-double-boot_heap_size-to-64kb.patch
+ipmi-move-timer-init-to-before-irq-is-setup.patch
+alsa-hda-add-intel-lewisburg-device-ids-audio.patch
+alsa-hda-apply-pin-fixup-for-hp-probook-6550b.patch