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

Commit b787d755 authored by Mian Yousaf Kaukab's avatar Mian Yousaf Kaukab Committed by Felipe Balbi
Browse files

usb: dwc2: gadget: don't process XferCompl on setup packet 



Only process DOEPINT.XferCompl on data packet as DOEPINTn.SetUp can
occur with or without DOEPINT.XferCompl. When DOEPINT.SetUp occurs
with DOEPINT.XferCompl, only DOEPINT.SetUp needs to be handled.

Moreover, ignore DOEPINT.XferCompl when it occurs with
DOEPINT.StupPktRcvd as driver needs to wait for DOEPINT.SetUp to
continue.

Tested-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Acked-by: default avatarPaul Zimmerman <paulz@synopsys.com>
Signed-off-by: default avatarMian Yousaf Kaukab <yousaf.kaukab@intel.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 6ff2e832

drivers/usb/dwc2/gadget.c

+4 −0
Original line number Diff line number Diff line
@@ -1810,6 +1810,10 @@ static void s3c_hsotg_epint(struct dwc2_hsotg *hsotg, unsigned int idx, 
	dev_dbg(hsotg->dev, "%s: ep%d(%s) DxEPINT=0x%08x\n",

		__func__, idx, dir_in ? "in" : "out", ints);



	/* Don't process XferCompl interrupt if it is a setup packet */

	if (idx == 0 && (ints & (DXEPINT_SETUP | DXEPINT_SETUP_RCVD)))

		ints &= ~DXEPINT_XFERCOMPL;



	if (ints & DXEPINT_XFERCOMPL) {

		if (hs_ep->isochronous && hs_ep->interval == 1) {

			if (ctrl & DXEPCTL_EOFRNUM)

drivers/usb/dwc2/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ 


#define DIEPINT(_a)			HSOTG_REG(0x908 + ((_a) * 0x20))

#define DOEPINT(_a)			HSOTG_REG(0xB08 + ((_a) * 0x20))

#define DXEPINT_SETUP_RCVD		(1 << 15)

#define DXEPINT_INEPNAKEFF		(1 << 6)

#define DXEPINT_BACK2BACKSETUP		(1 << 6)

#define DXEPINT_INTKNEPMIS		(1 << 5)