Commit f616c3bd authored by Pawel Laszczak's avatar Pawel Laszczak Committed by Greg Kroah-Hartman
Browse files

usb: cdns3: Fix dequeue implementation. 



Dequeuing implementation in cdns3_gadget_ep_dequeue gets first request from
deferred_req_list and changed TRB associated with it to LINK TRB.
This approach is incorrect because deferred_req_list contains requests
that have not been placed on hardware RING.  In this case driver should
just giveback this request to gadget driver.

The patch implements new approach that first checks where dequeuing
request is located and only when it's on Transfer Ring then changes TRB
associated with it to LINK TRB.
During processing completed transfers such LINK TRB will be ignored.

Reported-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarPawel Laszczak <pawell@cadence.com>
Fixes: 7733f6c3 ("usb: cdns3: Add Cadence USB3 DRD Driver")
Reviewed-by: default avatarPeter Chen <peter.chen@nxp.com>
Link: https://lore.kernel.org/r/1570958420-22196-1-git-send-email-pawell@cadence.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd47a417

drivers/usb/cdns3/gadget.c

+20 −15
Original line number Diff line number Diff line
@@ -1145,6 +1145,14 @@ static void cdns3_transfer_completed(struct cdns3_device *priv_dev, 
		request = cdns3_next_request(&priv_ep->pending_req_list);

		priv_req = to_cdns3_request(request);



		trb = priv_ep->trb_pool + priv_ep->dequeue;



		/* Request was dequeued and TRB was changed to TRB_LINK. */

		if (TRB_FIELD_TO_TYPE(trb->control) == TRB_LINK) {

			trace_cdns3_complete_trb(priv_ep, trb);

			cdns3_move_deq_to_next_trb(priv_req);

		}



		/* Re-select endpoint. It could be changed by other CPU during

		 * handling usb_gadget_giveback_request.

		 */
@@ -2067,6 +2075,7 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, 
	struct usb_request *req, *req_temp;

	struct cdns3_request *priv_req;

	struct cdns3_trb *link_trb;

	u8 req_on_hw_ring = 0;

	unsigned long flags;

	int ret = 0;
@@ -2083,9 +2092,11 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, 


	list_for_each_entry_safe(req, req_temp, &priv_ep->pending_req_list,

				 list) {

		if (request == req)

		if (request == req) {

			req_on_hw_ring = 1;

			goto found;

		}

	}



	list_for_each_entry_safe(req, req_temp, &priv_ep->deferred_req_list,

				 list) {
@@ -2096,27 +2107,21 @@ int cdns3_gadget_ep_dequeue(struct usb_ep *ep, 
	goto not_found;



found:



	if (priv_ep->wa1_trb == priv_req->trb)

		cdns3_wa1_restore_cycle_bit(priv_ep);



	link_trb = priv_req->trb;

	cdns3_move_deq_to_next_trb(priv_req);

	cdns3_gadget_giveback(priv_ep, priv_req, -ECONNRESET);



	/* Update ring */

	request = cdns3_next_request(&priv_ep->deferred_req_list);

	if (request) {

		priv_req = to_cdns3_request(request);



	/* Update ring only if removed request is on pending_req_list list */

	if (req_on_hw_ring) {

		link_trb->buffer = TRB_BUFFER(priv_ep->trb_pool_dma +

					      (priv_req->start_trb * TRB_SIZE));

		link_trb->control = (link_trb->control & TRB_CYCLE) |

				    TRB_TYPE(TRB_LINK) | TRB_CHAIN | TRB_TOGGLE;

	} else {

		priv_ep->flags |= EP_UPDATE_EP_TRBADDR;

				    TRB_TYPE(TRB_LINK) | TRB_CHAIN;



		if (priv_ep->wa1_trb == priv_req->trb)

			cdns3_wa1_restore_cycle_bit(priv_ep);

	}



	cdns3_gadget_giveback(priv_ep, priv_req, -ECONNRESET);



not_found:

	spin_unlock_irqrestore(&priv_dev->lock, flags);

	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE