usb: dwc3: gadget: Reclaim extra TRBs after request completion (690e5c2d) · Commits · 戴 / test

An SG request may be partially completed (due to no available TRBs). Don't reclaim extra TRBs and clear the needs_extra_trb flag until the request is fully completed. Otherwise, the driver will reclaim the wrong TRB. Cc: stable@vger.kernel.org Fixes: ("usb: dwc3: gadget: add remaining sg entries to ring") Signed-off-by:

Thinh Nguyen <Thinh.Nguyen@synopsys.com> Signed-off-by:

Felipe Balbi <balbi@kernel.org>

drivers/usb/dwc3/gadget.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -2744,6 +2744,11 @@ static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep,
		ret = dwc3_gadget_ep_reclaim_trb_linear(dep, req, event,
		status);

		req->request.actual = req->request.length - req->remaining;

		if (!dwc3_gadget_ep_request_completed(req))
		goto out;

		if (req->needs_extra_trb) {
		unsigned int maxp = usb_endpoint_maxp(dep->endpoint.desc);

		@@ -2759,11 +2764,6 @@ static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep,
		req->needs_extra_trb = false;
		}

		req->request.actual = req->request.length - req->remaining;

		if (!dwc3_gadget_ep_request_completed(req))
		goto out;

		dwc3_gadget_giveback(dep, req, status);

		out:

Admin message