linux-toradex.git/drivers/usb/storage/usb.c, branch v3.0.75

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-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_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

usb-storage: redo incorrect reads

2011-06-07T16:05:42+00:00

Some USB mass-storage devices have bugs that cause them not to handle
the first READ(10) command they receive correctly.  The Corsair
Padlock v2 returns completely bogus data for its first read (possibly
it returns the data in encrypted form even though the device is
supposed to be unlocked).  The Feiya SD/SDHC card reader fails to
complete the first READ(10) command after it is plugged in or after a
new card is inserted, returning a status code that indicates it thinks
the command was invalid, which prevents the kernel from retrying the
read.

Since the first read of a new device or a new medium is for the
partition sector, the kernel is unable to retrieve the device's
partition table.  Users have to manually issue an "hdparm -z" or
"blockdev --rereadpt" command before they can access the device.

This patch (as1470) works around the problem.  It adds a new quirk
flag, US_FL_INVALID_READ10, indicating that the first READ(10) should
always be retried immediately, as should any failing READ(10) commands
(provided the preceding READ(10) command succeeded, to avoid getting
stuck in a loop).  The patch also adds appropriate unusual_devs
entries containing the new flag.

Signed-off-by: Alan Stern 
Tested-by: Sven Geggus 
Tested-by: Paul Hartman 
CC: Matthew Dharm 
CC: 
Signed-off-by: Greg Kroah-Hartman

usb-storage: Correct adjust_quirks to include latest flags

2011-05-19T23:34:05+00:00

Commits ae38c78a03e1b77ad45248fcf097e4568e740209
and 00914025cc4e783d4703b4db1d47b41f389e50c8 added quirk flags
US_FL_NO_READ_DISC_INFO and US_FL_NO_READ_CAPACITY_16 to
the usb-storage driver. However they did not add the corresponding flags
to adjust_quirks() in usb.c, so there was no facility for a user
to over-ride/add them via the quirks module parameter.

Signed-off-by: Karl Relton 
Signed-off-by: Greg Kroah-Hartman

USB: storage: Use USB_ prefix instead of US_ prefix

2010-10-22T17:21:49+00:00

This commit changes prefix for some of the USB mass storage
class related macros (ie. USB_SC_ for subclass and USB_PR_
for class).

Signed-off-by: Michal Nazarewicz 
Cc: Alan Stern 
Cc: Matthew Wilcox 
Signed-off-by: Greg Kroah-Hartman

USB: usb-storage: implement autosuspend

2010-08-10T21:35:44+00:00

This patch (as1400) adds runtime-PM support to usb-storage.  It
utilizes the SCSI layer's runtime-PM implementation, so its scope is
limited.  Currently the only effect is that disk-like devices (such as
card readers or flash drives) will be autosuspended if they aren't
mounted and their device files aren't open.  This would apply, for
example, to card readers that don't contain a memory card.

Unfortunately this won't interact very well with the removable-media
polling normally carried out by hal or DeviceKit.  Maybe those
programs can be changed to use a longer polling interval, or maybe the
default autosuspend time for usb-storage should be set to something
below 1 second.

Signed-off-by: Alan Stern 
Cc: James Bottomley 
Cc: Matthew Dharm 
Signed-off-by: Greg Kroah-Hartman

usb-storage: always print quirks

2010-05-20T20:21:49+00:00

Right now quirks are printed only when the are manually overriden with
the module parameters. It's not so useful to remind the user that his
parameters are correctly applied; what is useful is to print out the
quirks the user is not aware are being applied.

So let's do the smart thing and print the quirks when they are present.

Signed-off-by: Felipe Contreras 
Cc: Alan Stern 
Cc: Matthew Dharm 
Signed-off-by: Greg Kroah-Hartman

USB: usb-storage: trivial debug improvements

2010-05-20T20:21:49+00:00

Use pr_foo and dev_foo instead of printk. Maybe US_DEBUG* should be
replaced too.

Signed-off-by: Felipe Contreras 
Cc: Matthew Dharm 
Cc: Alan Stern 
Signed-off-by: Greg Kroah-Hartman