mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
xhci: Add quirk to reset host back to default state at shutdown
Systems based on Alder Lake P see significant boot time delay if
boot firmware tries to control usb ports in unexpected link states.
This is seen with self-powered usb devices that survive in U3 link
suspended state over S5.
A more generic solution to power off ports at shutdown was attempted in
commit 83810f84ec
("xhci: turn off port power in shutdown")
but it caused regression.
Add host specific XHCI_RESET_TO_DEFAULT quirk which will reset host and
ports back to default state in shutdown.
Cc: stable@vger.kernel.org
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20221024142720.4122053-3-mathias.nyman@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4f54747238
commit
34cd2db408
3 changed files with 13 additions and 2 deletions
|
@ -257,6 +257,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
|
||||||
pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI))
|
pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI))
|
||||||
xhci->quirks |= XHCI_MISSING_CAS;
|
xhci->quirks |= XHCI_MISSING_CAS;
|
||||||
|
|
||||||
|
if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
|
||||||
|
pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI)
|
||||||
|
xhci->quirks |= XHCI_RESET_TO_DEFAULT;
|
||||||
|
|
||||||
if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
|
if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
|
||||||
(pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI ||
|
(pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI ||
|
||||||
pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI ||
|
pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI ||
|
||||||
|
|
|
@ -810,9 +810,15 @@ void xhci_shutdown(struct usb_hcd *hcd)
|
||||||
|
|
||||||
spin_lock_irq(&xhci->lock);
|
spin_lock_irq(&xhci->lock);
|
||||||
xhci_halt(xhci);
|
xhci_halt(xhci);
|
||||||
/* Workaround for spurious wakeups at shutdown with HSW */
|
|
||||||
if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
|
/*
|
||||||
|
* Workaround for spurious wakeps at shutdown with HSW, and for boot
|
||||||
|
* firmware delay in ADL-P PCH if port are left in U3 at shutdown
|
||||||
|
*/
|
||||||
|
if (xhci->quirks & XHCI_SPURIOUS_WAKEUP ||
|
||||||
|
xhci->quirks & XHCI_RESET_TO_DEFAULT)
|
||||||
xhci_reset(xhci, XHCI_RESET_SHORT_USEC);
|
xhci_reset(xhci, XHCI_RESET_SHORT_USEC);
|
||||||
|
|
||||||
spin_unlock_irq(&xhci->lock);
|
spin_unlock_irq(&xhci->lock);
|
||||||
|
|
||||||
xhci_cleanup_msix(xhci);
|
xhci_cleanup_msix(xhci);
|
||||||
|
|
|
@ -1897,6 +1897,7 @@ struct xhci_hcd {
|
||||||
#define XHCI_BROKEN_D3COLD BIT_ULL(41)
|
#define XHCI_BROKEN_D3COLD BIT_ULL(41)
|
||||||
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
|
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
|
||||||
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
|
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
|
||||||
|
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44)
|
||||||
|
|
||||||
unsigned int num_active_eps;
|
unsigned int num_active_eps;
|
||||||
unsigned int limit_active_eps;
|
unsigned int limit_active_eps;
|
||||||
|
|
Loading…
Reference in a new issue