[PATCH 00/17] Quirks for USB mass storage devices

classic Classic list List threaded Threaded
23 messages Options
12
Reply | Threaded
Open this post in threaded view
|

[PATCH 00/17] Quirks for USB mass storage devices

Colin Ian King-2
From: Colin Ian King <[hidden email]>

For: Primarily LPIA Hardy branch (netbooks)
     Also suitable for Hardy main

BugLink: http://bugs.launchpad.net/bugs/522059

LP#522059

Add a bunch of upstream quirks to support misbehaving USB
mass storage devices devices and interfaces. Some of these
devices are more recent devices which the 2.6.24 kernel
originally did not support.

Fixes (in alphabetical order):
  Actions flash drive,
  Argosy USB mass storage interface,
  Mio C520-GPS,
  M600i,
  Nokia 3109c, 3310c, 5300, 5310, 6300, 7610,
  Motorola Phone Razr v3xx
  Oracom MP3 player
  RockChip MP3 player,
  ROKR W5 phone,
  Samsung YP-U3,

Without these quirks, buffer I/O errors occur.  Some devices
such as Nokia phones are not detected in mass storage device
mode stopping users from downloading photos from the phones.

Alan Stern (8):
  USB: quirks and unusual_devs entry for Actions flash drive
  usb-storage: add unusual_devs entry for Samsung YP-U3
  usb-storage: unusual_devs entry for Nokia 5300
  USB: unusual_devs addition for RockChip MP3 player
  USB: unusual_devs entry for Argosy USB mass-storage interface
  USB: storage: updates unusual_devs entry for the Nokia 6300
  USB: storage: update unusual_devs entries for Nokia 5300 and 5310
  USB: storage: unusual_devs entry for Mio C520-GPS

CSÉCSY László (1):
  USB: storage: unusual_devs.h: Nokia 3109c addition

David Almaroad (1):
  usb: unusual devs patch for Nokia 5310 Music Xpress

Filip Joelsson (1):
  USB: Fixing Nokia 3310c in storage mode

Javier Smaldone (1):
  USB: Add support for ROKR W5 in unusual_devs.h

Jost Diederichs (1):
  USB: usb-storage Motorola Phone Razr v3xx US_FL_FIX_CAPACITY patch

Phil Dibowitz (1):
  USB: Fix M600i unusual_devs entry

Richard Nauber (1):
  USB: Fix the Nokia 6300 storage-mode.

Ricky Wong (1):
  usb: unusual devs patch for Nokia 7610 Supernova

Robert Spitzenpfeil (1):
  USB: usb-storage: unusual_devs entry for Oracom MP3 player

 drivers/usb/core/quirks.c          |    3 +
 drivers/usb/storage/unusual_devs.h |  120 +++++++++++++++++++++++++++++++++++-
 2 files changed, 120 insertions(+), 3 deletions(-)



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 01/17] USB: usb-storage: unusual_devs entry for Oracom MP3 player

Colin Ian King-2
From: Robert Spitzenpfeil <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1034) was written by Leonid Petrov, reported by Robert
Spitzenpfeil, and updated by me.  It adds an unusual_devs entry with
the IGNORE_RESIDUE flag for the Oracom MP3 player.  Together with the
change to the Get-Max-LUN routine in as1032, it makes the player usable.

Signed-off-by: Alan Stern <[hidden email]>
Signed-off-by: Phil Dibowitz <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index e8aebd9..f806347 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1440,6 +1440,17 @@ UNUSUAL_DEV(  0x0ed1, 0x7636, 0x0103, 0x0103,
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_IGNORE_RESIDUE | US_FL_GO_SLOW | US_FL_MAX_SECTORS_64),
 
+/* Patch by Leonid Petrov mail at lpetrov.net
+ * Reported by Robert Spitzenpfeil <[hidden email]>
+ * http://www.qbik.ch/usb/devices/showdev.php?id=1705
+ * Updated to 103 device by MJ Ray mjr at phonecoop.coop
+ */
+UNUSUAL_DEV(  0x0f19, 0x0103, 0x0100, 0x0100,
+ "Oracom Co., Ltd",
+ "ORC-200M",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_IGNORE_RESIDUE ),
+
 /* David Kuehling <[hidden email]>:
  * for MP3-Player AVOX WSX-300ER (bought in Japan).  Reports lots of SCSI
  * errors when trying to write.
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 02/17] USB: quirks and unusual_devs entry for Actions flash drive

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Alan Stern <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1033) adds a quirks entry and an unusual_devs entry for
the Actions Semiconductor flash drive.  This device has a 64-byte
string descriptor, which it doesn't terminate with a 0-length packet.

Oddly enough, the reporter's logs show that when the device was
plugged in at boot time, it changes its behavior completely -- it uses
a different product ID, product string descriptor, and bDeviceClass.

Signed-off-by: Alan Stern <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/core/quirks.c          |    3 +++
 drivers/usb/storage/unusual_devs.h |    9 +++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index b6d17d5..bad4548 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -28,6 +28,9 @@
  * devices is broken...
  */
 static const struct usb_device_id usb_quirk_list[] = {
+ /* Action Semiconductor flash disk */
+ { USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255},
+
  /* CBM - Flash disk */
  { USB_DEVICE(0x0204, 0x6025), .driver_info = USB_QUIRK_RESET_RESUME },
  /* HP 5300/5370C scanner */
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index f806347..3c09cd1 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1516,6 +1516,15 @@ UNUSUAL_DEV(  0x1019, 0x0c55, 0x0000, 0x0110,
  US_SC_DEVICE, US_PR_DEVICE, usb_stor_ucr61s2b_init,
  0 ),
 
+/* Reported by Fabio Venturi <[hidden email]>
+ * The device reports a vendor-specific bDeviceClass.
+ */
+UNUSUAL_DEV(  0x10d6, 0x2200, 0x0100, 0x0100,
+ "Actions Semiconductor",
+ "Mtp device",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 0),
+
 /* Reported by Kevin Lloyd <[hidden email]>
  * Entry is needed for the initializer function override,
  * which instructs the device to load as a modem
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 03/17] usb-storage: add unusual_devs entry for Samsung YP-U3

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Alan Stern <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1088) adds an unusual_devs entry for Samsung's YP-U3.

Signed-off-by: Alan Stern <[hidden email]>
Cc: Phil Dibowitz <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 3c09cd1..155191b 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -578,6 +578,13 @@ UNUSUAL_DEV(  0x04e6, 0x1010, 0x0000, 0x9999,
  US_FL_SINGLE_LUN),
 #endif
 
+/* Reported by Dmitry Khlystov <[hidden email]> */
+UNUSUAL_DEV(  0x04e8, 0x507c, 0x0220, 0x0220,
+ "Samsung",
+ "YP-U3",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_MAX_SECTORS_64),
+
 /* Reported by Bob Sass <[hidden email]> -- only rev 1.33 tested */
 UNUSUAL_DEV(  0x050d, 0x0115, 0x0133, 0x0133,
  "Belkin",
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 04/17] USB: Fix M600i unusual_devs entry

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Phil Dibowitz <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

It turns out that the unusual_devs entry for the Motorola M600i needs
another flag. This patch adds it. Thanks to Atte André Jensen
<[hidden email]>.

Signed-off-by: Phil Dibowitz <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 155191b..0faeeeb 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1509,7 +1509,7 @@ UNUSUAL_DEV(  0x0fce, 0xe031, 0x0000, 0x0000,
  "Sony Ericsson",
  "M600i",
  US_SC_DEVICE, US_PR_DEVICE, NULL,
- US_FL_FIX_CAPACITY ),
+ US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
 
 /* Reported by Kevin Cernekee <[hidden email]>
  * Tested on hardware version 1.10.
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 05/17] USB: Add support for ROKR W5 in unusual_devs.h

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Javier Smaldone <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch adds support for rev 2 of an existing unusual_devs entry
enabling ROKR W5s to work. Greg, please apply.

From: Javier Smaldone <[hidden email]>
Signed-off-by: Phil Dibowitz <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 0faeeeb..5b232f5 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1605,10 +1605,12 @@ UNUSUAL_DEV(  0x22b8, 0x3010, 0x0001, 0x0001,
 /*
  * Patch by Pete Zaitcev <[hidden email]>
  * Report by Mark Patton. Red Hat bz#208928.
+ * Added support for rev 0x0002 (Motorola ROKR W5)
+ * by Javier Smaldone <[hidden email]>
  */
-UNUSUAL_DEV(  0x22b8, 0x4810, 0x0001, 0x0001,
+UNUSUAL_DEV(  0x22b8, 0x4810, 0x0001, 0x0002,
  "Motorola",
- "RAZR V3i",
+ "RAZR V3i/ROKR W5",
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_FIX_CAPACITY),
 
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 06/17] USB: usb-storage Motorola Phone Razr v3xx US_FL_FIX_CAPACITY patch

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Jost Diederichs <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

add razr v3xx US_FL_FIX_CAPACITY flag to unusual_devs.h in usb-storage

This is another Motorola phone that incorrectly reports the sector count
(off by one).

Problem Description: io errors when mounting phone's sd-card via the
phones usb port

Steps to reproduce: mount Motorola Razr v3xx phones sd-card on Linux Desktop
via usb cable. Phones USB port must be in memory card mode.

DEBUG output:
Jul 9 19:32:41 micky kernel: Buffer I/O error on device sdd, logical block 3970048
Jul 9 19:32:41 micky kernel: sd 11:0:0:0: [sdd] Result: hostbyte=DID_OK driverbyte=DRIVER_SENSE,SUGGEST_OK
Jul 9 19:32:41 micky kernel: sd 11:0:0:0: [sdd] Sense Key : Medium Error [current]
Jul 9 19:32:41 micky kernel: sd 11:0:0:0: [sdd] Add. Sense: No additional sense information
Jul 9 19:32:41 micky kernel: end_request: I/O error, dev sdd, sector 3970048

From: Jost Diederichs <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 5b232f5..c9f462f 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1615,6 +1615,15 @@ UNUSUAL_DEV(  0x22b8, 0x4810, 0x0001, 0x0002,
  US_FL_FIX_CAPACITY),
 
 /*
+ * Patch by Jost Diederichs <[hidden email]>
+ */
+UNUSUAL_DEV(0x22b8, 0x6410, 0x0001, 0x9999,
+ "Motorola Inc.",
+ "Motorola Phone (RAZRV3xx)",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY),
+
+/*
  * Patch by Constantin Baranov <[hidden email]>
  * Report by Andreas Koenecke.
  * Motorola ROKR Z6.
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 07/17] usb-storage: unusual_devs entry for Nokia 5300

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Alan Stern <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1120) adds an unusual_devs entry for the Nokia 5300.
Maybe once Nokia releases the Symbian code we'll be able to fix all
the problems it has with the USB mass-storage protocol.

Signed-off-by: Alan Stern <[hidden email]>
Tested-by: Cedric Godin <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index c9f462f..e50b566 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -226,6 +226,13 @@ UNUSUAL_DEV(  0x0421, 0x0495, 0x0370, 0x0370,
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_MAX_SECTORS_64 ),
 
+/* Reported by Cedric Godin <[hidden email]> */
+UNUSUAL_DEV(  0x0421, 0x04b9, 0x0551, 0x0551,
+ "Nokia",
+ "5300",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
 /* Reported by Olaf Hering <[hidden email]> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
  "SMSC",
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 08/17] USB: Fix the Nokia 6300 storage-mode.

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Richard Nauber <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch fixes that behavior:

...
Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current]
Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0
Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current]
Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0
Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current]
Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] ASC=0x0 ASCQ=0x0
Aug 26 22:39:23 rnauber sd 2:0:0:0: [sda] Sense Key : 0x0 [current]
...

cat  /proc/bus/usb/devices
...
T:  Bus=04 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#=  3 Spd=12  MxCh= 0
D:  Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=0421 ProdID=04fa Rev= 6.01
S:  Manufacturer=Nokia
S:  Product=Nokia 6300
S:  SerialNumber=35XXXXXXXX
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=81(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
...

From: Richard Nauber <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index e50b566..c395b85 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -233,6 +233,13 @@ UNUSUAL_DEV(  0x0421, 0x04b9, 0x0551, 0x0551,
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_FIX_CAPACITY ),
 
+/* Reported by Richard Nauber <[hidden email]> */
+UNUSUAL_DEV(  0x0421, 0x04fa, 0x0601, 0x0601,
+ "Nokia",
+ "6300",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
 /* Reported by Olaf Hering <[hidden email]> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
  "SMSC",
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 09/17] USB: Fixing Nokia 3310c in storage mode

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Filip Joelsson <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

I had trouble connecting my cell phone as a storage device - so I added
it to the unusual_devs.h list. I had trouble with the bcdDeviceMin and
Max values - so after some experimenting I made it pretty inclusive.

From: Filip Joelsson <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index c395b85..03b21e8 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -161,6 +161,13 @@ UNUSUAL_DEV(  0x0421, 0x0019, 0x0592, 0x0592,
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_MAX_SECTORS_64 ),
 
+/* Reported by Filip Joelsson <[hidden email]> */
+UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
+ "Nokia",
+ "Nokia 3110c",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
 /* Reported by Mario Rettig <[hidden email]> */
 UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
  "Nokia",
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 10/17] USB: unusual_devs addition for RockChip MP3 player

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Alan Stern <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1136) adds an unusual_devs entry for a version of the
RockChip MP3 player which can't handle the MODE SENSE command used for
write-protect detection.

Signed-off-by: Alan Stern <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 03b21e8..93197fd 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -996,6 +996,13 @@ UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_FIX_CAPACITY ),
 
+/* Reported by Adrian Pilchowiec <[hidden email]> */
+UNUSUAL_DEV(  0x071b, 0x3203, 0x0000, 0x0000,
+ "RockChip",
+ "MP3",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64),
+
 /* Reported by Massimiliano Ghilardi <[hidden email]>
  * This USB MP3/AVI player device fails and disconnects if more than 128
  * sectors (64kB) are read/written in a single command, and may be present
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 11/17] usb: unusual devs patch for Nokia 5310 Music Xpress

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: David Almaroad <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

The Nokia 5310 Music Xpress phone reports one too many sectors in
usb-storage mode.  This patch resolves that.

Signed-off-by: David Almaroad <[hidden email]>
Cc: Matthew Dharm <[hidden email]>
Signed-off-by: Andrew Morton <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 93197fd..adb8caf 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -247,6 +247,13 @@ UNUSUAL_DEV(  0x0421, 0x04fa, 0x0601, 0x0601,
  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 Olaf Hering <[hidden email]> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
  "SMSC",
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 12/17] USB: unusual_devs entry for Argosy USB mass-storage interface

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Alan Stern <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1162) adds an unusual_devs entry for Argosy's USB-IDE
interface.  This fixes Bugzilla #11843.

Signed-off-by: Alan Stern <[hidden email]>
Tested-by: Luciano Rocha <[hidden email]>
Cc: stable <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index adb8caf..cd53d39 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1239,6 +1239,13 @@ UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0001,
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_FIX_INQUIRY),
 
+/* Reported by Luciano Rocha <[hidden email]> */
+UNUSUAL_DEV( 0x0840, 0x0082, 0x0001, 0x0001,
+ "Argosy",
+ "Storage",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY),
+
 /* Entry and supporting patch by Theodore Kilgore <[hidden email]>.
  * Flag will support Bulk devices which use a standards-violating 32-byte
  * Command Block Wrapper. Here, the "DC2MEGA" cameras (several brands) with
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 13/17] usb: unusual devs patch for Nokia 7610 Supernova

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Ricky Wong <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

Additional sectors were reported by the Nokia 7610 Supernova phone in
usb storage mode. The following patch rectifies the aforementioned
problem.

Signed-off-by: Ricky Wong Yung Fei <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index cd53d39..5e99c4f 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -254,6 +254,14 @@ UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_FIX_CAPACITY ),
 
+/* Submitted by Ricky Wong Yung Fei <[hidden email]> */
+/* Nokia 7610 Supernova - Too many sectors reported in usb storage mode */
+UNUSUAL_DEV(  0x0421, 0x00f5, 0x0000, 0x0470,
+ "Nokia",
+ "7610 Supernova",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
 /* Reported by Olaf Hering <[hidden email]> from novell bug #105878 */
 UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
  "SMSC",
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 14/17] USB: storage: updates unusual_devs entry for the Nokia 6300

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Alan Stern <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1169) modifies the unusual_devs entry for the Nokia
6300.  According to Maciej Gierok <[hidden email]> and David
McBride <[hidden email]>, the revision limits need to be wider.

This fixes Bugzilla #11768.

Signed-off-by: Alan Stern <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 5e99c4f..0836ee2 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -241,7 +241,7 @@ UNUSUAL_DEV(  0x0421, 0x04b9, 0x0551, 0x0551,
  US_FL_FIX_CAPACITY ),
 
 /* Reported by Richard Nauber <[hidden email]> */
-UNUSUAL_DEV(  0x0421, 0x04fa, 0x0601, 0x0601,
+UNUSUAL_DEV(  0x0421, 0x04fa, 0x0550, 0x0660,
  "Nokia",
  "6300",
  US_SC_DEVICE, US_PR_DEVICE, NULL,
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 15/17] USB: storage: update unusual_devs entries for Nokia 5300 and 5310

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Alan Stern <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1168) updates the unusual_devs entry for the Nokia 5300.
According to Jorge Lucangeli Obes <[hidden email]>, 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 <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 0836ee2..cc7353a 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -168,6 +168,13 @@ UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
  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 <[hidden email]> */
 UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
  "Nokia",
@@ -234,7 +241,7 @@ UNUSUAL_DEV(  0x0421, 0x0495, 0x0370, 0x0370,
  US_FL_MAX_SECTORS_64 ),
 
 /* Reported by Cedric Godin <[hidden email]> */
-UNUSUAL_DEV(  0x0421, 0x04b9, 0x0551, 0x0551,
+UNUSUAL_DEV(  0x0421, 0x04b9, 0x0500, 0x0551,
  "Nokia",
  "5300",
  US_SC_DEVICE, US_PR_DEVICE, NULL,
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 16/17] USB: storage: unusual_devs entry for Mio C520-GPS

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: Alan Stern <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

This patch (as1176) adds an unusual_devs entry for the Mio C520 GPS
unit.  Other devices also based on the Mitac hardware use the same USB
interface firmware, so the Vendor and Product names are generalized.

This fixes Bugzilla #11583.

Signed-off-by: Alan Stern <[hidden email]>
Tested-by: Tamas Kerecsen <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index cc7353a..e8a7f15 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -319,6 +319,18 @@ UNUSUAL_DEV(  0x045a, 0x5210, 0x0101, 0x0101,
  US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0),
 #endif
 
+/* Reported by Tamas Kerecsen <[hidden email]>
+ * Obviously the PROM has not been customized by the VAR;
+ * the Vendor and Product string descriptors are:
+ * Generic Mass Storage (PROTOTYPE--Remember to change idVendor)
+ * Generic Manufacturer (PROTOTYPE--Remember to change idVendor)
+ */
+UNUSUAL_DEV(  0x045e, 0xffff, 0x0000, 0x0000,
+ "Mitac",
+ "GPS",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_MAX_SECTORS_64 ),
+
 /*
  * This virtual floppy is found in Sun equipment (x4600, x4200m2, etc.)
  * Reported by Pete Zaitcev <[hidden email]>
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 17/17] USB: storage: unusual_devs.h: Nokia 3109c addition

Colin Ian King-2
In reply to this post by Colin Ian King-2
From: CSÉCSY László <[hidden email]>

BugLink: http://bugs.launchpad.net/bugs/522059

2.6.26(.x, cannot remember) could handle the microSD card in my Nokia
3109c attached via USB as mass storage, 2.6.27(.x, up to and included
2.6.27.8) cannot. Please find the attached patch which fixes this
regression, and a copy of /proc/bus/usb/devices with my phone plugged in
running with this patch on Frugalware.

T:  Bus=02 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#=  4 Spd=12  MxCh= 0
D:  Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=0421 ProdID=0063 Rev= 6.01
S:  Manufacturer=Nokia
S:  Product=Nokia 3109c
S:  SerialNumber=359561013742570
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=81(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms

From: CSÉCSY László <[hidden email]>
Cc: Phil Dibowitz <[hidden email]>
Cc: stable <[hidden email]>
Signed-off-by: Greg Kroah-Hartman <[hidden email]>
Signed-off-by: Colin Ian King <[hidden email]>
---
 drivers/usb/storage/unusual_devs.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index e8a7f15..b9194cd 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -168,6 +168,13 @@ UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
  US_SC_DEVICE, US_PR_DEVICE, NULL,
  US_FL_FIX_CAPACITY ),
 
+/* Reported by CSECSY Laszlo <[hidden email]> */
+UNUSUAL_DEV(  0x0421, 0x0063, 0x0001, 0x0601,
+ "Nokia",
+ "Nokia 3109c",
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
 /* Patch for Nokia 5310 capacity */
 UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
  "Nokia",
--
1.6.3.3


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 00/17] Quirks for USB mass storage devices

Amit Kucheria-6
In reply to this post by Colin Ian King-2
On 10 Feb 15, Colin King wrote:

> From: Colin Ian King <[hidden email]>
>
> For: Primarily LPIA Hardy branch (netbooks)
>      Also suitable for Hardy main
>
> BugLink: http://bugs.launchpad.net/bugs/522059
>
> LP#522059
>
> Add a bunch of upstream quirks to support misbehaving USB
> mass storage devices devices and interfaces. Some of these
> devices are more recent devices which the 2.6.24 kernel
> originally did not support.
>
> Fixes (in alphabetical order):
>   Actions flash drive,
>   Argosy USB mass storage interface,
>   Mio C520-GPS,
>   M600i,
>   Nokia 3109c, 3310c, 5300, 5310, 6300, 7610,
>   Motorola Phone Razr v3xx
>   Oracom MP3 player
>   RockChip MP3 player,
>   ROKR W5 phone,
>   Samsung YP-U3,
>
> Without these quirks, buffer I/O errors occur.  Some devices
> such as Nokia phones are not detected in mass storage device
> mode stopping users from downloading photos from the phones.
>
> Alan Stern (8):
>   USB: quirks and unusual_devs entry for Actions flash drive
>   usb-storage: add unusual_devs entry for Samsung YP-U3
>   usb-storage: unusual_devs entry for Nokia 5300
>   USB: unusual_devs addition for RockChip MP3 player
>   USB: unusual_devs entry for Argosy USB mass-storage interface
>   USB: storage: updates unusual_devs entry for the Nokia 6300
>   USB: storage: update unusual_devs entries for Nokia 5300 and 5310
>   USB: storage: unusual_devs entry for Mio C520-GPS
>
> CSÉCSY László (1):
>   USB: storage: unusual_devs.h: Nokia 3109c addition
>
> David Almaroad (1):
>   usb: unusual devs patch for Nokia 5310 Music Xpress
>
> Filip Joelsson (1):
>   USB: Fixing Nokia 3310c in storage mode
>
> Javier Smaldone (1):
>   USB: Add support for ROKR W5 in unusual_devs.h
>
> Jost Diederichs (1):
>   USB: usb-storage Motorola Phone Razr v3xx US_FL_FIX_CAPACITY patch
>
> Phil Dibowitz (1):
>   USB: Fix M600i unusual_devs entry
>
> Richard Nauber (1):
>   USB: Fix the Nokia 6300 storage-mode.
>
> Ricky Wong (1):
>   usb: unusual devs patch for Nokia 7610 Supernova
>
> Robert Spitzenpfeil (1):
>   USB: usb-storage: unusual_devs entry for Oracom MP3 player
>
>  drivers/usb/core/quirks.c          |    3 +
>  drivers/usb/storage/unusual_devs.h |  120 +++++++++++++++++++++++++++++++++++-
>  2 files changed, 120 insertions(+), 3 deletions(-)
>
>

All these patches are adding new device ids to the unusual devices table,
hence have no regression potential.

Acked-by: Amit Kucheria <[hidden email]>

I am curious though as to why you went through the effort of adding all the
others besides the Nokia 5310, for which the bug was filed.

/Amit

--
----------------------------------------------------------------------
Amit Kucheria, Kernel Engineer || [hidden email]
----------------------------------------------------------------------

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 00/17] Quirks for USB mass storage devices

Stefan Bader-2
In reply to this post by Colin Ian King-2
Colin King wrote:

> From: Colin Ian King <[hidden email]>
>
> For: Primarily LPIA Hardy branch (netbooks)
>      Also suitable for Hardy main
>
> BugLink: http://bugs.launchpad.net/bugs/522059
>
> LP#522059
>
> Add a bunch of upstream quirks to support misbehaving USB
> mass storage devices devices and interfaces. Some of these
> devices are more recent devices which the 2.6.24 kernel
> originally did not support.
>
> Fixes (in alphabetical order):
>   Actions flash drive,
>   Argosy USB mass storage interface,
>   Mio C520-GPS,
>   M600i,
>   Nokia 3109c, 3310c, 5300, 5310, 6300, 7610,
>   Motorola Phone Razr v3xx
>   Oracom MP3 player
>   RockChip MP3 player,
>   ROKR W5 phone,
>   Samsung YP-U3,
>
> Without these quirks, buffer I/O errors occur.  Some devices
> such as Nokia phones are not detected in mass storage device
> mode stopping users from downloading photos from the phones.
>
> Alan Stern (8):
>   USB: quirks and unusual_devs entry for Actions flash drive
>   usb-storage: add unusual_devs entry for Samsung YP-U3
>   usb-storage: unusual_devs entry for Nokia 5300
>   USB: unusual_devs addition for RockChip MP3 player
>   USB: unusual_devs entry for Argosy USB mass-storage interface
>   USB: storage: updates unusual_devs entry for the Nokia 6300
>   USB: storage: update unusual_devs entries for Nokia 5300 and 5310
>   USB: storage: unusual_devs entry for Mio C520-GPS
>
> CS�CSY László (1):
>   USB: storage: unusual_devs.h: Nokia 3109c addition
>
> David Almaroad (1):
>   usb: unusual devs patch for Nokia 5310 Music Xpress
>
> Filip Joelsson (1):
>   USB: Fixing Nokia 3310c in storage mode
>
> Javier Smaldone (1):
>   USB: Add support for ROKR W5 in unusual_devs.h
>
> Jost Diederichs (1):
>   USB: usb-storage Motorola Phone Razr v3xx US_FL_FIX_CAPACITY patch
>
> Phil Dibowitz (1):
>   USB: Fix M600i unusual_devs entry
>
> Richard Nauber (1):
>   USB: Fix the Nokia 6300 storage-mode.
>
> Ricky Wong (1):
>   usb: unusual devs patch for Nokia 7610 Supernova
>
> Robert Spitzenpfeil (1):
>   USB: usb-storage: unusual_devs entry for Oracom MP3 player
>
>  drivers/usb/core/quirks.c          |    3 +
>  drivers/usb/storage/unusual_devs.h |  120 +++++++++++++++++++++++++++++++++++-
>  2 files changed, 120 insertions(+), 3 deletions(-)
>
>
>
All of those either add a quirk for specific devices or extend the range of
firmware revisions for existing ones. As upstream added quirks for them they
have not been working without. Regression is not to be expected.

Acked-by: Stefan Bader <[hidden email]>



--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
12