linux-toradex.git/drivers/usb/gadget/inode.c, branch v3.3.3

usb: gadgetfs: return number of bytes on ep0 read request

2012-04-02T17:31:34+00:00

commit 85b4b3c8c189e0159101f7628a71411af072ff69 upstream.

A read from GadgetFS endpoint 0 during the data stage of a control
request would always return 0 on success (as returned by
wait_event_interruptible) despite having written data into the user
buffer.
This patch makes it correctly set the return value to the number of
bytes read.

Signed-off-by: Thomas Faber 
Signed-off-by: Greg Kroah-Hartman

Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

2012-01-09T20:09:47+00:00

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits)
  USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c
  xhci: Clean up 32-bit build warnings.
  USB: update documentation for usbmon
  usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops
  drivers/usb/class/cdc-acm.c: clear dangling pointer
  drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree
  drivers/usb/host/isp1760-if.c: introduce missing kfree
  usb: option: add ZD Incorporated HSPA modem
  usb: ch9: fix up MaxStreams helper
  USB: usb-skeleton.c: cleanup open_count
  USB: usb-skeleton.c: fix open/disconnect race
  xhci: Properly handle COMP_2ND_BW_ERR
  USB: remove dead code from suspend/resume path
  USB: add quirk for another camera
  drivers: usb: wusbcore: Fix dependency for USB_WUSB
  xhci: Better debugging for critical host errors.
  xhci: Be less verbose during URB cancellation.
  xhci: Remove debugging about ring structure allocation.
  xhci: Remove debugging about toggling cycle bits.
  xhci: Remove debugging for individual transfers.
  ...

... and the same for gadgetfs

2012-01-09T01:18:50+00:00

Signed-off-by: Al Viro

usb: gadget: rename usb_gadget_driver::speed to max_speed

2011-12-12T09:45:12+00:00

This commit renames the “speed” field of the usb_gadget_driver
structure to “max_speed”.  This is so that to make it more
apparent that the field represents the maximum speed gadget
driver can support.

This also make the field look more like fields with the same
name in usb_gadget and usb_composite_driver structures.  All
of those represent the *maximal* speed given entity supports.

After this commit, there are the following fields in various
structures:
* usb_gadget::speed - the current connection speed,
* usb_gadget::max_speed - maximal speed UDC supports,
* usb_gadget_driver::max_speed - maximal speed gadget driver
  supports, and
* usb_composite_driver::max_speed - maximal speed composite
  gadget supports.

Signed-off-by: Michal Nazarewicz 
Signed-off-by: Felipe Balbi

USB: gadgetfs: gadgetfs_disconnect: fix inconsistent lock state

2011-11-14T19:51:26+00:00

Under certain circumstances lockdep finds an inconsistent lock state in
gadgetfs. The problem can be reproduced with a hardware using the
ci13xxx_udc driver and the gadgetfs test program (needs a patch to support
the ci13xxx_udc, though):
	http://www.linux-usb.org/gadget/usb.c
Start the test program, wait to initialize, then press Ctrl+c.

This patch fixes the following problem by using spin_lock_irqsave()
instead of spin_lock().

=================================
[ INFO: inconsistent lock state ]
3.1.0-rc6+ #158
---------------------------------
inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage.
usb/113 [HC0[0]:SC0[0]:HE1:SE1] takes:
 (&(&dev->lock)->rlock){?.....}, at: [] gadgetfs_disconnect+0x14/0x80 [gadgetfs]
{IN-HARDIRQ-W} state was registered at:
  [] mark_irqflags+0x14c/0x1ac
  [] __lock_acquire+0x4e0/0x8f0
  [] lock_acquire+0x98/0x1a8
  [] _raw_spin_lock+0x54/0x8c
  [] gadgetfs_disconnect+0x14/0x80 [gadgetfs]
  [] _gadget_stop_activity+0xd4/0x154
  [] isr_reset_handler+0x34/0x1c0
  [] udc_irq+0x204/0x228
  [] handle_irq_event_percpu+0x64/0x3a0
  [] handle_irq_event+0x3c/0x5c
  [] handle_level_irq+0x8c/0x10c
  [] generic_handle_irq+0x30/0x44
  [] handle_IRQ+0x30/0x84
  [] __irq_svc+0x38/0x60
  [] default_idle+0x30/0x34
  [] cpu_idle+0x9c/0xd8
  [] start_kernel+0x278/0x2bc
irq event stamp: 6412
hardirqs last  enabled at (6412): [] _raw_spin_unlock_irqrestore+0x30/0x5c
hardirqs last disabled at (6411): [] _raw_spin_lock_irqsave+0x20/0xa0
softirqs last  enabled at (6381): [] irq_exit+0xa0/0xa8
softirqs last disabled at (6372): [] irq_exit+0xa0/0xa8

other info that might help us debug this:
 Possible unsafe locking scenario:

       CPU0
       ----
  lock(&(&dev->lock)->rlock);
  
    lock(&(&dev->lock)->rlock);

 *** DEADLOCK ***

1 lock held by usb/113:
 #0:  (udc_lock#2){+.+.+.}, at: [] usb_gadget_unregister_driver+0x34/0x88

stack backtrace:
[] (unwind_backtrace+0x0/0xf0) from [] (print_usage_bug+0x144/0x1c4)
[] (print_usage_bug+0x144/0x1c4) from [] (mark_lock_irq+0x22c/0x274)
[] (mark_lock_irq+0x22c/0x274) from [] (mark_lock+0x148/0x3e0)
[] (mark_lock+0x148/0x3e0) from [] (mark_irqflags+0xfc/0x1ac)
[] (mark_irqflags+0xfc/0x1ac) from [] (__lock_acquire+0x4e0/0x8f0)
[] (__lock_acquire+0x4e0/0x8f0) from [] (lock_acquire+0x98/0x1a8)
[] (lock_acquire+0x98/0x1a8) from [] (_raw_spin_lock+0x54/0x8c)
[] (_raw_spin_lock+0x54/0x8c) from [] (gadgetfs_disconnect+0x14/0x80 [gadgetfs])
[] (gadgetfs_disconnect+0x14/0x80 [gadgetfs]) from [] (_gadget_stop_activity+0xd4/0x154)
[] (_gadget_stop_activity+0xd4/0x154) from [] (ci13xxx_stop+0xbc/0x17c)
[] (ci13xxx_stop+0xbc/0x17c) from [] (usb_gadget_remove_driver+0x88/0x98)
[] (usb_gadget_remove_driver+0x88/0x98) from [] (usb_gadget_unregister_driver+0x68/0x88)
[] (usb_gadget_unregister_driver+0x68/0x88) from [] (dev_release+0x14/0x48 [gadgetfs])
[] (dev_release+0x14/0x48 [gadgetfs]) from [] (__fput+0xa4/0x1f0)
[] (__fput+0xa4/0x1f0) from [] (filp_close+0x5c/0x74)
[] (filp_close+0x5c/0x74) from [] (sys_close+0xa8/0x150)
[] (sys_close+0xa8/0x150) from [] (ret_fast_syscall+0x0/0x38)

Tested-by: Pavankumar Kondeti 
Signed-off-by: Marc Kleine-Budde 
Signed-off-by: Felipe Balbi 
Signed-off-by: Greg Kroah-Hartman

usb gadget: clean up FSF boilerplate text

2011-09-09T23:00:09+00:00

remove the following two paragraphs as they are not needed:

This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
License for more details.

You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc.,59
Temple Place - Suite 330, Boston, MA  02111-1307, USA.

Signed-off-by: Klaus Schwarzkopf 
Signed-off-by: Greg Kroah-Hartman

usb: gadget: defer setting maxpacket till ->setup()

2011-07-01T21:31:12+00:00

maxpacket is set by the udc driver for ep0 very early. This value is
copied by the function gadget used later for the USB_DT_DEVICE and
USB_DT_DEVICE_QUALIFIER query. This seems to work fine so far. For USB3
we need set a different value here. In SS speed it is 2^x with x=9 and
in HS we set something <= 64. If the UDC starts in SS and continues in
HS after the cable has been plugged it will report a too small value.
There setting of this value is defered and taken automaticly from the
ep0 pointer where the UDC driver can update it according to the speed it
detected _after_ a cable has been plugged.

Signed-off-by: Sebastian Andrzej Siewior 
Signed-off-by: Felipe Balbi 
Signed-off-by: Greg Kroah-Hartman

usb: gadget: add usb_endpoint_descriptor to struct usb_ep

2011-06-28T18:14:36+00:00

Change usb_ep_enable() prototype to use endpoint
descriptor from usb_ep.

This optimization spares the FDs from saving the
endpoint chosen descriptor. This optimization is
not full though. To fully exploit this change, one
needs to update all the UDCs as well since in the
current implementation each of them saves the
endpoint descriptor in it's internal (and extended)
endpoint structure.

Signed-off-by: Tatyana Brokhman 
Signed-off-by: Felipe Balbi 
Signed-off-by: Greg Kroah-Hartman

usb-gadget: unlock data->lock mutex on error path in ep_write()

2011-06-06T22:59:40+00:00

ep_write() acquires data->lock mutex in get_ready_ep() and releases it
on all paths except for one: when usb_endpoint_xfer_isoc() failed. The
patch adds mutex_unlock(&data->lock) at that path.

It is similar to commit 00cc7a5 ("usb-gadget: unlock data->lock mutex on error path in ep_read()"),
it was not fixed at that time by accident.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov 
Signed-off-by: Greg Kroah-Hartman

USB: usb-gadget: unlock data->lock mutex on error path in ep_read()

2011-04-13T22:43:59+00:00

ep_read() acquires data->lock mutex in get_ready_ep() and releases it on
all paths except for one: when usb_endpoint_xfer_isoc() failed. The
patch adds mutex_unlock(&data->lock) at that path.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov 
Signed-off-by: Greg Kroah-Hartman