2017-12-25 03:41:49

by Lipengcheng

[permalink] [raw]

Subject: [PATCH] usb: dwc3: gadget: decrease the queued_requests in removal

---

In removal requests, it is necessary to make the corresponding trb
disable state (HWO = 1) and dep->queued_requests a corresponding reduction.
It is better to use a alone funtion to disable trb (HWO = 0).

Signed-off-by: Pengcheng Li <[email protected]>
---
drivers/usb/dwc3/gadget.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 1e6c42e..273b51d 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -707,6 +707,36 @@ static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep)
??? while (!list_empty(&dep->started_list)) {
??????? req = next_request(&dep->started_list);

+?????? if (req->trb) {
+?????????? if (req->num_pending_sgs) {
+?????????????? struct dwc3_trb *trb;
+?????????????? int i = 0;
+
+?????????????? for (i = 0; i < req->num_pending_sgs; i++) {
+?????????????????? trb = req->trb + i;
+?????????????????? trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
+?????????????????? dwc3_ep_inc_deq(dep);
+?????????????? }
+
+?????????????? if (req->unaligned || req->zero) {
+?????????????????? trb = req->trb + req->num_pending_sgs + 1;
+?????????????????? trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
+?????????????????? dwc3_ep_inc_deq(dep);
+?????????????? }
+?????????? } else {
+?????????????? struct dwc3_trb *trb = req->trb;
+
+?????????????? trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
+?????????????? dwc3_ep_inc_deq(dep);
+
+?????????????? if (req->unaligned || req->zero) {
+????????? ?????????trb = req->trb + 1;
+?????????????????? trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
+?????????????????? dwc3_ep_inc_deq(dep);
+?????????????? }
+?????????? }
+?????? }
+?????? dep->queued_requests--;
??????? dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
??? }

--
2.7.4

2018-01-08 11:53:39

by Felipe Balbi

[permalink] [raw]

Subject: Re: [PATCH] usb: dwc3: gadget: decrease the queued_requests in removal

---

Hi,

Lipengcheng <[email protected]> writes:
> In removal requests, it is necessary to make the corresponding trb
> disable state (HWO = 1) and dep->queued_requests a corresponding reduction.
> It is better to use a alone funtion to disable trb (HWO = 0).

this shouldn't be necessary. What problem are you facing? what happens?
Where are the tracepoint logs? Which kernel are you using? did you try
mainline?

> Signed-off-by: Pengcheng Li <[email protected]>
> ---
> drivers/usb/dwc3/gadget.c | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
> diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
> index 1e6c42e..273b51d 100644
> --- a/drivers/usb/dwc3/gadget.c
> +++ b/drivers/usb/dwc3/gadget.c
> @@ -707,6 +707,36 @@ static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep)
>     while (!list_empty(&dep->started_list)) {

why all these underscore characters? Are you sending html emails?

>         req = next_request(&dep->started_list);
>
> +       if (req->trb) {
> +           if (req->num_pending_sgs) {
> +               struct dwc3_trb *trb;
> +               int i = 0;
> +
> +               for (i = 0; i < req->num_pending_sgs; i++) {
> +                   trb = req->trb + i;
> +                   trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
> +                   dwc3_ep_inc_deq(dep);
> +               }
> +
> +               if (req->unaligned || req->zero) {
> +                   trb = req->trb + req->num_pending_sgs + 1;
> +                   trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
> +                   dwc3_ep_inc_deq(dep);
> +               }
> +           } else {
> +               struct dwc3_trb *trb = req->trb;
> +
> +               trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
> +               dwc3_ep_inc_deq(dep);
> +
> +               if (req->unaligned || req->zero) {
> +                   trb = req->trb + 1;
> +                   trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
> +                   dwc3_ep_inc_deq(dep);
> +               }
> +           }
> +       }
> +       dep->queued_requests--;
>         dwc3_gadget_giveback(dep, req, -ESHUTDOWN);
>     }

you have a lot to fix here.

--
balbi

---

Attachments:

signature.asc (832.00 B)