2021-04-19 09:05:04

by Pawel Laszczak

Subject: [PATCH 2/2] usb: cdnsp: Fix lack of removing request from pending list.

From: Pawel Laszczak <[email protected]>

Patch fixes lack of removing request from ep->pending_list on failure
of the stop endpoint command. Driver even after failing this command
must remove request from ep->pending_list.
Without this fix driver can stuck in cdnsp_gadget_ep_disable function
in loop:
while (!list_empty(&pep->pending_list)) {
preq = next_request(&pep->pending_list);
cdnsp_ep_dequeue(pep, preq);
}

Signed-off-by: Pawel Laszczak <[email protected]>
---
drivers/usb/cdns3/cdnsp-gadget.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/cdns3/cdnsp-gadget.c b/drivers/usb/cdns3/cdnsp-gadget.c
index 6182c9bc65de..1ca8c1777a5c 100644
--- a/drivers/usb/cdns3/cdnsp-gadget.c
+++ b/drivers/usb/cdns3/cdnsp-gadget.c
@@ -424,17 +424,17 @@ int cdnsp_ep_enqueue(struct cdnsp_ep *pep, struct cdnsp_request *preq)
int cdnsp_ep_dequeue(struct cdnsp_ep *pep, struct cdnsp_request *preq)
{
struct cdnsp_device *pdev = pep->pdev;
- int ret;
+ int ret_stop = 0;
+ int ret_rem;

trace_cdnsp_request_dequeue(preq);

- if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING) {
- ret = cdnsp_cmd_stop_ep(pdev, pep);
- if (ret)
- return ret;
- }
+ if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING)
+ ret_stop = cdnsp_cmd_stop_ep(pdev, pep);
+
+ ret_rem = cdnsp_remove_request(pdev, preq, pep);

- return cdnsp_remove_request(pdev, preq, pep);
+ return ret_rem ? ret_rem : ret_stop;
}

static void cdnsp_zero_in_ctx(struct cdnsp_device *pdev)
--
2.25.1

2021-04-20 01:16:32

by Peter Chen

Subject: Re: [PATCH 2/2] usb: cdnsp: Fix lack of removing request from pending list.

On 21-04-19 09:53:11, Pawel Laszczak wrote:
> From: Pawel Laszczak <[email protected]>
>
> Patch fixes lack of removing request from ep->pending_list on failure
> of the stop endpoint command. Driver even after failing this command
> must remove request from ep->pending_list.
> Without this fix driver can stuck in cdnsp_gadget_ep_disable function
> in loop:
> while (!list_empty(&pep->pending_list)) {
> preq = next_request(&pep->pending_list);
> cdnsp_ep_dequeue(pep, preq);
> }
>
> Signed-off-by: Pawel Laszczak <[email protected]>
> ---
> drivers/usb/cdns3/cdnsp-gadget.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/cdns3/cdnsp-gadget.c b/drivers/usb/cdns3/cdnsp-gadget.c
> index 6182c9bc65de..1ca8c1777a5c 100644
> --- a/drivers/usb/cdns3/cdnsp-gadget.c
> +++ b/drivers/usb/cdns3/cdnsp-gadget.c
> @@ -424,17 +424,17 @@ int cdnsp_ep_enqueue(struct cdnsp_ep *pep, struct cdnsp_request *preq)
> int cdnsp_ep_dequeue(struct cdnsp_ep *pep, struct cdnsp_request *preq)
> {
> struct cdnsp_device *pdev = pep->pdev;
> - int ret;
> + int ret_stop = 0;
> + int ret_rem;
>
> trace_cdnsp_request_dequeue(preq);
>
> - if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING) {
> - ret = cdnsp_cmd_stop_ep(pdev, pep);
> - if (ret)
> - return ret;
> - }
> + if (GET_EP_CTX_STATE(pep->out_ctx) == EP_STATE_RUNNING)
> + ret_stop = cdnsp_cmd_stop_ep(pdev, pep);
> +
> + ret_rem = cdnsp_remove_request(pdev, preq, pep);

One more blank space above, and add Fixed-by tag.

>
> - return cdnsp_remove_request(pdev, preq, pep);
> + return ret_rem ? ret_rem : ret_stop;
> }
>
> static void cdnsp_zero_in_ctx(struct cdnsp_device *pdev)
> --
> 2.25.1
>

--

Thanks,
Peter Chen