Skip to content

Commit 7c67cf6

Browse files
khfenggregkh
authored andcommitted
xhci: Increase STS_HALT timeout in xhci_suspend()
I've recently observed failed xHCI suspend attempt on AMD Raven Ridge system: kernel: xhci_hcd 0000:04:00.4: WARN: xHC CMD_RUN timeout kernel: PM: suspend_common(): xhci_pci_suspend+0x0/0xd0 returns -110 kernel: PM: pci_pm_suspend(): hcd_pci_suspend+0x0/0x30 returns -110 kernel: PM: dpm_run_callback(): pci_pm_suspend+0x0/0x150 returns -110 kernel: PM: Device 0000:04:00.4 failed to suspend async: error -110 Similar to commit ac34336 ("xhci: Increase STS_SAVE timeout in xhci_suspend()") we also need to increase the HALT timeout to make it be able to suspend again. Cc: <[email protected]> # 5.2+ Fixes: f7fac17 ("xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()") Signed-off-by: Kai-Heng Feng <[email protected]> Signed-off-by: Mathias Nyman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f2c710f commit 7c67cf6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/usb/host/xhci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ static bool xhci_pending_portevent(struct xhci_hcd *xhci)
970970
int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup)
971971
{
972972
int rc = 0;
973-
unsigned int delay = XHCI_MAX_HALT_USEC;
973+
unsigned int delay = XHCI_MAX_HALT_USEC * 2;
974974
struct usb_hcd *hcd = xhci_to_hcd(xhci);
975975
u32 command;
976976
u32 res;

0 commit comments

Comments
 (0)