lkml.org 
[lkml]   [2021]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 021/103] usb: dwc3: gadget: Stop EP0 transfers during pullup disable
    Date
    From: Wesley Cheng <wcheng@codeaurora.org>

    commit 4a1e25c0a029b97ea4a3d423a6392bfacc3b2e39 upstream.

    During a USB cable disconnect, or soft disconnect scenario, a pending
    SETUP transaction may not be completed, leading to the following
    error:

    dwc3 a600000.dwc3: timed out waiting for SETUP phase

    If this occurs, then the entire pullup disable routine is skipped and
    proper cleanup and halting of the controller does not complete.

    Instead of returning an error (which is ignored from the UDC
    perspective), allow the pullup disable routine to continue, which
    will also handle disabling of EP0/1. This will end any active
    transfers as well. Ensure to clear any delayed_status also, as the
    timeout could happen within the STATUS stage.

    Fixes: bb0147364850 ("usb: dwc3: gadget: don't clear RUN/STOP when it's invalid to do so")
    Cc: <stable@vger.kernel.org>
    Reviewed-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
    Acked-by: Felipe Balbi <balbi@kernel.org>
    Signed-off-by: Wesley Cheng <wcheng@codeaurora.org>
    Link: https://lore.kernel.org/r/20210825042855.7977-1-wcheng@codeaurora.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/dwc3/gadget.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    --- a/drivers/usb/dwc3/gadget.c
    +++ b/drivers/usb/dwc3/gadget.c
    @@ -2125,10 +2125,8 @@ static int dwc3_gadget_pullup(struct usb

    ret = wait_for_completion_timeout(&dwc->ep0_in_setup,
    msecs_to_jiffies(DWC3_PULL_UP_TIMEOUT));
    - if (ret == 0) {
    - dev_err(dwc->dev, "timed out waiting for SETUP phase\n");
    - return -ETIMEDOUT;
    - }
    + if (ret == 0)
    + dev_warn(dwc->dev, "timed out waiting for SETUP phase\n");
    }

    /*
    @@ -2332,6 +2330,7 @@ static int __dwc3_gadget_start(struct dw
    /* begin to receive SETUP packets */
    dwc->ep0state = EP0_SETUP_PHASE;
    dwc->link_state = DWC3_LINK_STATE_SS_DIS;
    + dwc->delayed_status = false;
    dwc3_ep0_out_start(dwc);

    dwc3_gadget_enable_irq(dwc);

    \
     
     \ /
      Last update: 2021-09-01 14:38    [W:3.032 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site