Commit a7d57abc authored by Sandeep Singh's avatar Sandeep Singh Committed by Greg Kroah-Hartman
Browse files

xhci: workaround CSS timeout on AMD SNPS 3.0 xHC 



Occasionally AMD SNPS 3.0 xHC does not respond to
CSS when set, also it does not flag anything on SRE and HCE
to point the internal xHC errors on USBSTS register. This stalls
the entire system wide suspend and there is no point in stalling
just because of xHC CSS is not responding.

To work around this problem, if the xHC does not flag
anything on SRE and HCE, we can skip the CSS
timeout and allow the system to continue the suspend. Once the
system resume happens we can internally reset the controller
using XHCI_RESET_ON_RESUME quirk

Signed-off-by: default avatarShyam Sundar S K <Shyam-sundar.S-k@amd.com>
Signed-off-by: default avatarSandeep Singh <Sandeep.Singh@amd.com>
cc: Nehal Shah <Nehal-bakulchandra.Shah@amd.com>
Cc: <stable@vger.kernel.org>
Tested-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 704620af

drivers/usb/host/xhci-pci.c

+4 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		 pdev->device == 0x43bb))

		xhci->quirks |= XHCI_SUSPEND_DELAY;



	if (pdev->vendor == PCI_VENDOR_ID_AMD &&

	    (pdev->device == 0x15e0 || pdev->device == 0x15e1))

		xhci->quirks |= XHCI_SNPS_BROKEN_SUSPEND;



	if (pdev->vendor == PCI_VENDOR_ID_AMD)

		xhci->quirks |= XHCI_TRUST_TX_LENGTH;

drivers/usb/host/xhci.c

+22 −4
Original line number Diff line number Diff line
@@ -968,6 +968,7 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) 
	unsigned int		delay = XHCI_MAX_HALT_USEC;

	struct usb_hcd		*hcd = xhci_to_hcd(xhci);

	u32			command;

	u32			res;



	if (!hcd->state)

		return 0;
@@ -1021,12 +1022,29 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) 
	command = readl(&xhci->op_regs->command);

	command |= CMD_CSS;

	writel(command, &xhci->op_regs->command);

	xhci->broken_suspend = 0;

	if (xhci_handshake(&xhci->op_regs->status,

				STS_SAVE, 0, 10 * 1000)) {

	/*

	 * AMD SNPS xHC 3.0 occasionally does not clear the

	 * SSS bit of USBSTS and when driver tries to poll

	 * to see if the xHC clears BIT(8) which never happens

	 * and driver assumes that controller is not responding

	 * and times out. To workaround this, its good to check

	 * if SRE and HCE bits are not set (as per xhci

	 * Section 5.4.2) and bypass the timeout.

	 */

		res = readl(&xhci->op_regs->status);

		if ((xhci->quirks & XHCI_SNPS_BROKEN_SUSPEND) &&

		    (((res & STS_SRE) == 0) &&

				((res & STS_HCE) == 0))) {

			xhci->broken_suspend = 1;

		} else {

			xhci_warn(xhci, "WARN: xHC save state timeout\n");

			spin_unlock_irq(&xhci->lock);

			return -ETIMEDOUT;

		}

	}

	spin_unlock_irq(&xhci->lock);



	/*
@@ -1078,7 +1096,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) 
	set_bit(HCD_FLAG_HW_ACCESSIBLE, &xhci->shared_hcd->flags);



	spin_lock_irq(&xhci->lock);

	if (xhci->quirks & XHCI_RESET_ON_RESUME)

	if ((xhci->quirks & XHCI_RESET_ON_RESUME) || xhci->broken_suspend)

		hibernated = true;



	if (!hibernated) {

drivers/usb/host/xhci.h

+3 −0
Original line number Diff line number Diff line
@@ -1850,6 +1850,7 @@ struct xhci_hcd { 
#define XHCI_ZERO_64B_REGS	BIT_ULL(32)

#define XHCI_DEFAULT_PM_RUNTIME_ALLOW	BIT_ULL(33)

#define XHCI_RESET_PLL_ON_DISCONNECT	BIT_ULL(34)

#define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)



	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;
@@ -1879,6 +1880,8 @@ struct xhci_hcd { 
	void			*dbc;

	/* platform-specific data -- must come last */

	unsigned long		priv[0] __aligned(sizeof(s64));

	/* Broken Suspend flag for SNPS Suspend resume issue */

	u8			broken_suspend;

};



/* Platform specific overrides to generic XHCI hc_driver ops */

CRA Git | Maintained and supported by SUSTech CRA and CCSE