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

Commit 9e506438 authored by Michael Grzeschik's avatar Michael Grzeschik Committed by Greg Kroah-Hartman
Browse files

usb: chipidea: udc: read status of td only once in hardware_dequeue 



This patch changes the read of the td status to one atomic operation to
analyse coherent bits.

Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
[Alex: fixed backwards endianness conversion]
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 776ffc16

drivers/usb/chipidea/udc.c

+5 −3
Original line number Diff line number Diff line
@@ -481,10 +481,12 @@ static int _hardware_enqueue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq) 
 */

static int _hardware_dequeue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq)

{

	u32 tmptoken = le32_to_cpu(mReq->ptr->token);



	if (mReq->req.status != -EALREADY)

		return -EINVAL;



	if ((cpu_to_le32(TD_STATUS_ACTIVE) & mReq->ptr->token) != 0)

	if ((TD_STATUS_ACTIVE & tmptoken) != 0)

		return -EBUSY;



	if (mReq->zptr) {
@@ -498,7 +500,7 @@ static int _hardware_dequeue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq) 


	usb_gadget_unmap_request(&mEp->ci->gadget, &mReq->req, mEp->dir);



	mReq->req.status = le32_to_cpu(mReq->ptr->token) & TD_STATUS;

	mReq->req.status = tmptoken & TD_STATUS;

	if ((TD_STATUS_HALTED & mReq->req.status) != 0)

		mReq->req.status = -1;

	else if ((TD_STATUS_DT_ERR & mReq->req.status) != 0)
@@ -506,7 +508,7 @@ static int _hardware_dequeue(struct ci13xxx_ep *mEp, struct ci13xxx_req *mReq) 
	else if ((TD_STATUS_TR_ERR & mReq->req.status) != 0)

		mReq->req.status = -1;



	mReq->req.actual   = le32_to_cpu(mReq->ptr->token) & TD_TOTAL_BYTES;

	mReq->req.actual   = tmptoken & TD_TOTAL_BYTES;

	mReq->req.actual >>= __ffs(TD_TOTAL_BYTES);

	mReq->req.actual   = mReq->req.length - mReq->req.actual;

	mReq->req.actual   = mReq->req.status ? 0 : mReq->req.actual;