Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5054e9ae authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Greg Kroah-Hartman
Browse files

xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending 



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: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20211210141735.1384209-2-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3db1cbe2

drivers/usb/host/xhci.c

+0 −4
Original line number Diff line number Diff line
@@ -3810,7 +3810,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev) 
	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
@@ -3818,7 +3817,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev) 
	 */

	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
@@ -3969,14 +3967,12 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev) 


	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? */