linux-stable.git/drivers/usb/storage, branch v3.0.63

USB: storage: optimize to match the Huawei USB storage devices and support new switch command

2013-02-11T16:16:49+00:00

commit 200e0d994d9d1919b28c87f1a5fb99a8e13b8a0f upstream.

1. Optimize the match rules with new macro for Huawei USB storage devices,
   to avoid to load USB storage driver for the modem interface
   with Huawei devices.
2. Add to support new switch command for new Huawei USB dongles.

Signed-off-by: fangxiaozhi 
Signed-off-by: Greg Kroah-Hartman

USB: storage: Define a new macro for USB storage match rules

2013-02-11T16:16:49+00:00

commit 07c7be3d87e5cdaf5f94c271c516456364ef286c upstream.

1. Define a new macro for USB storage match rules:
    matching with Vendor ID and interface descriptors.

Signed-off-by: fangxiaozhi 
Signed-off-by: Greg Kroah-Hartman

USB: mark uas driver as BROKEN

2012-12-17T18:49:04+00:00

commit fb37ef98015f864d22be223a0e0d93547cd1d4ef upstream.

As reported https://bugzilla.kernel.org/show_bug.cgi?id=51031, the UAS
driver causes problems and has been asked to be not built into any of
the major distributions.  To prevent users from running into problems
with it, and for distros that were not notified, just mark the whole
thing as broken.

Acked-by: Sarah Sharp 
Signed-off-by: Greg Kroah-Hartman

usb-storage: add unusual_devs entry for Casio EX-N1 digital camera

2012-10-31T16:51:35+00:00

commit d7870af7e2e3a91b462075ec1ca669b482215187 upstream.

This commit sets removable subclass for Casio EX-N1 digital camera.

The patch has been tested within an ALT Linux kernel:
http://git.altlinux.org/people/led/packages/?p=kernel-image-3.0.git;a=commitdiff;h=c0fd891836e89fe0c93a4d536a59216d90e4e3e7

See also https://bugzilla.kernel.org/show_bug.cgi?id=49221

Signed-off-by: Oleksandr Chumachenko 
Signed-off-by: Michael Shigorin 
Signed-off-by: Greg Kroah-Hartman

usb-storage: unusual_devs entry for Yarvik PMP400 MP4 player

2012-06-01T07:12:57+00:00

commit df767b71e5816692134d59c0c17e0f77cd73333d upstream.

This patch (as1553) adds an unusual_dev entrie for the Yarvik PMP400
MP4 music player.

Signed-off-by: Alan Stern 
Reported-by: Jesse Feddema 
Tested-by: Jesse Feddema 
Signed-off-by: Greg Kroah-Hartman

usb-storage: fix freezing of the scanning thread

2012-03-01T00:34:27+00:00

commit bb94a406682770a35305daaa241ccdb7cab399de upstream.

This patch (as1521b) fixes the interaction between usb-storage's
scanning thread and the freezer.  The current implementation has a
race: If the device is unplugged shortly after being plugged in and
just as a system sleep begins, the scanning thread may get frozen
before the khubd task.  Khubd won't be able to freeze until the
disconnect processing is complete, and the disconnect processing can't
proceed until the scanning thread finishes, so the sleep transition
will fail.

The implementation in the 3.2 kernel suffers from an additional
problem.  There the scanning thread calls set_freezable_with_signal(),
and the signals sent by the freezer will mess up the thread's I/O
delays, which are all interruptible.

The solution to both problems is the same: Replace the kernel thread
used for scanning with a delayed-work routine on the system freezable
work queue.  Freezable work queues have the nice property that you can
cancel a work item even while the work queue is frozen, and no signals
are needed.

The 3.2 version of this patch solves the problem in Bugzilla #42730.

Signed-off-by: Alan Stern 
Acked-by: Seth Forshee 
Signed-off-by: Greg Kroah-Hartman

usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops

2012-01-12T19:35:11+00:00

commit 1a3a026ba1b6bbfe0b7f79ab38cf991d691e7c9a upstream.

Echo vendor and product number of a non usb-storage device to
usb-storage driver's new_id, then plug in the device to host and you
will find following oops msg, the root cause is usb_stor_probe1()
refers invalid id entry if giving a dynamic id, so just disable the
feature.

[ 3105.018012] general protection fault: 0000 [#1] SMP DEBUG_PAGEALLOC
[ 3105.018062] CPU 0
[ 3105.018075] Modules linked in: usb_storage usb_libusual bluetooth
dm_crypt binfmt_misc snd_hda_codec_analog snd_hda_intel snd_hda_codec
snd_hwdep hp_wmi ppdev sparse_keymap snd_pcm snd_seq_midi snd_rawmidi
snd_seq_midi_event snd_seq snd_timer snd_seq_device psmouse snd
serio_raw tpm_infineon soundcore i915 snd_page_alloc tpm_tis
parport_pc tpm tpm_bios drm_kms_helper drm i2c_algo_bit video lp
parport usbhid hid sg sr_mod sd_mod ehci_hcd uhci_hcd usbcore e1000e
usb_common floppy
[ 3105.018408]
[ 3105.018419] Pid: 189, comm: khubd Tainted: G          I  3.2.0-rc7+
#29 Hewlett-Packard HP Compaq dc7800p Convertible Minitower/0AACh
[ 3105.018481] RIP: 0010:[]  []
usb_stor_probe1+0x2fd/0xc20 [usb_storage]
[ 3105.018536] RSP: 0018:ffff880056a3d830  EFLAGS: 00010286
[ 3105.018562] RAX: ffff880065f4e648 RBX: ffff88006bb28000 RCX: 0000000000000000
[ 3105.018597] RDX: ffff88006f23c7b0 RSI: 0000000000000001 RDI: 0000000000000206
[ 3105.018632] RBP: ffff880056a3d900 R08: 0000000000000000 R09: ffff880067365000
[ 3105.018665] R10: 00000000000002ac R11: 0000000000000010 R12: ffff6000b41a7340
[ 3105.018698] R13: ffff880065f4ef60 R14: ffff88006bb28b88 R15: ffff88006f23d270
[ 3105.018733] FS:  0000000000000000(0000) GS:ffff88007a200000(0000)
knlGS:0000000000000000
[ 3105.018773] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
[ 3105.018801] CR2: 00007fc99c8c4650 CR3: 0000000001e05000 CR4: 00000000000006f0
[ 3105.018835] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 3105.018870] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
[ 3105.018906] Process khubd (pid: 189, threadinfo ffff880056a3c000,
task ffff88005677a400)
[ 3105.018945] Stack:
[ 3105.018959]  0000000000000000 0000000000000000 ffff880056a3d8d0
0000000000000002
[ 3105.019011]  0000000000000000 ffff880056a3d918 ffff880000000000
0000000000000002
[ 3105.019058]  ffff880056a3d8d0 0000000000000012 ffff880056a3d8d0
0000000000000006
[ 3105.019105] Call Trace:
[ 3105.019128]  [] storage_probe+0xa4/0xe0 [usb_storage]
[ 3105.019173]  [] usb_probe_interface+0x172/0x330 [usbcore]
[ 3105.019211]  [] driver_probe_device+0x257/0x3b0
[ 3105.019243]  [] __device_attach+0x73/0x90
[ 3105.019272]  [] ? __driver_attach+0x110/0x110
[ 3105.019303]  [] bus_for_each_drv+0x9c/0xf0
[ 3105.019334]  [] device_attach+0xf7/0x120
[ 3105.019364]  [] bus_probe_device+0x45/0x80
[ 3105.019396]  [] device_add+0x876/0x990
[ 3105.019434]  [] usb_set_configuration+0x822/0x9e0 [usbcore]
[ 3105.019479]  [] generic_probe+0x62/0xf0 [usbcore]
[ 3105.019518]  [] usb_probe_device+0x66/0xb0 [usbcore]
[ 3105.019555]  [] driver_probe_device+0x257/0x3b0
[ 3105.019589]  [] __device_attach+0x73/0x90
[ 3105.019617]  [] ? __driver_attach+0x110/0x110
[ 3105.019648]  [] bus_for_each_drv+0x9c/0xf0
[ 3105.019680]  [] device_attach+0xf7/0x120
[ 3105.019709]  [] bus_probe_device+0x45/0x80
[ 3105.021040] usb usb6: usb auto-resume
[ 3105.021045] usb usb6: wakeup_rh
[ 3105.024849]  [] device_add+0x876/0x990
[ 3105.025086]  [] usb_new_device+0x1e7/0x2b0 [usbcore]
[ 3105.025086]  [] hub_thread+0xb27/0x1ec0 [usbcore]
[ 3105.025086]  [] ? wake_up_bit+0x50/0x50
[ 3105.025086]  [] ? usb_remote_wakeup+0xa0/0xa0 [usbcore]
[ 3105.025086]  [] kthread+0xd8/0xf0
[ 3105.025086]  [] kernel_thread_helper+0x4/0x10
[ 3105.025086]  [] ? _raw_spin_unlock_irq+0x50/0x80
[ 3105.025086]  [] ? retint_restore_args+0x13/0x13
[ 3105.025086]  [] ? __init_kthread_worker+0x80/0x80
[ 3105.025086]  [] ? gs_change+0x13/0x13
[ 3105.025086] Code: 00 48 83 05 cd ad 00 00 01 48 83 05 cd ad 00 00
01 4c 8b ab 30 0c 00 00 48 8b 50 08 48 83 c0 30 48 89 45 a0 4c 89 a3
40 0c 00 00 <41> 0f b6 44 24 10 48 89 55 a8 3c ff 0f 84 b8 04 00 00 48
83 05
[ 3105.025086] RIP  [] usb_stor_probe1+0x2fd/0xc20
[usb_storage]
[ 3105.025086]  RSP 
[ 3105.060037] hub 6-0:1.0: hub_resume
[ 3105.062616] usb usb5: usb auto-resume
[ 3105.064317] ehci_hcd 0000:00:1d.7: resume root hub
[ 3105.094809] ---[ end trace a7919e7f17c0a727 ]---
[ 3105.130069] hub 5-0:1.0: hub_resume
[ 3105.132131] usb usb4: usb auto-resume
[ 3105.132136] usb usb4: wakeup_rh
[ 3105.180059] hub 4-0:1.0: hub_resume
[ 3106.290052] usb usb6: suspend_rh (auto-stop)
[ 3106.290077] usb usb4: suspend_rh (auto-stop)

Signed-off-by: Huajun Li 
Signed-off-by: Greg Kroah-Hartman

USB: usb-storage: unusual_devs entry for Kingston DT 101 G2

2011-12-09T16:52:42+00:00

commit cec28a5428793b6bc64e56687fb239759d6da74e upstream.

Kingston DT 101 G2 replies a wrong tag while transporting, add an
unusal_devs entry to ignore the tag validation.

Signed-off-by: Qinglin Ye 
Signed-off-by: Greg Kroah-Hartman

usb-storage: Accept 8020i-protocol commands longer than 12 bytes

2011-11-26T17:10:03+00:00

commit 2f640bf4c94324aeaa1b6385c10aab8c5ad1e1cf upstream.

The 8020i protocol (also 8070i and QIC-157) uses 12-byte commands;
shorter commands must be padded.  Simon Detheridge reports that his
3-TB USB disk drive claims to use the 8020i protocol (which is
normally meant for ATAPI devices like CD drives), and because of its
large size, the disk drive requires the use of 16-byte commands.
However the usb_stor_pad12_command() routine in usb-storage always
sets the command length to 12, making the drive impossible to use.

Since the SFF-8020i specification allows for 16-byte commands in
future extensions, we may as well accept them.  This patch (as1490)
changes usb_stor_pad12_command() to leave commands larger than 12
bytes alone rather than truncating them.

Signed-off-by: Alan Stern 
Tested-by: Simon Detheridge 
CC: Matthew Dharm 
Signed-off-by: Greg Kroah-Hartman

usb_storage: Don't freeze in usb-stor-scan

2011-11-11T17:36:43+00:00

commit f02fe890ece7d695a5744b20525d45312382e6e4 upstream.

Scanning cannot be run during suspend or hibernation, but if
usb-stor-scan freezes another thread waiting on scanning to
complete may fail to freeze.

However, if usb-stor-scan is left freezable without ever actually
freezing then the freezer will wait on it to exit, and threads
waiting for scanning to finish will no longer be blocked. One
problem with this approach is that usb-stor-scan has a delay to
wait for devices to settle (which is currently the only point where
it can freeze). To work around this we can request that the freezer
send a fake signal when freezing, then use interruptible sleep to
wake the thread early when freezing happens.

To make this happen, the following changes are made to
usb-stor-scan:

 * Use set_freezable_with_signal() instead of set_freezable() to
   request a fake signal when freezing

 * Use wait_event_interruptible_timeout() instead of
   wait_event_freezable_timeout() to avoid freezing

Signed-off-by: Seth Forshee 
Acked-by: Alan Stern 
Signed-off-by: Greg Kroah-Hartman