Commit 141e70fe authored by Peter Chen's avatar Peter Chen Committed by Felipe Balbi
Browse files

usb: cdns3: gadget: need to handle sg case for workaround 2 case 



Add sg case for workaround 2, the workaround 2 is described at the
beginning of this file.

Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarFelipe Balbi <balbi@kernel.org>
parent 249f0a25

drivers/usb/cdns3/gadget.c

+31 −13
Original line number Diff line number Diff line
@@ -462,6 +462,36 @@ static int cdns3_start_all_request(struct cdns3_device *priv_dev, 
		(reg) |= EP_STS_EN_DESCMISEN; \

	} } while (0)



static void __cdns3_descmiss_copy_data(struct usb_request *request,

	struct usb_request *descmiss_req)

{

	int length = request->actual + descmiss_req->actual;

	struct scatterlist *s = request->sg;



	if (!s) {

		if (length <= request->length) {

			memcpy(&((u8 *)request->buf)[request->actual],

			       descmiss_req->buf,

			       descmiss_req->actual);

			request->actual = length;

		} else {

			/* It should never occures */

			request->status = -ENOMEM;

		}

	} else {

		if (length <= sg_dma_len(s)) {

			void *p = phys_to_virt(sg_dma_address(s));



			memcpy(&((u8 *)p)[request->actual],

				descmiss_req->buf,

				descmiss_req->actual);

			request->actual = length;

		} else {

			request->status = -ENOMEM;

		}

	}

}



/**

 * cdns3_wa2_descmiss_copy_data copy data from internal requests to

 * request queued by class driver.
@@ -488,21 +518,9 @@ static void cdns3_wa2_descmiss_copy_data(struct cdns3_endpoint *priv_ep, 


		chunk_end = descmiss_priv_req->flags & REQUEST_INTERNAL_CH;

		length = request->actual + descmiss_req->actual;



		request->status = descmiss_req->status;



		if (length <= request->length) {

			memcpy(&((u8 *)request->buf)[request->actual],

			       descmiss_req->buf,

			       descmiss_req->actual);

			request->actual = length;

		} else {

			/* It should never occures */

			request->status = -ENOMEM;

		}



		__cdns3_descmiss_copy_data(request, descmiss_req);

		list_del_init(&descmiss_priv_req->list);



		kfree(descmiss_req->buf);

		cdns3_gadget_ep_free_request(&priv_ep->endpoint, descmiss_req);

		--priv_ep->wa2_counter;