[kernel] Disable streams on via XHCI (rhbz 1132666)

[Josh Boyer]

commit ab9570130fa9a38515221b09961b436b21105430
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Wed Aug 27 08:15:27 2014 -0400

    Disable streams on via XHCI (rhbz 1132666)

 kernel.spec                                        |    7 +++
 ...e-streams-on-Via-XHCI-with-device-id-0x34.patch |   42 ++++++++++++++++++++
 2 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 94ab760..a327661 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -651,6 +651,9 @@ Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
 #rhbz 1132368
 Patch26015: nfs-fix-kernel-warning-when-removing-proc-entry.patch
 
+#rhbz 1132666
+Patch26016: xhci-Disable-streams-on-Via-XHCI-with-device-id-0x34.patch
+
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
@@ -1387,6 +1390,9 @@ ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch
 #rhbz 1132368
 ApplyPatch nfs-fix-kernel-warning-when-removing-proc-entry.patch
 
+#rhbz 1132666
+ApplyPatch xhci-Disable-streams-on-Via-XHCI-with-device-id-0x34.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2270,6 +2276,7 @@ fi
 #                                    ||     ||
 %changelog
 * Wed Aug 27 2014 Josh Boyer <jwboyer at fedoraproject.org> - 3.17.0-0.rc2.git1.1
+- Disable streams on via XHCI (rhbz 1132666)
 - Linux v3.17-rc2-9-g68e370289c29
 - Reenable debugging options.
 
diff --git a/xhci-Disable-streams-on-Via-XHCI-with-device-id-0x34.patch b/xhci-Disable-streams-on-Via-XHCI-with-device-id-0x34.patch
new file mode 100644
index 0000000..37543b9
--- /dev/null
+++ b/xhci-Disable-streams-on-Via-XHCI-with-device-id-0x34.patch
@@ -0,0 +1,42 @@
+From 160cf46209944d2fd7e20e39cf3fa77b961b5b20 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Mon, 25 Aug 2014 12:21:56 +0200
+Subject: [PATCH] xhci: Disable streams on Via XHCI with device-id 0x3432
+
+This is a bit bigger hammer then I would like to use for this, but for now
+it will have to make do. I'm working on getting my hands on one of these so
+that I can try to get streams to work (with a quirk flag if necessary) and
+then we can re-enable them.
+
+For now this at least makes uas capable disk enclosures work again by forcing
+fallback to the usb-storage driver.
+
+https://bugzilla.kernel.org/show_bug.cgi?id=79511
+Bugzilla: 1132666
+Upstream-status: Sent for 3.17 and Cc'd stable
+
+Cc: stable at vger.kernel.org # 3.15
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ drivers/usb/host/xhci-pci.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
+index 687d36608155..d973682f72ce 100644
+--- a/drivers/usb/host/xhci-pci.c
++++ b/drivers/usb/host/xhci-pci.c
+@@ -151,6 +151,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
+ 	if (pdev->vendor == PCI_VENDOR_ID_VIA)
+ 		xhci->quirks |= XHCI_RESET_ON_RESUME;
+ 
++	/* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */
++	if (pdev->vendor == PCI_VENDOR_ID_VIA &&
++			pdev->device == 0x3432)
++		xhci->quirks |= XHCI_BROKEN_STREAMS;
++
+ 	if (xhci->quirks & XHCI_RESET_ON_RESUME)
+ 		xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
+ 				"QUIRK: Resetting on resume");
+-- 
+1.9.3
+