From 2fc6d4be35fb1e262f209758e25bfe2b7a113a7f Mon Sep 17 00:00:00 2001

From: Felipe Balbi <felipe.balbi@linux.intel.com>

Date: Wed, 1 Aug 2018 09:37:34 +0300

Subject: [PATCH] usb: dwc3: gadget: fix ISOC TRB type on unaligned transfers

Git-commit: 2fc6d4be35fb1e262f209758e25bfe2b7a113a7f

Patch-mainline: v4.20-rc4

References: bsc#1051510

When chaining ISOC TRBs together, only the first ISOC TRB should be of

type ISOC_FIRST, all others should be of type ISOC. This patch fixes

that.

Fixes: c6267a51639b ("usb: dwc3: gadget: align transfers to wMaxPacketSize")

Cc: <stable@vger.kernel.org> # v4.11+

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/usb/dwc3/gadget.c | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c

index 06e22afdf3d1..9faad896b3a1 100644

--- a/drivers/usb/dwc3/gadget.c

+++ b/drivers/usb/dwc3/gadget.c

@@ -1081,7 +1081,7 @@ static void dwc3_prepare_one_trb_sg(struct dwc3_ep *dep,

 			/* Now prepare one extra TRB to align transfer size */

 			trb = &dep->trb_pool[dep->trb_enqueue];

 			__dwc3_prepare_one_trb(dep, trb, dwc->bounce_addr,

-					maxp - rem, false, 0,

+					maxp - rem, false, 1,

 					req->request.stream_id,

 					req->request.short_not_ok,

 					req->request.no_interrupt);

@@ -1125,7 +1125,7 @@ static void dwc3_prepare_one_trb_linear(struct dwc3_ep *dep,

 		/* Now prepare one extra TRB to align transfer size */

 		trb = &dep->trb_pool[dep->trb_enqueue];

 		__dwc3_prepare_one_trb(dep, trb, dwc->bounce_addr, maxp - rem,

-				false, 0, req->request.stream_id,

+				false, 1, req->request.stream_id,

 				req->request.short_not_ok,

 				req->request.no_interrupt);

 	} else if (req->request.zero && req->request.length &&

@@ -1141,7 +1141,7 @@ static void dwc3_prepare_one_trb_linear(struct dwc3_ep *dep,

 		/* Now prepare one extra TRB to handle ZLP */

 		trb = &dep->trb_pool[dep->trb_enqueue];

 		__dwc3_prepare_one_trb(dep, trb, dwc->bounce_addr, 0,

-				false, 0, req->request.stream_id,

+				false, 1, req->request.stream_id,

 				req->request.short_not_ok,

 				req->request.no_interrupt);

 	} else {

-- 

2.19.1