Merge "dwc3: gadget: Don't queue USB request if pull up is getting disable" (f67b96c1) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/dwc3/debug.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,10 @@

		#define dbg_setup(ep_num, req) \
		dwc3_dbg_setup(dwc, ep_num, req)

		#define dbg_log_string(fmt, ...) \
		ipc_log_string(dwc->dwc_ipc_log_ctxt,\
		"%s: " fmt, __func__, ##__VA_ARGS__)
		/**
		* dwc3_gadget_ep_cmd_string - returns endpoint command string
		* @cmd: command code

drivers/usb/dwc3/ep0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep ep, struct usb_request request,
		u32 reg;

		spin_lock_irqsave(&dwc->lock, flags);
		if (!dep->endpoint.desc) {
		if (!dep->endpoint.desc \|\| !dwc->pullups_connected) {
		dwc3_trace(trace_dwc3_ep0,
		"trying to queue request %pK to disabled %s",
		request, dep->name);

drivers/usb/dwc3/gadget.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -1291,7 +1291,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep dep, struct dwc3_request req)
		struct dwc3 *dwc = dep->dwc;
		int ret;

		if (!dep->endpoint.desc) {
		if (!dep->endpoint.desc \|\| !dwc->pullups_connected) {
		dwc3_trace(trace_dwc3_gadget,
		"trying to queue request %pK to disabled %s",
		&req->request, dep->endpoint.name);
		@@ -2032,6 +2032,7 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
		} else {
		dbg_event(0xFF, "Pullup_disable", is_on);
		dwc3_gadget_disable_irq(dwc);
		dwc->pullups_connected = false;
		__dwc3_gadget_ep_disable(dwc->eps[0]);
		__dwc3_gadget_ep_disable(dwc->eps[1]);

		@@ -2047,8 +2048,6 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)

		if (dwc->has_hibernation && !suspend)
		reg &= ~DWC3_DCTL_KEEP_CONNECT;

		dwc->pullups_connected = false;
		}

		dwc3_writel(dwc->regs, DWC3_DCTL, reg);
		@@ -2804,11 +2803,12 @@ static void dwc3_endpoint_transfer_complete(struct dwc3 *dwc,
		}

		/*
		* Our endpoint might get disabled by another thread during
		* dwc3_gadget_giveback(). If that happens, we're just gonna return 1
		* early on so DWC3_EP_BUSY flag gets cleared
		* Our endpoint might get disabled by another thread or stop
		* active transfer is invoked with pull up disable during
		* dwc3_gadget_giveback(). If that happens, we're just gonna
		* return 1 early on so DWC3_EP_BUSY flag gets cleared.
		*/
		if (!dep->endpoint.desc)
		if (!dep->endpoint.desc \|\| !dwc->pullups_connected)
		return;

		if (!usb_endpoint_xfer_isoc(dep->endpoint.desc)) {