Commit d1658268 authored by Mario Limonciello's avatar Mario Limonciello Committed by Greg Kroah-Hartman
Browse files

usb: pci-quirks: disable D3cold on xhci suspend for s2idle on AMD Renoir 

The XHCI controller is required to enter D3hot rather than D3cold for AMD
s2idle on this hardware generation.

Otherwise, the 'Controller Not Ready' (CNR) bit is not being cleared by
host in resume and eventually this results in xhci resume failures during
the s2idle wakeup.

Link: https://lore.kernel.org/linux-usb/1612527609-7053-1-git-send-email-Prike.Liang@amd.com/


Suggested-by: default avatarPrike Liang <Prike.Liang@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Cc: stable <stable@vger.kernel.org> # 5.11+
Link: https://lore.kernel.org/r/20210527154534.8900-1-mario.limonciello@amd.com


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

drivers/usb/host/xhci-pci.c

+6 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI		0x1138

#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI		0x461e



#define PCI_DEVICE_ID_AMD_RENOIR_XHCI			0x1639

#define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9

#define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba

#define PCI_DEVICE_ID_AMD_PROMONTORYA_2			0x43bb
@@ -182,6 +183,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
		(pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_1)))

		xhci->quirks |= XHCI_U2_DISABLE_WAKE;



	if (pdev->vendor == PCI_VENDOR_ID_AMD &&

		pdev->device == PCI_DEVICE_ID_AMD_RENOIR_XHCI)

		xhci->quirks |= XHCI_BROKEN_D3COLD;



	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {

		xhci->quirks |= XHCI_LPM_SUPPORT;

		xhci->quirks |= XHCI_INTEL_HOST;
@@ -539,7 +544,7 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup) 
	 * Systems with the TI redriver that loses port status change events

	 * need to have the registers polled during D3, so avoid D3cold.

	 */

	if (xhci->quirks & XHCI_COMP_MODE_QUIRK)

	if (xhci->quirks & (XHCI_COMP_MODE_QUIRK | XHCI_BROKEN_D3COLD))

		pci_d3cold_disable(pdev);



	if (xhci->quirks & XHCI_PME_STUCK_QUIRK)

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1892,6 +1892,7 @@ struct xhci_hcd { 
#define XHCI_DISABLE_SPARSE	BIT_ULL(38)

#define XHCI_SG_TRB_CACHE_SIZE_QUIRK	BIT_ULL(39)

#define XHCI_NO_SOFT_RETRY	BIT_ULL(40)

#define XHCI_BROKEN_D3COLD	BIT_ULL(41)



	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;