Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 823f6925 authored by Wesley Cheng's avatar Wesley Cheng Committed by Greg Kroah-Hartman
Browse files

usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup 



[ Upstream commit a1383b3537a7bea1c213baa7878ccc4ecf4413b5 ]

usb_gadget_deactivate/usb_gadget_activate does not execute the UDC start
operation, which may leave EP0 disabled and event IRQs disabled when
re-activating the function. Move the enabling/disabling of USB EP0 and
device event IRQs to be performed in the pullup routine.

Fixes: ae7e86108b12 ("usb: dwc3: Stop active transfers before halting the controller")
Tested-by: default avatarMichael Tretter <m.tretter@pengutronix.de>
Cc: stable <stable@vger.kernel.org>
Reported-by: default avatarMichael Tretter <m.tretter@pengutronix.de>
Signed-off-by: default avatarWesley Cheng <wcheng@codeaurora.org>
Link: https://lore.kernel.org/r/1609282837-21666-1-git-send-email-wcheng@codeaurora.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 25a0625f

drivers/usb/dwc3/gadget.c

+3 −11
Original line number Diff line number Diff line
@@ -1993,6 +1993,7 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) 


static void dwc3_gadget_disable_irq(struct dwc3 *dwc);

static void __dwc3_gadget_stop(struct dwc3 *dwc);

static int __dwc3_gadget_start(struct dwc3 *dwc);



static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)

{
@@ -2067,6 +2068,8 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) 
						dwc->ev_buf->length;

		}

		dwc->connected = false;

	} else {

		__dwc3_gadget_start(dwc);

	}



	ret = dwc3_gadget_run_stop(dwc, is_on, false);
@@ -2244,10 +2247,6 @@ static int dwc3_gadget_start(struct usb_gadget *g, 
	}



	dwc->gadget_driver	= driver;



	if (pm_runtime_active(dwc->dev))

		__dwc3_gadget_start(dwc);



	spin_unlock_irqrestore(&dwc->lock, flags);



	return 0;
@@ -2273,13 +2272,6 @@ static int dwc3_gadget_stop(struct usb_gadget *g) 
	unsigned long		flags;



	spin_lock_irqsave(&dwc->lock, flags);



	if (pm_runtime_suspended(dwc->dev))

		goto out;



	__dwc3_gadget_stop(dwc);



out:

	dwc->gadget_driver	= NULL;

	spin_unlock_irqrestore(&dwc->lock, flags);