UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: gadget: udc: Process disconnect synchronously 

As the comment in usb_disconnect() hints, do not defer the
disconnect processing, and instead just do it directly in
the irq handler. This allows the driver to avoid using a
nowadays deprecated tasklet.

Acked-by: Felipe Balbi <balbi@kernel.org>
Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Link: https://lore.kernel.org/r/20210119001653.127975-1-dave@stgolabs.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Davidlohr Bueso 2021-01-18 16:16:53 -08:00 committed by Greg Kroah-Hartman
parent 79f06f04db
commit 908f6e2b8a
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/gadget/udc/snps_udc_core.c
View File

@ -36,7 +36,6 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include "amd5536udc.h" #include "amd5536udc.h"
static void udc_tasklet_disconnect(unsigned long);
static void udc_setup_endpoints(struct udc *dev); static void udc_setup_endpoints(struct udc *dev);
static void udc_soft_reset(struct udc *dev); static void udc_soft_reset(struct udc *dev);
static struct udc_request *udc_alloc_bna_dummy(struct udc_ep *ep); static struct udc_request *udc_alloc_bna_dummy(struct udc_ep *ep);
@ -95,9 +94,6 @@ static struct timer_list udc_pollstall_timer;
static int stop_pollstall_timer; static int stop_pollstall_timer;
static DECLARE_COMPLETION(on_pollstall_exit); static DECLARE_COMPLETION(on_pollstall_exit);
/* tasklet for usb disconnect */
static DECLARE_TASKLET_OLD(disconnect_tasklet, udc_tasklet_disconnect);
/* endpoint names used for print */ /* endpoint names used for print */
static const char ep0_string[] = "ep0in"; static const char ep0_string[] = "ep0in";
static const struct { static const struct {
@ -1637,6 +1633,8 @@ static void usb_connect(struct udc *dev)
*/ */
static void usb_disconnect(struct udc *dev) static void usb_disconnect(struct udc *dev)
{ {
u32 tmp;
/* Return if already disconnected */ /* Return if already disconnected */
if (!dev->connected) if (!dev->connected)
return; return;
@ -1648,23 +1646,6 @@ static void usb_disconnect(struct udc *dev)
/* mask interrupts */ /* mask interrupts */
udc_mask_unused_interrupts(dev); udc_mask_unused_interrupts(dev);
/* REVISIT there doesn't seem to be a point to having this
* talk to a tasklet ... do it directly, we already hold
* the spinlock needed to process the disconnect.
*/
tasklet_schedule(&disconnect_tasklet);
}
/* Tasklet for disconnect to be outside of interrupt context */
static void udc_tasklet_disconnect(unsigned long par)
{
struct udc *dev = udc;
u32 tmp;
DBG(dev, "Tasklet disconnect\n");
spin_lock_irq(&dev->lock);
if (dev->driver) { if (dev->driver) {
spin_unlock(&dev->lock); spin_unlock(&dev->lock);
dev->driver->disconnect(&dev->gadget); dev->driver->disconnect(&dev->gadget);
@ -1673,13 +1654,10 @@ static void udc_tasklet_disconnect(unsigned long par)
/* empty queues */ /* empty queues */
for (tmp = 0; tmp < UDC_EP_NUM; tmp++) for (tmp = 0; tmp < UDC_EP_NUM; tmp++)
empty_req_queue(&dev->ep[tmp]); empty_req_queue(&dev->ep[tmp]);
} }
/* disable ep0 */ /* disable ep0 */
ep_init(dev->regs, ep_init(dev->regs, &dev->ep[UDC_EP0IN_IX]);
&dev->ep[UDC_EP0IN_IX]);
if (!soft_reset_occured) { if (!soft_reset_occured) {
/* init controller by soft reset */ /* init controller by soft reset */
@ -1695,8 +1673,6 @@ static void udc_tasklet_disconnect(unsigned long par)
tmp = AMD_ADDBITS(tmp, UDC_DEVCFG_SPD_FS, UDC_DEVCFG_SPD); tmp = AMD_ADDBITS(tmp, UDC_DEVCFG_SPD_FS, UDC_DEVCFG_SPD);
writel(tmp, &dev->regs->cfg); writel(tmp, &dev->regs->cfg);
} }
spin_unlock_irq(&dev->lock);
} }
/* Reset the UDC core */ /* Reset the UDC core */