A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "usb: dwc3: gadget: Clear pending events when stopping controller"

Browse source
This commit is contained in:
qctecmdr 2019-12-10 12:44:52 -08:00 • committed by Gerrit - the friendly Code Review server
commit 03b0aae5ad
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/usb/dwc3/gadget.c
View file

@ -2031,7 +2031,6 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
* device controller.
*/
dwc3_stop_active_transfers(dwc);
dwc3_notify_event(dwc, DWC3_GSI_EVT_BUF_CLEAR, 0);
reg &= ~DWC3_DCTL_RUN_STOP;
@ -2041,14 +2040,25 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
dwc3_writel(dwc->regs, DWC3_DCTL, reg);
/* Controller is not halted until the events are acknowledged */
if (!is_on) {
/*
* Clear out any pending events (i.e. End Transfer Command
* Complete).
*/
reg1 = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
reg1 &= DWC3_GEVNTCOUNT_MASK;
dbg_log_string("remaining EVNTCOUNT(0)=%d", reg1);
dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), reg1);
dwc3_notify_event(dwc, DWC3_GSI_EVT_BUF_CLEAR, 0);
dwc3_notify_event(dwc, DWC3_CONTROLLER_NOTIFY_CLEAR_DB, 0);
}
do {
reg = dwc3_readl(dwc->regs, DWC3_DSTS);
reg &= DWC3_DSTS_DEVCTRLHLT;
} while (--timeout && !(!is_on ^ !reg));
if (!is_on)
dwc3_notify_event(dwc, DWC3_CONTROLLER_NOTIFY_CLEAR_DB, 0);
if (!timeout) {
dev_err(dwc->dev, "failed to %s controller\n",
is_on ? "start" : "stop");