usb: dwc3: Stop active transfers before halting the controller (ae7e8610) · Commits · 戴 / test

drivers/usb/dwc3/ep0.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -197,7 +197,7 @@ int dwc3_gadget_ep0_queue(struct usb_ep ep, struct usb_request request,
		int ret;

		spin_lock_irqsave(&dwc->lock, flags);
		if (!dep->endpoint.desc) {
		if (!dep->endpoint.desc \|\| !dwc->pullups_connected) {
		dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",
		dep->name);
		ret = -ESHUTDOWN;

drivers/usb/dwc3/gadget.c

+65 −1

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

		if (!dep->endpoint.desc) {
		if (!dep->endpoint.desc \|\| !dwc->pullups_connected) {
		dev_err(dwc->dev, "%s: can't queue to disabled endpoint\n",
		dep->name);
		return -ESHUTDOWN;
		@@ -1999,6 +1999,21 @@ static int dwc3_gadget_set_selfpowered(struct usb_gadget *g,
		return 0;
		}

		static void dwc3_stop_active_transfers(struct dwc3 *dwc)
		{
		u32 epnum;

		for (epnum = 2; epnum < dwc->num_eps; epnum++) {
		struct dwc3_ep *dep;

		dep = dwc->eps[epnum];
		if (!dep)
		continue;

		dwc3_remove_requests(dwc, dep);
		}
		}

		static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
		{
		u32 reg;
		@@ -2044,6 +2059,9 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
		return 0;
		}

		static void dwc3_gadget_disable_irq(struct dwc3 *dwc);
		static void __dwc3_gadget_stop(struct dwc3 *dwc);

		static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
		{
		struct dwc3 *dwc = gadget_to_dwc(g);
		@@ -2067,7 +2085,46 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
		}
		}

		/*
		* Synchronize any pending event handling before executing the controller
		* halt routine.
		*/
		if (!is_on) {
		dwc3_gadget_disable_irq(dwc);
		synchronize_irq(dwc->irq_gadget);
		}

		spin_lock_irqsave(&dwc->lock, flags);

		if (!is_on) {
		u32 count;

		/*
		* In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a
		* Section 4.1.8 Table 4-7, it states that for a device-initiated
		* disconnect, the SW needs to ensure that it sends "a DEPENDXFER
		* command for any active transfers" before clearing the RunStop
		* bit.
		*/
		dwc3_stop_active_transfers(dwc);
		__dwc3_gadget_stop(dwc);

		/*
		* In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a
		* Section 1.3.4, it mentions that for the DEVCTRLHLT bit, the
		* "software needs to acknowledge the events that are generated
		* (by writing to GEVNTCOUNTn) while it is waiting for this bit
		* to be set to '1'."
		*/
		count = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0));
		count &= DWC3_GEVNTCOUNT_MASK;
		if (count > 0) {
		dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), count);
		dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) %
		dwc->ev_buf->length;
		}
		}

		ret = dwc3_gadget_run_stop(dwc, is_on, false);
		spin_unlock_irqrestore(&dwc->lock, flags);

		@@ -3200,6 +3257,13 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc)
		}

		dwc3_reset_gadget(dwc);
		/*
		* In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a
		* Section 4.1.2 Table 4-2, it states that during a USB reset, the SW
		* needs to ensure that it sends "a DEPENDXFER command for any active
		* transfers."
		*/
		dwc3_stop_active_transfers(dwc);

		reg = dwc3_readl(dwc->regs, DWC3_DCTL);
		reg &= ~DWC3_DCTL_TSTCTRL_MASK;

Admin message