lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 140/171] xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending
    Date
    From: Kai-Heng Feng <kai.heng.feng@canonical.com>

    commit 811ae81320da53a5670c36970cefacca8519f90e upstream.

    When the xHCI is quirked with XHCI_RESET_ON_RESUME, runtime resume
    routine also resets the controller.

    This is bad for USB drivers without reset_resume callback, because
    there's no subsequent call of usb_dev_complete() ->
    usb_resume_complete() to force rebinding the driver to the device. For
    instance, btusb device stops working after xHCI controller is runtime
    resumed, if the controlled is quirked with XHCI_RESET_ON_RESUME.

    So always take XHCI_RESET_ON_RESUME into account to solve the issue.

    Cc: <stable@vger.kernel.org>
    Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
    Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
    Link: https://lore.kernel.org/r/20211210141735.1384209-2-mathias.nyman@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/usb/host/xhci.c | 4 ----
    1 file changed, 4 deletions(-)

    --- a/drivers/usb/host/xhci.c
    +++ b/drivers/usb/host/xhci.c
    @@ -3934,7 +3934,6 @@ static void xhci_free_dev(struct usb_hcd
    struct xhci_slot_ctx *slot_ctx;
    int i, ret;

    -#ifndef CONFIG_USB_DEFAULT_PERSIST
    /*
    * We called pm_runtime_get_noresume when the device was attached.
    * Decrement the counter here to allow controller to runtime suspend
    @@ -3942,7 +3941,6 @@ static void xhci_free_dev(struct usb_hcd
    */
    if (xhci->quirks & XHCI_RESET_ON_RESUME)
    pm_runtime_put_noidle(hcd->self.controller);
    -#endif

    ret = xhci_check_args(hcd, udev, NULL, 0, true, __func__);
    /* If the host is halted due to driver unload, we still need to free the
    @@ -4094,14 +4092,12 @@ int xhci_alloc_dev(struct usb_hcd *hcd,

    xhci_debugfs_create_slot(xhci, slot_id);

    -#ifndef CONFIG_USB_DEFAULT_PERSIST
    /*
    * If resetting upon resume, we can't put the controller into runtime
    * suspend if there is a device attached.
    */
    if (xhci->quirks & XHCI_RESET_ON_RESUME)
    pm_runtime_get_noresume(hcd->self.controller);
    -#endif

    /* Is this a LS or FS device under a HS hub? */
    /* Hub or peripherial? */

    \
     
     \ /
      Last update: 2021-12-13 11:10    [W:3.167 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site