linux-stable.git/drivers/usb/isp1760, branch v4.0

usb: isp1760: fix spin unlock in the error path of isp1760_udc_start

2015-03-24T16:38:58+00:00

Commit a124820de5fd ("usb: isp1760: fix possible deadlock in
isp1760_udc_irq") replaced spin_{un,}lock with spin_{un,}lock_irq{save,restore}.
However it missed an error path resulting in the smatch warning as below:

drivers/usb/isp1760/isp1760-udc.c:1230 isp1760_udc_start() warn: inconsistent returns 'irqsave:flags'.
Locked on:   line 1207
Unlocked on: line 1199

This patch fixes the spin unlock in the error path in isp1760_udc_start
thereby removing the smatch warning mentioned above.

Reported-by: Dan Carpenter 
Cc: Laurent Pinchart 
Cc: Felipe Balbi 
Signed-off-by: Sudeep Holla 
Signed-off-by: Felipe Balbi

usb: isp1760: add peripheral/device controller chip id

2015-03-09T15:49:46+00:00

As per the SAF1761 data sheet[0], the DcChipID register represents
the hardware version number (0001h) and the chip ID (1582h) for the
Peripheral Controller.

However as per the ISP1761 data sheet[1], the DcChipID register
represents the hardware version number (0015h) and the chip ID (8210h)
for the Peripheral Controller.

This patch adds support for both the chip ID values.

[0] http://www.nxp.com/documents/data_sheet/SAF1761.pdf
[1] http://pdf.datasheetcatalog.com/datasheets2/74/742102_1.pdf

Acked-by: Laurent Pinchart 
Signed-off-by: Sudeep Holla 
Signed-off-by: Felipe Balbi

usb: isp1760: set IRQ flags properly

2015-03-09T15:46:15+00:00

The IRQF_DISABLED is a NOOP and scheduled to be removed.  According to
commit e58aa3d2d0cc ("genirq: Run irq handlers with interrupts
disabled") running IRQ handlers with interrupts enabled can cause stack
overflows when the interrupt line of the issuing device is still active.

This patch removes using this deprecated flag and additionally removes
redundantly setting IRQF_SHARED for isp1760_udc_register().

Signed-off-by: Valentin Rothberg 
Acked-by: Laurent Pinchart 
Signed-off-by: Felipe Balbi

usb: isp1760: fix possible deadlock in isp1760_udc_irq

2015-03-09T15:44:08+00:00

Use spin_{un,}lock_irq{save,restore} in isp1760_udc_{start,stop} to
prevent following potentially deadlock scenario between
isp1760_udc_{start,stop} and isp1760_udc_irq :

=================================
[ INFO: inconsistent lock state ]
4.0.0-rc2-00004-gf7bb2ef60173 #51 Not tainted
---------------------------------
inconsistent {HARDIRQ-ON-W} -> {IN-HARDIRQ-W} usage.
in:imklog/2118 [HC1[1]:SC0[0]:HE0:SE1] takes:
 (&(&udc->lock)->rlock){?.+...}, at: [] isp1760_udc_irq+0x367/0x9dc
{HARDIRQ-ON-W} state was registered at:
  [] _raw_spin_lock+0x23/0x30
  [] isp1760_udc_start+0x23/0xf8
  [] udc_bind_to_driver+0x71/0xb0
  [] usb_gadget_probe_driver+0x53/0x9c
  [] usb_composite_probe+0x8a/0xa4 [libcomposite]
  [] 0xbf8311a7
  [] do_one_initcall+0x8d/0x17c
  [] do_init_module+0x49/0x148
  [] load_module+0xb7f/0xbc4
  [] SyS_finit_module+0x51/0x74
  [] ret_fast_syscall+0x1/0x68
irq event stamp: 4966
hardirqs last  enabled at (4965): [] _raw_spin_unlock_irq+0x1f/0x24
hardirqs last disabled at (4966): [] __irq_svc+0x33/0x64
softirqs last  enabled at (4458): [] __do_softirq+0x23d/0x2d0
softirqs last disabled at (4389): [] irq_exit+0xef/0x15c

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

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

 *** DEADLOCK ***

1 lock held by in:imklog/2118:
 #0:  (&f->f_pos_lock){+.+.+.}, at: [] __fdget_pos+0x31/0x34

Signed-off-by: Sudeep Holla 
Cc: Greg Kroah-Hartman 
Acked-by: Laurent Pinchart 
Signed-off-by: Felipe Balbi

usb: isp1760: use msecs_to_jiffies for time conversion

2015-02-23T15:18:20+00:00

This is only an API consolidation and should make things more readable
it replaces var * HZ / 1000 by msecs_to_jiffies(var).

Acked-by: Laurent Pinchart 
Signed-off-by: Nicholas Mc Guire 
Signed-off-by: Felipe Balbi

Merge tag 'usb-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

2015-02-04T19:03:20+00:00

Felipe writes:

usb: patches for v3.20 merge window

Here's the big pull request for Gadgets and PHYs. It's
a total of 217 non-merge commits with pretty much everything
being touched.

The most important bits are a ton of new documentation for
almost all usb gadget functions, a new isp1760 UDC driver,
several improvements to the old net2280 UDC driver, and
some minor tracepoint improvements to dwc3.

Other than that, a big list of minor cleanups, smaller bugfixes
and new features all over the place.

Signed-off-by: Felipe Balbi

usb: isp1760: Fix USB disabled check

2015-01-27T15:39:51+00:00

The isp1760 driver registration function returns an error if USB is
disabled. This made sense when the driver only supported host
controllers, but now that it supports peripheral controllers host
support isn't mandatory anymore.

Fix this by returning an error only when both the HCD and UDC functions
are disabled, either through the kernel configuration or at runtime.

Signed-off-by: Laurent Pinchart 
Signed-off-by: Felipe Balbi

usb: isp1760: Remove duplicate usb_disabled() check

2015-01-27T15:39:47+00:00

Both isp1760_register() and isp1761_pci_probe() check whether USB is
disabled by calling usb_disabled(), and bail out with an error if it is.
One check is enough, remove the PCI-specific check.

Signed-off-by: Laurent Pinchart 
Signed-off-by: Felipe Balbi

usb: isp1760: Make HCD support optional

2015-01-27T15:39:42+00:00

Enable compilation of the isp1760 driver in pure host mode, pure device
mode, or dual-role mode.

Signed-off-by: Laurent Pinchart 
Signed-off-by: Felipe Balbi

usb: isp1760: Move driver from drivers/usb/host/ to drivers/usb/isp1760/

2015-01-27T15:39:38+00:00

Now that this is DRD, it doesn't make sense to keep it under
drivers/usb/host.

Signed-off-by: Laurent Pinchart 
Signed-off-by: Felipe Balbi