lkml.org 
[lkml]   [2017]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RESEND x2][PATCH 1/3] usb: dwc2: Improve gadget state disconnection handling
    Date
    In the earlier commit dad3f793f20f ("usb: dwc2: Make sure we
    disconnect the gadget state"), I was trying to fix up the
    fact that we somehow weren't disconnecting the gadget state,
    so that when the OTG port was plugged in the second time we
    would get warnings about the state tracking being wrong.

    The fix there was somewhat simple, as it just made sure to
    call dwc2_hsotg_disconnect() before we connected things up
    in OTG mode.

    But in looking at a different issue I was seeing with UDC
    state handling, I realized that it would be much better
    to call dwc2_hsotg_disconnect when we get the state change
    signal moving to host mode.

    Thus, this patch removes the earlier disconnect call I added
    and moves it (and the needed locking) to the host mode
    transition.

    Cc: Wei Xu <xuwei5@hisilicon.com>
    Cc: Guodong Xu <guodong.xu@linaro.org>
    Cc: Amit Pundir <amit.pundir@linaro.org>
    Cc: YongQin Liu <yongqin.liu@linaro.org>
    Cc: John Youn <johnyoun@synopsys.com>
    Cc: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com>
    Cc: Douglas Anderson <dianders@chromium.org>
    Cc: Chen Yu <chenyu56@huawei.com>
    Cc: Felipe Balbi <felipe.balbi@linux.intel.com>
    Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Cc: linux-usb@vger.kernel.org
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    ---
    drivers/usb/dwc2/hcd.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
    index c263114..df54428 100644
    --- a/drivers/usb/dwc2/hcd.c
    +++ b/drivers/usb/dwc2/hcd.c
    @@ -3277,7 +3277,6 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
    dwc2_core_init(hsotg, false);
    dwc2_enable_global_interrupts(hsotg);
    spin_lock_irqsave(&hsotg->lock, flags);
    - dwc2_hsotg_disconnect(hsotg);
    dwc2_hsotg_core_init_disconnected(hsotg, false);
    spin_unlock_irqrestore(&hsotg->lock, flags);
    dwc2_hsotg_core_connect(hsotg);
    @@ -3296,8 +3295,13 @@ static void dwc2_conn_id_status_change(struct work_struct *work)
    if (count > 250)
    dev_err(hsotg->dev,
    "Connection id status change timed out\n");
    - hsotg->op_state = OTG_STATE_A_HOST;

    + spin_lock_irqsave(&hsotg->lock, flags);
    + dwc2_hsotg_disconnect(hsotg);
    + dwc2_hsotg_core_init_disconnected(hsotg, false);
    + spin_unlock_irqrestore(&hsotg->lock, flags);
    +
    + hsotg->op_state = OTG_STATE_A_HOST;
    /* Initialize the Core for Host mode */
    dwc2_core_init(hsotg, false);
    dwc2_enable_global_interrupts(hsotg);
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-09-21 19:24    [W:5.041 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site