Skip to content

Commit

Permalink
usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop
Browse files Browse the repository at this point in the history
Relocate the pullups_connected check until after it is ensured that there
are no runtime PM transitions.  If another context triggered the DWC3
core's runtime resume, it may have already enabled the Run/Stop.  Do not
re-run the entire pullup sequence again, as it may issue a core soft
reset while Run/Stop is already set.

This patch depends on
  commit 69e131d ("usb: dwc3: gadget: Prevent repeat pullup()")

Fixes: 77adb8b ("usb: dwc3: gadget: Allow runtime suspend if UDC unbinded")
Cc: stable <stable@kernel.org>
Signed-off-by: Wesley Cheng <quic_wcheng@quicinc.com>
Link: https://lore.kernel.org/r/20220728020647.9377-1-quic_wcheng@quicinc.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Wesley Cheng authored and Greg Kroah-Hartman committed Aug 18, 2022
1 parent bad0d1d commit 040f2db
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/usb/dwc3/gadget.c
Original file line number Diff line number Diff line change
Expand Up @@ -2539,9 +2539,6 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)

is_on = !!is_on;

if (dwc->pullups_connected == is_on)
return 0;

dwc->softconnect = is_on;

/*
Expand All @@ -2566,6 +2563,11 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
return 0;
}

if (dwc->pullups_connected == is_on) {
pm_runtime_put(dwc->dev);
return 0;
}

if (!is_on) {
ret = dwc3_gadget_soft_disconnect(dwc);
} else {
Expand Down

0 comments on commit 040f2db

Please sign in to comment.