[kernel/f17] Patch for disconnect issues with storage attached to a tegra-ehci controller

[Peter Robinson]

commit 76a51fad572e86b5a5a4ae194d27f70a7384fe5d
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Thu May 3 20:36:47 2012 +0100

    Patch for disconnect issues with storage attached to a tegra-ehci controller

 arm-tegra-usb-no-reset-linux33.patch |   16 ++++++++++++++++
 kernel.spec                          |   10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/arm-tegra-usb-no-reset-linux33.patch b/arm-tegra-usb-no-reset-linux33.patch
new file mode 100644
index 0000000..342e80f
--- /dev/null
+++ b/arm-tegra-usb-no-reset-linux33.patch
@@ -0,0 +1,16 @@
+--- linux-3.3.4-3.fc17.x86_64_orig/drivers/usb/core/hub.c	2012-05-02 20:08:18.421685932 -0400
++++ linux-3.3.4-3.fc17.x86_64/drivers/usb/core/hub.c	2012-05-02 20:30:36.565865425 -0400
+@@ -3484,6 +3484,13 @@ static void hub_events(void)
+ 				(u16) hub->change_bits[0],
+ 				(u16) hub->event_bits[0]);
+ 
++		/* Don't disconnect USB-SATA on TrimSlice */
++		if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
++			if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
++			    (hub->event_bits[0] == 0x2))
++				hub->event_bits[0] = 0;
++		}
++
+ 		/* Lock the device, then check to see if we were
+ 		 * disconnected while waiting for the lock to succeed. */
+ 		usb_lock_device(hdev);
diff --git a/kernel.spec b/kernel.spec
index 6b60133..9c6ac9d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -733,12 +733,16 @@ Patch19000: ips-noirq.patch
 
 Patch20000: utrace.patch
 
+# ARM
 # Flattened devicetree support
 Patch21000: arm-omap-dt-compat.patch
 Patch21001: arm-smsc-support-reading-mac-address-from-device-tree.patch
+
+# ARM tegra
 Patch21004: arm-tegra-nvec-kconfig.patch
+Patch21005: arm-tegra-usb-no-reset-linux33.patch
 
-# highbank patches
+# ARM highbank patches
 # Highbank clock functions need to be EXPORT for module builds
 Patch21010: highbank-export-clock-functions.patch
 
@@ -1361,6 +1365,7 @@ ApplyPatch nx-emu-remove-cpuinitdata-for-disable_nx-on-x86_32.patch
 #pplyPatch arm-omap-dt-compat.patch
 ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
 ApplyPatch arm-tegra-nvec-kconfig.patch
+ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 
 #
 # bugfixes to drivers and filesystems
@@ -2421,6 +2426,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Thu May  3 2012 Peter Robinson <pbrobinson at fedoraproject.org>
+- Patch for disconnect issues with storage attached to a tegra-ehci controller
+
 * Thu May 03 2012 Justin M. Forbes <jforbes at redhat.com>
 - Reenable slip and add to module-extras (rhbz 818308)