Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c140bebb authored by Thinh Nguyen's avatar Thinh Nguyen Committed by Greg Kroah-Hartman
Browse files

usb: dwc3: gadget: Reclaim extra TRBs after request completion 



[ Upstream commit 690e5c2dc29f8891fcfd30da67e0d5837c2c9df5 ]

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: 1f512119 ("usb: dwc3: gadget: add remaining sg entries to ring")
Signed-off-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b77df211

drivers/usb/dwc3/gadget.c

+5 −5
Original line number Diff line number Diff line
@@ -2386,6 +2386,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);
@@ -2401,11 +2406,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: