diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-18 16:28:05 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-18 16:28:05 -0800 |
| commit | 534f63c002f7990a5219d01263a378260229fec7 (patch) | |
| tree | 75ed0e7e342643b717c855460a77d4a2bfc96284 /usb.current | |
| parent | 71d27ed2619689ffa6c0c2f1f107f1cda44ec842 (diff) | |
| download | patches-534f63c002f7990a5219d01263a378260229fec7.tar.gz | |
more patches...
Diffstat (limited to 'usb.current')
5 files changed, 443 insertions, 0 deletions
diff --git a/usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch b/usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch new file mode 100644 index 00000000000000..1f84a89657bf6a --- /dev/null +++ b/usb.current/usb-another-unusual_devs-entry-for-another-bad-argosy-storage-device.patch @@ -0,0 +1,151 @@ +From akpm@linux-foundation.org Thu Dec 18 15:33:30 2008 +From: "Nguyen Anh Quynh" <aquynh@gmail.com> +Date: Thu, 11 Dec 2008 15:04:11 -0800 +Subject: USB: another unusual_devs entry for another bad Argosy storage device +To: mm-commits@vger.kernel.org +Cc: aquynh@gmail.com, greg@kroah.com, k.suzaki@aist.go.jp +Message-ID: <200812112304.mBBN4CUX029849@imap1.linux-foundation.org> + +From: "Nguyen Anh Quynh" <aquynh@gmail.com> + +I have another Argosy USB storage device, which has the same problem +with the Argosy USB storage device already fixed in 2.6.27.7. But this +device has another product ID (840:84), so this patch adds a new entry +into unusual_devs to fix the mount problem. + +I enclose here two patches: one against 2.6.27.8, and another against +the latest linus-git tree. + + +The information about the Argosy device is like below: + +#lsusb -v -d 840:84 +Bus 005 Device 005: ID 0840:0084 Argosy Research, Inc. +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 0 (Defined at Interface level) + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 64 + idVendor 0x0840 Argosy Research, Inc. + idProduct 0x0084 + bcdDevice 0.01 + iManufacturer 1 Generic + iProduct 2 USB 2.0 Storage Device + iSerial 3 8400000000002549 + bNumConfigurations 1 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 32 + bNumInterfaces 1 + bConfigurationValue 1 + iConfiguration 0 + bmAttributes 0xc0 + Self Powered + MaxPower 2mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 2 + bInterfaceClass 8 Mass Storage + bInterfaceSubClass 6 SCSI + bInterfaceProtocol 80 Bulk (Zip) + iInterface 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x01 EP 1 OUT + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0200 1x 512 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x82 EP 2 IN + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0200 1x 512 bytes + bInterval 0 +Device Qualifier (for other device speed): + bLength 10 + bDescriptorType 6 + bcdUSB 2.00 + bDeviceClass 0 (Defined at Interface level) + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 64 + bNumConfigurations 1 +Device Status: 0x0000 + (Bus Powered) + +Before the patch, dmesg returns a lot of information like below (my +dmesg is overflown): +.... +[ 138.833390] sd 7:0:0:0: [sdb] Add. Sense: No additional sense information +[ 138.877631] sd 7:0:0:0: [sdb] Sense Key : No Sense [current] +[ 138.877643] sd 7:0:0:0: [sdb] Add. Sense: No additional sense information +[ 138.921906] sd 7:0:0:0: [sdb] Sense Key : No Sense [current] +[ 138.921923] sd 7:0:0:0: [sdb] Add. Sense: No additional sense information +.... + +After the fix, dmesg returns below information: +.... +usb 5-1: new high speed USB device using ehci_hcd and address 5 +usb 5-1: configuration #1 chosen from 1 choice +scsi7 : SCSI emulation for USB Mass Storage devices +usb-storage: device found at 5 +usb-storage: waiting for device to settle before scanning +usb-storage: device scan complete +scsi 7:0:0:0: Direct-Access HTS54808 0M9AT00 MG4O PQ: 0 ANSI: 0 +sd 7:0:0:0: [sdb] 156301488 512-byte hardware sectors (80026 MB) +sd 7:0:0:0: [sdb] Write Protect is off +sd 7:0:0:0: [sdb] Mode Sense: 03 00 00 00 +sd 7:0:0:0: [sdb] Assuming drive cache: write through +sd 7:0:0:0: [sdb] 156301488 512-byte hardware sectors (80026 MB) +sd 7:0:0:0: [sdb] Write Protect is off +sd 7:0:0:0: [sdb] Mode Sense: 03 00 00 00 +sd 7:0:0:0: [sdb] Assuming drive cache: write through + sdb: sdb1 +sd 7:0:0:0: [sdb] Attached SCSI disk +sd 7:0:0:0: Attached scsi generic sg1 type 0 +kjournald starting. Commit interval 5 seconds +EXT3 FS on sdb1, internal journal +EXT3-fs: recovery complete. +EXT3-fs: mounted filesystem with ordered data mode. + +Cc: Kuniyasu Suzaki <k.suzaki@aist.go.jp> +Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1320,6 +1320,13 @@ UNUSUAL_DEV( 0x0840, 0x0082, 0x0001, 0x0 + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY), + ++/* Reported and patched by Nguyen Anh Quynh <aquynh@gmail.com> */ ++UNUSUAL_DEV( 0x0840, 0x0084, 0x0001, 0x0001, ++ "Argosy", ++ "Storage", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY), ++ + /* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>. + * Flag will support Bulk devices which use a standards-violating 32-byte + * Command Block Wrapper. Here, the "DC2MEGA" cameras (several brands) with diff --git a/usb.current/usb-storage-extend-unusual-range-for-067b-3507.patch b/usb.current/usb-storage-extend-unusual-range-for-067b-3507.patch new file mode 100644 index 00000000000000..287991273177ef --- /dev/null +++ b/usb.current/usb-storage-extend-unusual-range-for-067b-3507.patch @@ -0,0 +1,32 @@ +From phil@ipom.com Thu Dec 18 15:34:39 2008 +From: Oliver Neukum <oliver@neukum.org> +Date: Fri, 12 Dec 2008 11:01:45 +0100 +Subject: USB: storage: extend unusual range for 067b:3507 +To: Greg Kroah-Hartman <gregkh@suse.de>, usb-storage@lists.one-eyed-alien.net, linux-usb@vger.kernel.org +Message-ID: <20081212100145.GN20335@ipom.com> +Content-Disposition: inline + +From: Oliver Neukum <oliver@neukum.org> + +This device has been released in a new revision which is still buggy. + +Signed-off-by: Oliver Neukum <oneukum@suse.de> +Signed-off-by: Phil Dibowitz <phil@ipom.com> +Cc: stable <stable@kernel.org> +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 +@@ -1040,7 +1040,7 @@ UNUSUAL_DEV( 0x067b, 0x2507, 0x0100, 0x0 + US_FL_FIX_CAPACITY | US_FL_GO_SLOW ), + + /* Reported by Alex Butcher <alex.butcher@assursys.co.uk> */ +-UNUSUAL_DEV( 0x067b, 0x3507, 0x0001, 0x0001, ++UNUSUAL_DEV( 0x067b, 0x3507, 0x0001, 0x0101, + "Prolific Technology Inc.", + "ATAPI-6 Bridge Controller", + US_SC_DEVICE, US_PR_DEVICE, NULL, diff --git a/usb.current/usb-storage-recognizing-and-enabling-nokia-5200-cell-phoes.patch b/usb.current/usb-storage-recognizing-and-enabling-nokia-5200-cell-phoes.patch new file mode 100644 index 00000000000000..d08a1d94fffe51 --- /dev/null +++ b/usb.current/usb-storage-recognizing-and-enabling-nokia-5200-cell-phoes.patch @@ -0,0 +1,159 @@ +From phil@ipom.com Thu Dec 18 15:35:15 2008 +From: Paulo Afonso Graner Fessel <pfessel@gmail.com> +Date: Fri, 12 Dec 2008 12:05:18 +0100 +Subject: USB: storage: recognizing and enabling Nokia 5200 cell phoes +To: Greg Kroah-Hartman <gregkh@suse.de> +Cc: usb-storage@lists.one-eyed-alien.net, linux-usb@vger.kernel.org, Paulo Fessel <pfessel@gmail.com> +Message-ID: <20081212110518.GR20335@ipom.com> +Content-Disposition: inline + +From: Paulo Afonso Graner Fessel <pfessel@gmail.com> + +This patch corrects the issue when one connects a Nokia 5200 cell +phone in data storage mode. If one uses an unpatched unusual_devs.h, +the following messages appear on /var/log/messages: + +Dec 12 01:03:24 alberich kernel: usb 4-2: new full speed USB device +using uhci_hcd and address 3 +Dec 12 01:03:25 alberich kernel: usb 4-2: configuration #1 chosen from 1 choice +Dec 12 01:03:25 alberich kernel: scsi10 : SCSI emulation for USB Mass +Storage devices +Dec 12 01:03:25 alberich kernel: usb 4-2: New USB device found, +idVendor=0421, idProduct=04bd +Dec 12 01:03:25 alberich kernel: usb 4-2: New USB device strings: +Mfr=1, Product=2, SerialNumber=3 +Dec 12 01:03:25 alberich kernel: usb 4-2: Product: Nokia 5200 +Dec 12 01:03:25 alberich kernel: usb 4-2: Manufacturer: Nokia +Dec 12 01:03:25 alberich kernel: usb 4-2: SerialNumber: 353930018354523 +Dec 12 01:03:25 alberich kernel: usbcore: registered new interface driver ub +Dec 12 01:03:30 alberich kernel: scsi 10:0:0:0: Direct-Access +Nokia Nokia 5200 0000 PQ: 0 AN +SI: 4 +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] 3985409 512-byte +hardware sectors (2041 MB) +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Write Protect is off +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Assuming drive +cache: write through +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] 3985409 512-byte +hardware sectors (2041 MB) +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Write Protect is off +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Assuming drive +cache: write through +Dec 12 01:03:30 alberich kernel: sdg: sdg1 +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Attached SCSI removable disk +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: Attached scsi generic sg9 type 0 +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Sense Key : No +Sense [current] +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Add. Sense: No +additional sense information +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Sense Key : No +Sense [current] +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Add. Sense: No +additional sense information +Dec 12 01:03:30 alberich kernel: sd 10:0:0:0: [sdg] Sense Key : No +Sense [current] + +(...) + +The MicroSD card in the phone remains inaccessible and finally the +cell phone turns itself off. The patch solves this problem and makes +the cell phone fully accessible: + +[root@alberich kernel-linus-2.6.27.5-1mdv]# df -h +Sist. Arq. Tam Usad Disp Uso% Montado em +/dev/sda6 31G 5,2G 26G 17% / +/dev/sda1 92M 27M 61M 31% /boot +/dev/mapper/homevg-homelv 240G 237G 3,5G 99% /home +/dev/sda3 21G 7,9G 13G 40% /mnt/windows +/dev/sdg1 2,0G 287M 1,7G 15% /media/disk <-------- + +I've found necessary to use the FL_US_CAPACITY_FIX switch, as without +it the cell phone is recognized but it went berserk when performing +low-level functions on it (a fdisk -l /dev/uba for example). + +lsusb -v output follows: + +Bus 004 Device 004: ID 0421:04bd Nokia Mobile Phones +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 0 (Defined at Interface level) + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 64 + idVendor 0x0421 Nokia Mobile Phones + idProduct 0x04bd + bcdDevice 6.03 + iManufacturer 1 Nokia + iProduct 2 Nokia 5200 + iSerial 3 353930018354523 + bNumConfigurations 1 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 32 + bNumInterfaces 1 + bConfigurationValue 1 + iConfiguration 0 + bmAttributes 0xc0 + Self Powered + MaxPower 100mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 2 + bInterfaceClass 8 Mass Storage + bInterfaceSubClass 6 SCSI + bInterfaceProtocol 80 Bulk (Zip) + iInterface 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x81 EP 1 IN + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x01 EP 1 OUT + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 +Device Status: 0x0001 + Self Powered + +Signed-off-by: Paulo Afonso Graner Fessel <pfessel@gmail.com> +Signed-off-by: Phil Dibowitz <phil@ipom.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -260,6 +260,13 @@ UNUSUAL_DEV( 0x0421, 0x04b9, 0x0500, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY ), + ++/* Reported by Paulo Fessel <pfessel@gmail.com> */ ++UNUSUAL_DEV( 0x0421, 0x04bd, 0x0000, 0x9999, ++ "Nokia", ++ "5200", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY ), ++ + /* Reported by Richard Nauber <RichardNauber@web.de> */ + UNUSUAL_DEV( 0x0421, 0x04fa, 0x0550, 0x0660, + "Nokia", diff --git a/usb.current/usb-storage-unusual_devs.h-additions-for-macpower-masterbox.patch b/usb.current/usb-storage-unusual_devs.h-additions-for-macpower-masterbox.patch new file mode 100644 index 00000000000000..f7458556bf46b5 --- /dev/null +++ b/usb.current/usb-storage-unusual_devs.h-additions-for-macpower-masterbox.patch @@ -0,0 +1,49 @@ +From velegrin@mail.mipt.ru Thu Dec 18 15:56:56 2008 +From: Sergey Ovcharenko <velegrin@mail.mipt.ru> +Date: Wed, 17 Dec 2008 19:28:06 +0300 +Subject: USB: storage: unusual_devs.h additions for Macpower MasterBox +To: stern@rowland.harvard.edu, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net +Message-ID: <49492896.70804@mail.mipt.ru> + + +Jason Johnston reported these problems with his external USB hard drive: +http://bugs.gentoo.org/show_bug.cgi?id=250789 + +The number of reported sectors is off-by-one. + +/proc/bus/usb/devices: +T: Bus=01 Lev=02 Prnt=08 Port=00 Cnt=01 Dev#= 9 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=0dc4 ProdID=0073 Rev= 0.00 +S: Manufacturer=Macpower Technology Co.LTD. +S: Product=USB 2.0 3.5" DEVICE +S: SerialNumber=03006C +C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=100mA +I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage +E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Signed-off-by: Sergey Ovcharenko <velegrin@mail.mipt.ru> +Signed-off-by: Phil Dibowitz <phil@ipom.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1537,6 +1537,13 @@ UNUSUAL_DEV( 0x0d96, 0x5200, 0x0001, 0x + "JD 5200 z3", + US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), + ++/* Reported by Jason Johnston <killean@shaw.ca> */ ++UNUSUAL_DEV( 0x0dc4, 0x0073, 0x0000, 0x0000, ++ "Macpower Technology Co.LTD.", ++ "USB 2.0 3.5\" DEVICE", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY), ++ + /* Reported by Lubomir Blaha <tritol@trilogic.cz> + * I _REALLY_ don't know what 3rd, 4th number and all defines mean, but this + * works for me. Can anybody correct these values? (I able to test corrected diff --git a/usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch b/usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch new file mode 100644 index 00000000000000..700d0f483d418e --- /dev/null +++ b/usb.current/usb-unusual_devs.h-additions-for-pentax-k10d.patch @@ -0,0 +1,52 @@ +From desnacked@gmail.com Thu Dec 18 15:32:26 2008 +From: Kadianakis George <desnacked@gmail.com> +Date: Wed, 10 Dec 2008 23:28:25 +0200 +Subject: USB: unusual_devs.h additions for Pentax K10D +To: phil@ipom.com +Cc: linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net +Message-ID: <20081210212824.GA6825@kymvalo.cslabs.unipi.gr> +Content-Disposition: inline + +From: Daniel Drake <dsd@gentoo.org> + +Jaak Ristioja reported problems with his Pentax K10D camera: +https://bugs.gentoo.org/show_bug.cgi?id=250406 + +/proc/bus/usb/devices: +T: Bus=02 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=0a17 ProdID=006e Rev= 1.00 +S: Manufacturer=PENTAX Corporation +S: Product=K10D +C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr= 2mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage +E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=83(I) Atr=03(Int.) MxPS= 64 Ivl=100ms +The number of reported sectors is off-by-one. + +Signed-off-by: Daniel Drake <dsd@gentoo.org> +Cc: Kadianakis George <desnacked@gmail.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Phil Dibowitz <phil@ipom.com> + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1425,6 +1425,13 @@ UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xff + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_INQUIRY ), + ++/* Reported by Jaak Ristioja <Ristioja@gmail.com> */ ++UNUSUAL_DEV( 0x0a17, 0x006e, 0x0100, 0x0100, ++ "Pentax", ++ "K10D", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY ), ++ + /* These are virtual windows driver CDs, which the zd1211rw driver + * automatically converts into WLAN devices. */ + UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, |
