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

Commit 66b76dbe authored by Stefan Wahren's avatar Stefan Wahren Committed by Peter Chen
Browse files

usb: chipidea: udc: move write barrier into hw_ep_prime 



Since there should be a write barrier before every call of
hw_ep_prime we could move it into hw_ep_prime.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
parent 050bc4e8

drivers/usb/chipidea/udc.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -188,6 +188,9 @@ static int hw_ep_prime(struct ci_hdrc *ci, int num, int dir, int is_ctrl) 
{

{

	int n = hw_ep_bit(num, dir);

	int n = hw_ep_bit(num, dir);





	/* Synchronize before ep prime */

	wmb();



	if (is_ctrl && dir == RX && hw_read(ci, OP_ENDPTSETUPSTAT, BIT(num)))

	if (is_ctrl && dir == RX && hw_read(ci, OP_ENDPTSETUPSTAT, BIT(num)))

		return -EAGAIN;

		return -EAGAIN;
@@ -506,8 +509,6 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) 
		hwep->qh.ptr->cap |= mul << __ffs(QH_MULT);

		hwep->qh.ptr->cap |= mul << __ffs(QH_MULT);

	}

	}





	wmb();   /* synchronize before ep prime */



	ret = hw_ep_prime(ci, hwep->num, hwep->dir,

	ret = hw_ep_prime(ci, hwep->num, hwep->dir,

			   hwep->type == USB_ENDPOINT_XFER_CONTROL);

			   hwep->type == USB_ENDPOINT_XFER_CONTROL);

done:

done:
@@ -534,9 +535,6 @@ static int reprime_dtd(struct ci_hdrc *ci, struct ci_hw_ep *hwep, 
	hwep->qh.ptr->td.token &=

	hwep->qh.ptr->td.token &=

		cpu_to_le32(~(TD_STATUS_HALTED | TD_STATUS_ACTIVE));

		cpu_to_le32(~(TD_STATUS_HALTED | TD_STATUS_ACTIVE));





	/* Synchronize before ep prime */

	wmb();



	return hw_ep_prime(ci, hwep->num, hwep->dir,

	return hw_ep_prime(ci, hwep->num, hwep->dir,

				hwep->type == USB_ENDPOINT_XFER_CONTROL);

				hwep->type == USB_ENDPOINT_XFER_CONTROL);

}

}