Commit 4ccf7afa authored Jul 27, 2022 by Wesley Cheng Committed by Greg Kroah-Hartman Sep 28, 2022

usb: dwc3: gadget: Avoid duplicate requests to enable Run/Stop



[ Upstream commit 040f2dbd2010c43f33ad27249e6dac48456f4d99 ]

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 69e131d1ac4e ("usb: dwc3: gadget: Prevent repeat pullup()")

Fixes: 77adb8bdf422 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent a5bdea59

drivers/usb/dwc3/gadget.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -2043,9 +2043,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;
		/*
		* Per databook, when we want to stop the gadget, if a control transfer
		@@ -2082,6 +2079,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 {