]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.11-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Sep 2013 16:31:44 +0000 (09:31 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Sep 2013 16:31:44 +0000 (09:31 -0700)
added patches:
acpi-ec-add-asustek-l4r-to-quirk-list-in-order-to-validate-ecdt.patch
drivers-hv-vmbus-fix-a-bug-in-the-handling-of-channel-offers.patch
drivers-misc-hpilo-correct-panic-when-an-aux-ilo-is-detected.patch
hwmon-k10temp-add-support-for-fam16h-kabini.patch
mei-me-fix-hardware-reset-flow.patch
usb-acm-gadget-null-termintate-strings-table.patch

queue-3.11/acpi-ec-add-asustek-l4r-to-quirk-list-in-order-to-validate-ecdt.patch [new file with mode: 0644]
queue-3.11/drivers-hv-vmbus-fix-a-bug-in-the-handling-of-channel-offers.patch [new file with mode: 0644]
queue-3.11/drivers-misc-hpilo-correct-panic-when-an-aux-ilo-is-detected.patch [new file with mode: 0644]
queue-3.11/hwmon-k10temp-add-support-for-fam16h-kabini.patch [new file with mode: 0644]
queue-3.11/mei-me-fix-hardware-reset-flow.patch [new file with mode: 0644]
queue-3.11/series
queue-3.11/usb-acm-gadget-null-termintate-strings-table.patch [new file with mode: 0644]

diff --git a/queue-3.11/acpi-ec-add-asustek-l4r-to-quirk-list-in-order-to-validate-ecdt.patch b/queue-3.11/acpi-ec-add-asustek-l4r-to-quirk-list-in-order-to-validate-ecdt.patch
new file mode 100644 (file)
index 0000000..a0f4ffb
--- /dev/null
@@ -0,0 +1,39 @@
+From 524f42fab787a9510be826ce3d736b56d454ac6d Mon Sep 17 00:00:00 2001
+From: Lan Tianyu <tianyu.lan@intel.com>
+Date: Mon, 26 Aug 2013 10:19:18 +0800
+Subject: ACPI / EC: Add ASUSTEK L4R to quirk list in order to validate ECDT
+
+From: Lan Tianyu <tianyu.lan@intel.com>
+
+commit 524f42fab787a9510be826ce3d736b56d454ac6d upstream.
+
+The ECDT of ASUSTEK L4R doesn't provide correct command and data
+I/O ports.  The DSDT provides the correct information instead.
+
+For this reason, add this machine to quirk list for ECDT validation
+and use the EC information from the DSDT.
+
+[rjw: Changelog]
+References: https://bugzilla.kernel.org/show_bug.cgi?id=60765
+Reported-and-tested-by: Daniele Esposti <expo@expobrain.net>
+Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/acpi/ec.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/acpi/ec.c
++++ b/drivers/acpi/ec.c
+@@ -987,6 +987,10 @@ static struct dmi_system_id __initdata e
+       ec_skip_dsdt_scan, "HP Folio 13", {
+       DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+       DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13"),}, NULL},
++      {
++      ec_validate_ecdt, "ASUS hardware", {
++      DMI_MATCH(DMI_SYS_VENDOR, "ASUSTek Computer Inc."),
++      DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),}, NULL},
+       {},
+ };
diff --git a/queue-3.11/drivers-hv-vmbus-fix-a-bug-in-the-handling-of-channel-offers.patch b/queue-3.11/drivers-hv-vmbus-fix-a-bug-in-the-handling-of-channel-offers.patch
new file mode 100644 (file)
index 0000000..9032646
--- /dev/null
@@ -0,0 +1,50 @@
+From 42dceebe34600b2d02a38baa3e869009ba3d14c7 Mon Sep 17 00:00:00 2001
+From: "K. Y. Srinivasan" <kys@microsoft.com>
+Date: Mon, 26 Aug 2013 14:08:58 -0700
+Subject: Drivers: hv: vmbus: Fix a bug in the handling of channel offers
+
+From: "K. Y. Srinivasan" <kys@microsoft.com>
+
+commit 42dceebe34600b2d02a38baa3e869009ba3d14c7 upstream.
+
+The channel state should be correctly set before registering the device. In the current
+code the driver probe would fail for channels that have been rescinded and subsequently
+re-offered. Fix the bug.
+
+Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hv/channel_mgmt.c |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- a/drivers/hv/channel_mgmt.c
++++ b/drivers/hv/channel_mgmt.c
+@@ -262,6 +262,13 @@ static void vmbus_process_offer(struct w
+       }
+       /*
++       * This state is used to indicate a successful open
++       * so that when we do close the channel normally, we
++       * can cleanup properly
++       */
++      newchannel->state = CHANNEL_OPEN_STATE;
++
++      /*
+        * Start the process of binding this offer to the driver
+        * We need to set the DeviceObject field before calling
+        * vmbus_child_dev_add()
+@@ -287,13 +294,6 @@ static void vmbus_process_offer(struct w
+               kfree(newchannel->device_obj);
+               free_channel(newchannel);
+-      } else {
+-              /*
+-               * This state is used to indicate a successful open
+-               * so that when we do close the channel normally, we
+-               * can cleanup properly
+-               */
+-              newchannel->state = CHANNEL_OPEN_STATE;
+       }
+ }
diff --git a/queue-3.11/drivers-misc-hpilo-correct-panic-when-an-aux-ilo-is-detected.patch b/queue-3.11/drivers-misc-hpilo-correct-panic-when-an-aux-ilo-is-detected.patch
new file mode 100644 (file)
index 0000000..912848b
--- /dev/null
@@ -0,0 +1,45 @@
+From eefbc594abbb1b7e6e7eeadb65ae7c7538474210 Mon Sep 17 00:00:00 2001
+From: Mark Rusk <Mark.Rusk@hp.com>
+Date: Wed, 14 Aug 2013 15:30:01 -0500
+Subject: drivers/misc/hpilo: Correct panic when an AUX iLO is detected
+
+From: Mark Rusk <Mark.Rusk@hp.com>
+
+commit eefbc594abbb1b7e6e7eeadb65ae7c7538474210 upstream.
+
+ Using an uninitialized variable 'devnum' after 'goto out;' was causing
+ panic.  Just go ahead and return, we need to ignore AUX iLO devs.
+
+ Oops: 0002 [#1] SMP
+   .
+   .
+   .
+ RIP  [<ffffffffa033e270>] ilo_probe+0xec/0xe7c [hpilo]
+
+Signed-off-by: Mark Rusk <mark.rusk@hp.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/hpilo.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/misc/hpilo.c
++++ b/drivers/misc/hpilo.c
+@@ -759,7 +759,7 @@ static int ilo_probe(struct pci_dev *pde
+       /* Ignore subsystem_device = 0x1979 (set by BIOS)  */
+       if (pdev->subsystem_device == 0x1979)
+-              goto out;
++              return 0;
+       if (max_ccb > MAX_CCB)
+               max_ccb = MAX_CCB;
+@@ -899,7 +899,7 @@ static void __exit ilo_exit(void)
+       class_destroy(ilo_class);
+ }
+-MODULE_VERSION("1.4");
++MODULE_VERSION("1.4.1");
+ MODULE_ALIAS(ILO_NAME);
+ MODULE_DESCRIPTION(ILO_NAME);
+ MODULE_AUTHOR("David Altobelli <david.altobelli@hp.com>");
diff --git a/queue-3.11/hwmon-k10temp-add-support-for-fam16h-kabini.patch b/queue-3.11/hwmon-k10temp-add-support-for-fam16h-kabini.patch
new file mode 100644 (file)
index 0000000..695928d
--- /dev/null
@@ -0,0 +1,65 @@
+From 30b146d1cb5e7560192057098eb705118bd5511f Mon Sep 17 00:00:00 2001
+From: Wei Hu <wei@aristanetworks.com>
+Date: Fri, 23 Aug 2013 13:14:03 -0700
+Subject: hwmon: (k10temp) Add support for Fam16h (Kabini)
+
+From: Wei Hu <wei@aristanetworks.com>
+
+commit 30b146d1cb5e7560192057098eb705118bd5511f upstream.
+
+The temperature reporting interface stays the same, so we just
+add the PCI-ID to the list.
+
+Verified on AMD Olive Hill.
+
+Signed-off-by: Wei Hu <wei@aristanetworks.com>
+Acked-by: Clemens Ladisch <clemens@ladisch.de>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Documentation/hwmon/k10temp |    1 +
+ drivers/hwmon/Kconfig       |    4 ++--
+ drivers/hwmon/k10temp.c     |    3 ++-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+--- a/Documentation/hwmon/k10temp
++++ b/Documentation/hwmon/k10temp
+@@ -12,6 +12,7 @@ Supported chips:
+ * AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
+ * AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
+ * AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
++* AMD Family 16h processors: "Kabini"
+   Prefix: 'k10temp'
+   Addresses scanned: PCI space
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -296,8 +296,8 @@ config SENSORS_K10TEMP
+         If you say yes here you get support for the temperature
+         sensor(s) inside your CPU. Supported are later revisions of
+         the AMD Family 10h and all revisions of the AMD Family 11h,
+-        12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)
+-        microarchitectures.
++        12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and
++        16h (Kabini) microarchitectures.
+         This driver can also be built as a module.  If so, the module
+         will be called k10temp.
+--- a/drivers/hwmon/k10temp.c
++++ b/drivers/hwmon/k10temp.c
+@@ -1,5 +1,5 @@
+ /*
+- * k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring
++ * k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring
+  *
+  * Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de>
+  *
+@@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_i
+       { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
+       { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
+       { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
++      { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
+       {}
+ };
+ MODULE_DEVICE_TABLE(pci, k10temp_id_table);
diff --git a/queue-3.11/mei-me-fix-hardware-reset-flow.patch b/queue-3.11/mei-me-fix-hardware-reset-flow.patch
new file mode 100644 (file)
index 0000000..5cbf500
--- /dev/null
@@ -0,0 +1,58 @@
+From ff96066e3171acdea356b331163495957cb833d0 Mon Sep 17 00:00:00 2001
+From: Tomas Winkler <tomas.winkler@intel.com>
+Date: Tue, 30 Jul 2013 14:11:51 +0300
+Subject: mei: me: fix hardware reset flow
+
+From: Tomas Winkler <tomas.winkler@intel.com>
+
+commit ff96066e3171acdea356b331163495957cb833d0 upstream.
+
+Both H_IS and H_IE needs to be set to receive H_RDY
+interrupt
+
+1. Assert H_IS to clear the interrupts during hw reset
+and use mei_me_reg_write instead of mei_hcsr_set as the later
+strips down the H_IS
+
+2. fix interrupt disablement embarrassing typo
+  hcsr |= ~H_IE -> hcsr &= ~H_IE;
+this will remove the unwanted interrupt on power down
+
+3. remove useless debug print outs
+
+Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
+Cc: Shuah Khan <shuah.kh@samsung.com>
+Cc: Konstantin Khlebnikov <khlebnikov@openvz.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/misc/mei/hw-me.c |    9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+--- a/drivers/misc/mei/hw-me.c
++++ b/drivers/misc/mei/hw-me.c
+@@ -176,21 +176,18 @@ static int mei_me_hw_reset(struct mei_de
+       struct mei_me_hw *hw = to_me_hw(dev);
+       u32 hcsr = mei_hcsr_read(hw);
+-      dev_dbg(&dev->pdev->dev, "before reset HCSR = 0x%08x.\n", hcsr);
+-
+-      hcsr |= (H_RST | H_IG);
++      hcsr |= H_RST | H_IG | H_IS;
+       if (intr_enable)
+               hcsr |= H_IE;
+       else
+-              hcsr |= ~H_IE;
++              hcsr &= ~H_IE;
+-      mei_hcsr_set(hw, hcsr);
++      mei_me_reg_write(hw, H_CSR, hcsr);
+       if (dev->dev_state == MEI_DEV_POWER_DOWN)
+               mei_me_hw_reset_release(dev);
+-      dev_dbg(&dev->pdev->dev, "current HCSR = 0x%08x.\n", mei_hcsr_read(hw));
+       return 0;
+ }
index a0d054625f2ef476d4bdf6e07cca4a8bb2d4d712..b02a73eae5ba0eac23ee93538b2294e008411825 100644 (file)
@@ -3,3 +3,9 @@ iscsi-target-fix-immediatedata-yes-failure-regression-in-v3.10.patch
 iscsi-target-fix-iscsit_transport-reference-leak-during-np-thread-reset.patch
 iscsi-target-fix-potential-null-pointer-in-solicited-nopout-reject.patch
 target-fix-se_cmd-state_list-leak-regression-during-write-failure.patch
+mei-me-fix-hardware-reset-flow.patch
+usb-acm-gadget-null-termintate-strings-table.patch
+hwmon-k10temp-add-support-for-fam16h-kabini.patch
+drivers-hv-vmbus-fix-a-bug-in-the-handling-of-channel-offers.patch
+acpi-ec-add-asustek-l4r-to-quirk-list-in-order-to-validate-ecdt.patch
+drivers-misc-hpilo-correct-panic-when-an-aux-ilo-is-detected.patch
diff --git a/queue-3.11/usb-acm-gadget-null-termintate-strings-table.patch b/queue-3.11/usb-acm-gadget-null-termintate-strings-table.patch
new file mode 100644 (file)
index 0000000..12695f2
--- /dev/null
@@ -0,0 +1,30 @@
+From d257221854f0b34cca3247e6c45344d0470f7398 Mon Sep 17 00:00:00 2001
+From: Graham Williams <gwilli@broadcom.com>
+Date: Wed, 28 Aug 2013 16:36:14 -0700
+Subject: usb: acm gadget: Null termintate strings table
+
+From: Graham Williams <gwilli@broadcom.com>
+
+commit d257221854f0b34cca3247e6c45344d0470f7398 upstream.
+
+The gadget strings table should be null terminated.
+usb_gadget_get_string() loops through the table
+expecting a null at the end of the list.
+
+Signed-off-by: Graham Williams <gwilli@broadcom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/usb/gadget/f_acm.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/gadget/f_acm.c
++++ b/drivers/usb/gadget/f_acm.c
+@@ -285,6 +285,7 @@ static struct usb_string acm_string_defs
+       [ACM_CTRL_IDX].s = "CDC Abstract Control Model (ACM)",
+       [ACM_DATA_IDX].s = "CDC ACM Data",
+       [ACM_IAD_IDX ].s = "CDC Serial",
++      {  } /* end of list */
+ };
+ static struct usb_gadget_strings acm_string_table = {