From 7c67cf6658cec70d8a43229f2ce74ca1443dc95e Mon Sep 17 00:00:00 2001

From: Kai-Heng Feng <kai.heng.feng@canonical.com>

Date: Wed, 11 Dec 2019 16:20:05 +0200

Subject: [PATCH] xhci: Increase STS_HALT timeout in xhci_suspend()

Git-commit: 7c67cf6658cec70d8a43229f2ce74ca1443dc95e

Patch-mainline: v5.5-rc2

References: bsc#1051510

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 ac343366846a ("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: <stable@vger.kernel.org> # 5.2+

Fixes: f7fac17ca925 ("xhci: Convert xhci_handshake() to use readl_poll_timeout_atomic()")

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/20191211142007.8847-5-mathias.nyman@linux.intel.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/usb/host/xhci.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c

index c5ee562c4c74..dbac0fa9748d 100644

--- a/drivers/usb/host/xhci.c

+++ b/drivers/usb/host/xhci.c

@@ -970,7 +970,7 @@ static bool xhci_pending_portevent(struct xhci_hcd *xhci)

 int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup)

 {

 	int			rc = 0;

-	unsigned int		delay = XHCI_MAX_HALT_USEC;

+	unsigned int		delay = XHCI_MAX_HALT_USEC * 2;

 	struct usb_hcd		*hcd = xhci_to_hcd(xhci);

 	u32			command;

 	u32			res;

-- 

2.16.4