usb: dwc3: gadget: decrease the queued_requests in removal

usb: dwc3: gadget: decrease the queued_requests in removal

[Lipengcheng]

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 <lpc.li@hisilicon.com>
---
drivers/usb/dwc3/gadget.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)

--
2.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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);
    }

usb: dwc3: gadget: decrease the queued_requests in removal

[Felipe Balbi]

Hi,

Lipengcheng <lpc.li@hisilicon.com> 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 <lpc.li@hisilicon.com>
> ---
> 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