usb: dwc3: gadget: only unmap requests from DMA if mapped
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): 30102591E157244384E984126FC3CB4F30087964@us01wembx1.internal.synopsys.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): 30102591E157244384E984126FC3CB4F30087C69@us01wembx1.internal.synopsys.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): 30102591E157244384E984126FC3CB4F30088006@us01wembx1.internal.synopsys.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi,
Quoted 86 lines · Felipe Balbi
Hi,
Quoted 82 lines · Thinh Nguyen
Quoted 82 lines
Quoted 43 lines · Felipe Balbi
Quoted 30 lines · Thinh Nguyen
Hi Felipe,
Quoted 27 lines · Felipe Balbi
Quoted 26 lines
Quoted 26 lines
Quoted 10 lines
drivers/usb/dwc3/gadget.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/usb/dwc3/gadget.c +0
-0@@ -191,14 +191,16 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, req->started = false;drivers/usb/dwc3/gadget.c void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, · line 199
Quoted 10 lines
drivers/usb/dwc3/gadget.c +1
-3list_del (&req->list); - req->trb =NULL ; req->remaining =0 ;if (req->request.status == -EINPROGRESS ) req->request.status = status; -usb_gadget_unmap_request_by_dev (dwc->sysdev, - &req->request, req->direction); +if (req->trb)This check does not account for control data transfer. TRBs for ep0 are not set to its
req->trb. ep0out request needs to be unmapped, otherwise device will receive bogus data.Our internal test showed that the device failed to interpret control data from host. I bisected to this patch.
Quoted 6 lines
Quoted 1 line
what was the testing? How can I reproduce it?
This is a regression. The internal test found the issue when it does a 3-stage Control Write Transfer. You can reproduce this issue with just 1 out data packet of size > 0. Read and check the data on control request completion.
okay, is this enough to fix the problem for you?
modified
drivers/usb/dwc3/ep0.cReview static void dwc3_ep0_prepare_one_trb(struct dwc3_ep *dep, · line 55
Quoted 8 lines
(quoted diff) +3
-0@@ -48,6 +48,9 @@ static void dwc3_ep0_prepare_one_trb(struct dwc3_ep *dep, dwc = dep->dwc; trb = &dwc->ep0_trb[dep->trb_enqueue]; + if (!req->trb) + req->trb = trb; + if (chain) dep->trb_enqueue++;sorry, no. this is totally wrong :-) Here's a better version:
modified
drivers/usb/dwc3/ep0.c(quoted diff) +5
-0@@ -990,6 +990,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, DWC3_TRBCTL_CONTROL_DATA, true); + req->trb = &dwc->ep0_trb[dep->trb_enqueue - 1]; > + /* Now prepare one extra TRB to align transfer size */ dwc3_ep0_prepare_one_trb(dep, dwc->bounce_addr, maxpacket - rem,@@ -1015,6 +1017,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, DWC3_TRBCTL_CONTROL_DATA, true); + req->trb = &dwc->ep0_trb[dep->trb_enqueue - 1]; > + /* Now prepare one extra TRB to align transfer size */ dwc3_ep0_prepare_one_trb(dep, dwc->bounce_addr, 0, DWC3_TRBCTL_CONTROL_DATA,@@ -1029,6 +1033,9 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, dwc3_ep0_prepare_one_trb(dep, req->request.dma, req->request.length, DWC3_TRBCTL_CONTROL_DATA, false); + + req->trb = &dwc->ep0_trb[dep->trb_enqueue]; + ret = dwc3_ep0_start_trans(dep); }
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
(didn't even compile test)
Yes this works.
Thank you, I'll send this as a formal patch after merge window closes.
The fix for this patch is now in mainline. Please also apply it to stable kernel 4.13.x. Otherwise this regression will remain for the kernel 4.13.x.
Upstream:
commit 551684708356 ("usb: dwc3: ep0: fix DMA starvation by assigning req->trb on ep0")
Thanks,
Thinh
[email protected]
maintainerQuoted 98 lines · Thinh Nguyen
Hi,
Quoted 86 lines · Felipe Balbi
Hi,
Quoted 82 lines · Thinh Nguyen
Quoted 82 lines
Quoted 43 lines · Felipe Balbi
Quoted 30 lines · Thinh Nguyen
Hi Felipe,
Quoted 27 lines · Felipe Balbi
Quoted 26 lines
Quoted 26 lines
Quoted 10 lines
drivers/usb/dwc3/gadget.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)drivers/usb/dwc3/gadget.c +0
-0@@ -191,14 +191,16 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, req->started = false;drivers/usb/dwc3/gadget.c void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req, · line 199
Quoted 10 lines
drivers/usb/dwc3/gadget.c +1
-3list_del (&req->list); - req->trb =NULL ; req->remaining =0 ;if (req->request.status == -EINPROGRESS ) req->request.status = status; -usb_gadget_unmap_request_by_dev (dwc->sysdev, - &req->request, req->direction); +if (req->trb)This check does not account for control data transfer. TRBs for ep0 are not set to its
req->trb. ep0out request needs to be unmapped, otherwise device will receive bogus data.Our internal test showed that the device failed to interpret control data from host. I bisected to this patch.
Quoted 6 lines
Quoted 1 line
what was the testing? How can I reproduce it?
This is a regression. The internal test found the issue when it does a 3-stage Control Write Transfer. You can reproduce this issue with just 1 out data packet of size > 0. Read and check the data on control request completion.
okay, is this enough to fix the problem for you?
modified
drivers/usb/dwc3/ep0.cReview static void dwc3_ep0_prepare_one_trb(struct dwc3_ep *dep, · line 55
Quoted 8 lines
(quoted diff) +3
-0@@ -48,6 +48,9 @@ static void dwc3_ep0_prepare_one_trb(struct dwc3_ep *dep, dwc = dep->dwc; trb = &dwc->ep0_trb[dep->trb_enqueue]; + if (!req->trb) + req->trb = trb; + if (chain) dep->trb_enqueue++;sorry, no. this is totally wrong :-) Here's a better version:
modified
drivers/usb/dwc3/ep0.c(quoted diff) +5
-0@@ -990,6 +990,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, DWC3_TRBCTL_CONTROL_DATA, true); + req->trb = &dwc->ep0_trb[dep->trb_enqueue - 1]; > + /* Now prepare one extra TRB to align transfer size */ dwc3_ep0_prepare_one_trb(dep, dwc->bounce_addr, maxpacket - rem,@@ -1015,6 +1017,8 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, DWC3_TRBCTL_CONTROL_DATA, true); + req->trb = &dwc->ep0_trb[dep->trb_enqueue - 1]; > + /* Now prepare one extra TRB to align transfer size */ dwc3_ep0_prepare_one_trb(dep, dwc->bounce_addr, 0, DWC3_TRBCTL_CONTROL_DATA,@@ -1029,6 +1033,9 @@ static void __dwc3_ep0_do_control_data(struct dwc3 *dwc, dwc3_ep0_prepare_one_trb(dep, req->request.dma, req->request.length, DWC3_TRBCTL_CONTROL_DATA, false); + + req->trb = &dwc->ep0_trb[dep->trb_enqueue]; + ret = dwc3_ep0_start_trans(dep); }Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
(didn't even compile test)
Yes this works.
Thank you, I'll send this as a formal patch after merge window closes.
Quoted 7 lines
The fix for this patch is now in mainline. Please also apply it to stable kernel 4.13.x. Otherwise this regression will remain for the kernel 4.13.x.
Upstream:
commit 551684708356 ("usb: dwc3: ep0: fix DMA starvation by assigningreq->trbon ep0")
Now queued up, thanks.
greg k-h