aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-11-17 15:39:58 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-11-17 15:39:58 -0800
commit02b86392946ae6414d1efe5a862419f6d3aba3b3 (patch)
tree54f094fe001da1763da94e0bfa6c4ffbaf0fee63 /usb.current
parentbabc5e2cb03ba5842af22ccb5bba2c64d32ecb29 (diff)
downloadpatches-02b86392946ae6414d1efe5a862419f6d3aba3b3.tar.gz
Kay's big update of bus_id patches.
And other usb patches as well.
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-fix-sb700-usb-subsystem-hang-bug.patch67
-rw-r--r--usb.current/usb-musb-fix-bug-in-musb_schedule.patch33
-rw-r--r--usb.current/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch49
-rw-r--r--usb.current/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch33
4 files changed, 182 insertions, 0 deletions
diff --git a/usb.current/usb-fix-sb700-usb-subsystem-hang-bug.patch b/usb.current/usb-fix-sb700-usb-subsystem-hang-bug.patch
new file mode 100644
index 00000000000000..6fa670aa7ac424
--- /dev/null
+++ b/usb.current/usb-fix-sb700-usb-subsystem-hang-bug.patch
@@ -0,0 +1,67 @@
+From andiry.xu@amd.com Mon Nov 17 14:54:32 2008
+From: Andiry Xu <andiry.xu@amd.com>
+Date: Fri, 14 Nov 2008 11:42:29 +0800
+Subject: USB: fix SB700 usb subsystem hang bug
+Cc: greg@kroah.com, volker.armin.hemmann@tu-clausthal.de, shane.huang@amd.com, libin.yang@amd.com, "Xu, Andiry" <Andiry.Xu@amd.com>
+Message-ID: <1226634149.5734.1.camel@crane-desktop>
+
+From: Andiry Xu <andiry.xu@amd.com>
+
+This patch is required for AMD SB700 south bridge revision A12 and A13 to avoid
+USB subsystem hang symptom. The USB subsystem hang symptom is observed when the
+system has multiple USB devices connected to it. In some cases a USB hub may be
+required to observe this symptom.
+
+This patch works around the problem by correcting the internal register setting
+that will help by changing the behavior of the internal logic to avoid the
+USB subsystem hang issue. The change in the behavior of the logic does not
+impact the normal operation of the USB subsystem.
+
+Reported-by: Volker Armin Hemmann <volker.armin.hemmann@tu-clausthal.de>
+Tested-by: Volker Armin Hemmann <volker.armin.hemmann@tu-clausthal.de>
+Signed-off-by: Andiry Xu <andiry.xu@amd.com>
+Signed-off-by: Libin Yang <libin.yang@amd.com>
+Cc: stable <stable@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/host/ehci-pci.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+--- a/drivers/usb/host/ehci-pci.c
++++ b/drivers/usb/host/ehci-pci.c
+@@ -66,6 +66,8 @@ static int ehci_pci_setup(struct usb_hcd
+ {
+ struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+ struct pci_dev *pdev = to_pci_dev(hcd->self.controller);
++ struct pci_dev *p_smbus;
++ u8 rev;
+ u32 temp;
+ int retval;
+
+@@ -166,6 +168,25 @@ static int ehci_pci_setup(struct usb_hcd
+ pci_write_config_byte(pdev, 0x4b, tmp | 0x20);
+ }
+ break;
++ case PCI_VENDOR_ID_ATI:
++ /* SB700 old version has a bug in EHCI controller,
++ * which causes usb devices lose response in some cases.
++ */
++ if (pdev->device == 0x4396) {
++ p_smbus = pci_get_device(PCI_VENDOR_ID_ATI,
++ PCI_DEVICE_ID_ATI_SBX00_SMBUS,
++ NULL);
++ if (!p_smbus)
++ break;
++ rev = p_smbus->revision;
++ if ((rev == 0x3a) || (rev == 0x3b)) {
++ u8 tmp;
++ pci_read_config_byte(pdev, 0x53, &tmp);
++ pci_write_config_byte(pdev, 0x53, tmp | (1<<3));
++ }
++ pci_dev_put(p_smbus);
++ }
++ break;
+ }
+
+ ehci_reset(ehci);
diff --git a/usb.current/usb-musb-fix-bug-in-musb_schedule.patch b/usb.current/usb-musb-fix-bug-in-musb_schedule.patch
new file mode 100644
index 00000000000000..f7560b3e333942
--- /dev/null
+++ b/usb.current/usb-musb-fix-bug-in-musb_schedule.patch
@@ -0,0 +1,33 @@
+From felipe.balbi@nokia.com Mon Nov 17 15:03:13 2008
+From: Felipe Balbi <felipe.balbi@nokia.com>
+Date: Mon, 17 Nov 2008 09:08:16 +0200
+Subject: usb: musb: fix bug in musb_schedule
+To: Sergei Shtylyov <sshtylyov@ru.mvista.com>
+Cc: Greg Kroah-Hartman <gregkh@suse.de>, linux-usb@vger.kernel.org, Ajay Kumar Gupta <ajay.gupta@ti.com>, Felipe Balbi <felipe.balbi@nokia.com>
+Message-ID: <20081117070816.GC6994@gandalf.research.nokia.com>
+Content-Disposition: inline
+
+From: Felipe Balbi <felipe.balbi@nokia.com>
+
+This bug was introduced recently. Fix it before bigger
+problems appear.
+
+Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
+Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/musb/musb_host.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/musb/musb_host.c
++++ b/drivers/usb/musb/musb_host.c
+@@ -1757,7 +1757,7 @@ static int musb_schedule(
+ }
+ }
+ /* use bulk reserved ep1 if no other ep is free */
+- if (best_end > 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
++ if (best_end < 0 && qh->type == USB_ENDPOINT_XFER_BULK) {
+ hw_ep = musb->bulk_ep;
+ if (is_in)
+ head = &musb->in_bulk;
diff --git a/usb.current/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch b/usb.current/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch
new file mode 100644
index 00000000000000..5b47904a87334c
--- /dev/null
+++ b/usb.current/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch
@@ -0,0 +1,49 @@
+From stern@rowland.harvard.edu Mon Nov 17 15:23:18 2008
+From: Alan Stern <stern@rowland.harvard.edu>
+Date: Mon, 17 Nov 2008 14:32:16 -0500 (EST)
+Subject: USB: storage: update unusual_devs entries for Nokia 5300 and 5310
+To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com>
+Cc: Jorge Luc�ngeli Obes <t4m5yn@gmail.com>, USB Storage list <usb-storage@lists.one-eyed-alien.net>
+Message-ID: <Pine.LNX.4.44L0.0811171429510.5170-100000@iolanthe.rowland.org>
+
+
+This patch (as1168) updates the unusual_devs entry for the Nokia 5300.
+According to Jorge Lucangeli Obes <t4m5yn@gmail.com>, some existing
+models have a revision number lower than the lower limit of the
+current entry.
+
+The patch also moves the entry for the Nokia 5310 to its correct place
+in the file.
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -167,6 +167,13 @@ UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
++/* Patch for Nokia 5310 capacity */
++UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591,
++ "Nokia",
++ "5310",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_FIX_CAPACITY ),
++
+ /* Reported by Mario Rettig <mariorettig@web.de> */
+ UNUSUAL_DEV( 0x0421, 0x042e, 0x0100, 0x0100,
+ "Nokia",
+@@ -233,7 +240,7 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x
+ US_FL_MAX_SECTORS_64 ),
+
+ /* Reported by Cedric Godin <cedric@belbone.be> */
+-UNUSUAL_DEV( 0x0421, 0x04b9, 0x0551, 0x0551,
++UNUSUAL_DEV( 0x0421, 0x04b9, 0x0500, 0x0551,
+ "Nokia",
+ "5300",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
diff --git a/usb.current/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch b/usb.current/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch
new file mode 100644
index 00000000000000..f0d9a9d10133b3
--- /dev/null
+++ b/usb.current/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch
@@ -0,0 +1,33 @@
+From stern@rowland.harvard.edu Mon Nov 17 15:24:00 2008
+From: Alan Stern <stern@rowland.harvard.edu>
+Date: Mon, 17 Nov 2008 16:12:32 -0500 (EST)
+Subject: USB: storage: updates unusual_devs entry for the Nokia 6300
+To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com>
+Cc: Maciej Gierok <mgierok@gmail.com>, David McBride <dwm@doc.ic.ac.uk>, USB Storage list <usb-storage@lists.one-eyed-alien.net>
+Message-ID: <Pine.LNX.4.44L0.0811171610380.18528-100000@iolanthe.rowland.org>
+
+
+This patch (as1169) modifies the unusual_devs entry for the Nokia
+6300. According to Maciej Gierok <mgierok@gmail.com> and David
+McBride <dwm@doc.ic.ac.uk>, the revision limits need to be wider.
+
+This fixes Bugzilla #11768.
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -240,7 +240,7 @@ UNUSUAL_DEV( 0x0421, 0x04b9, 0x0551, 0x
+ US_FL_FIX_CAPACITY ),
+
+ /* Reported by Richard Nauber <RichardNauber@web.de> */
+-UNUSUAL_DEV( 0x0421, 0x04fa, 0x0601, 0x0601,
++UNUSUAL_DEV( 0x0421, 0x04fa, 0x0550, 0x0660,
+ "Nokia",
+ "6300",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:21:03 +0000