aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-11-24 20:35:28 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-11-24 20:35:28 -0800
commit68d6dd0daa5c61d1123a66f7ce1b8c3257ff1a5b (patch)
treeae49d0f6566d0f21994dbce274a6d9472312eacc /usb.current
parent7119b1310b8ee6de267f51d20e7727c812a83a49 (diff)
downloadpatches-68d6dd0daa5c61d1123a66f7ce1b8c3257ff1a5b.tar.gz
2.6.28-rc6
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-ace1001-patch-for-cp2101.c.patch30
-rw-r--r--usb.current/usb-fix-sb700-usb-subsystem-hang-bug.patch67
-rw-r--r--usb.current/usb-gadget-rndis-send-notifications.patch39
-rw-r--r--usb.current/usb-gadget-rndis-stop-windows-self-immolation.patch39
-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
-rw-r--r--usb.current/usb-usbmon-fix-read.patch41
8 files changed, 0 insertions, 331 deletions
diff --git a/usb.current/usb-ace1001-patch-for-cp2101.c.patch b/usb.current/usb-ace1001-patch-for-cp2101.c.patch
deleted file mode 100644
index 5f6eaea496eedb..00000000000000
--- a/usb.current/usb-ace1001-patch-for-cp2101.c.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From mkondrin@hppi.troitsk.ru Mon Nov 17 16:38:03 2008
-From: M Kondrin <mkondrin@hppi.troitsk.ru>
-Date: Fri, 14 Nov 2008 13:02:45 +0300
-Subject: USB: ACE1001 patch for cp2101.c
-To: greg@kroah.com
-Cc: linux-usb@vger.kernel.org
-Message-ID: <491D4CC5.6000905@hppi.troitsk.ru>
-
-From: M Kondrin <mkondrin@hppi.troitsk.ru>
-
-The patch which adds IDs for AKTAKOM USB->RS232 cable
-(http://www.aktakom.ru/product/kio/ace-1001.htm) is attached.
-
-From: M Kondrin <mkondrin@hppi.troitsk.ru>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/cp2101.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/usb/serial/cp2101.c
-+++ b/drivers/usb/serial/cp2101.c
-@@ -56,6 +56,7 @@ static void cp2101_shutdown(struct usb_s
- static int debug;
-
- static struct usb_device_id id_table [] = {
-+ { USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */
- { USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */
- { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */
- { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */
diff --git a/usb.current/usb-fix-sb700-usb-subsystem-hang-bug.patch b/usb.current/usb-fix-sb700-usb-subsystem-hang-bug.patch
deleted file mode 100644
index 6fa670aa7ac424..00000000000000
--- a/usb.current/usb-fix-sb700-usb-subsystem-hang-bug.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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-gadget-rndis-send-notifications.patch b/usb.current/usb-gadget-rndis-send-notifications.patch
deleted file mode 100644
index 358ac47efc9f35..00000000000000
--- a/usb.current/usb-gadget-rndis-send-notifications.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From david-b@pacbell.net Mon Nov 17 16:34:04 2008
-From: Richard R�jfors <richard.rojfors@endian.se>
-Date: Sat, 15 Nov 2008 19:53:24 -0800
-Subject: USB: gadget rndis: send notifications
-To: Greg KH <greg@kroah.com>
-Cc: Richard R�jfors <richard.rojfors@endian.se>
-Message-ID: <200811151953.24854.david-b@pacbell.net>
-
-
-From: Richard R�jfors <richard.rojfors@endian.se>
-
-It turns out that atomic_inc_return() returns the *new* value
-not the original one, so the logic in rndis_response_available()
-kept the first RNDIS response notification from getting out.
-This prevented interoperation with MS-Windows (but not Linux).
-
-Fix this to make RNDIS behave again.
-
-Signed-off-by: Richard R�jfors <richard.rojfors@endian.se>
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- drivers/usb/gadget/f_rndis.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/usb/gadget/f_rndis.c
-+++ b/drivers/usb/gadget/f_rndis.c
-@@ -302,7 +302,7 @@ static void rndis_response_available(voi
- __le32 *data = req->buf;
- int status;
-
-- if (atomic_inc_return(&rndis->notify_count))
-+ if (atomic_inc_return(&rndis->notify_count) != 1)
- return;
-
- /* Send RNDIS RESPONSE_AVAILABLE notification; a
diff --git a/usb.current/usb-gadget-rndis-stop-windows-self-immolation.patch b/usb.current/usb-gadget-rndis-stop-windows-self-immolation.patch
deleted file mode 100644
index d017d85e3db3c2..00000000000000
--- a/usb.current/usb-gadget-rndis-stop-windows-self-immolation.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From david-b@pacbell.net Mon Nov 17 16:33:25 2008
-From: David Brownell <david-b@pacbell.net>
-Date: Sat, 15 Nov 2008 19:53:21 -0800
-Subject: USB: gadget rndis: stop windows self-immolation
-To: Greg KH <greg@kroah.com>
-Cc: Richard R�jfors <richard.rojfors@endian.se>
-Message-ID: <200811151953.22200.david-b@pacbell.net>
-
-
-From: David Brownell <dbrownell@users.sourceforge.net>
-
-Somewhere in the conversion of the RNDIS gadget code to the new
-framework, the descriptor of its data interface seems to have
-been copied from the CDC Ethernet driver. Unfortunately that
-means it got a nonzero altsetting ... which is incorrect. Issue
-uncovered by Richard R�jfors <richard.rojfors@endian.se>.
-
-This patch fixes that problem, and resolves at least some cases
-of Windows XP bluescreening itself.
-
-Tested-by: Richard R�jfors <richard.rojfors@endian.se>.
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/f_rndis.c | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/usb/gadget/f_rndis.c
-+++ b/drivers/usb/gadget/f_rndis.c
-@@ -172,7 +172,6 @@ static struct usb_interface_descriptor r
- .bDescriptorType = USB_DT_INTERFACE,
-
- /* .bInterfaceNumber = DYNAMIC */
-- .bAlternateSetting = 1,
- .bNumEndpoints = 2,
- .bInterfaceClass = USB_CLASS_CDC_DATA,
- .bInterfaceSubClass = 0,
diff --git a/usb.current/usb-musb-fix-bug-in-musb_schedule.patch b/usb.current/usb-musb-fix-bug-in-musb_schedule.patch
deleted file mode 100644
index f7560b3e333942..00000000000000
--- a/usb.current/usb-musb-fix-bug-in-musb_schedule.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 5b47904a87334c..00000000000000
--- a/usb.current/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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
deleted file mode 100644
index f0d9a9d10133b3..00000000000000
--- a/usb.current/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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,
diff --git a/usb.current/usb-usbmon-fix-read.patch b/usb.current/usb-usbmon-fix-read.patch
deleted file mode 100644
index 446075eee22934..00000000000000
--- a/usb.current/usb-usbmon-fix-read.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From zaitcev@redhat.com Mon Nov 17 16:34:39 2008
-From: Pete Zaitcev <zaitcev@redhat.com>
-Date: Fri, 14 Nov 2008 09:47:41 -0700
-Subject: USB: usbmon: fix read(2)
-To: greg@kroah.com
-Cc: zaitcev@redhat.com, linux-usb@vger.kernel.org, Ingo van Lil <inguin@gmx.de>
-Message-ID: <20081114094741.ca107ed2.zaitcev@redhat.com>
-
-
-There's a bug in the usbmon binary reader: When using read() to fetch
-the packets and a packet's data is partially read, the next read call
-will once again return up to len_cap bytes of data. The b_read counter
-is not regarded when determining the remaining chunk size.
-
-So, when dumping USB data with "cat /dev/usbmon0 > usbmon.trace" while
-reading from a USB storage device and analyzing the dump file
-afterwards it will get out of sync after a couple of packets.
-
-Signed-off-by: Ingo van Lil <inguin@gmx.de>
-Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/mon/mon_bin.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/mon/mon_bin.c
-+++ b/drivers/usb/mon/mon_bin.c
-@@ -687,7 +687,10 @@ static ssize_t mon_bin_read(struct file
- }
-
- if (rp->b_read >= sizeof(struct mon_bin_hdr)) {
-- step_len = min(nbytes, (size_t)ep->len_cap);
-+ step_len = ep->len_cap;
-+ step_len -= rp->b_read - sizeof(struct mon_bin_hdr);
-+ if (step_len > nbytes)
-+ step_len = nbytes;
- offset = rp->b_out + PKT_SIZE;
- offset += rp->b_read - sizeof(struct mon_bin_hdr);
- if (offset >= rp->b_size)
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:22:23 +0000