Commit bcd6a7aa authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Greg Kroah-Hartman
Browse files

Revert "xhci: Limit USB2 port wake support for AMD Promontory hosts" 



This reverts commit dec08194.

Commit dec08194 ("xhci: Limit USB2 port wake support for AMD Promontory
hosts") makes all high speed USB ports on ASUS PRIME B350M-A cease to
function after enabling runtime PM.

All boards with this chipsets will be affected, so revert the commit.

The original patch was added to stable 4.9, 4.11 and 4.12 and needs
to reverted from there as well

Cc: <stable@vger.kernel.org> # 4.9+
Signed-off-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 7bea22b1

drivers/usb/host/xhci-hub.c

+0 −3
Original line number Diff line number Diff line
@@ -1515,9 +1515,6 @@ int xhci_bus_suspend(struct usb_hcd *hcd) 
				t2 |= PORT_WKOC_E | PORT_WKCONN_E;

				t2 &= ~PORT_WKDISC_E;

			}

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

			    (hcd->speed < HCD_USB3))

				t2 &= ~PORT_WAKE_BITS;

		} else

			t2 &= ~PORT_WAKE_BITS;

drivers/usb/host/xhci-pci.c

+0 −12
Original line number Diff line number Diff line
@@ -54,11 +54,6 @@ 
#define PCI_DEVICE_ID_INTEL_APL_XHCI			0x5aa8

#define PCI_DEVICE_ID_INTEL_DNV_XHCI			0x19d0



#define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9

#define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba

#define PCI_DEVICE_ID_AMD_PROMONTORYA_2			0x43bb

#define PCI_DEVICE_ID_AMD_PROMONTORYA_1			0x43bc



#define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI		0x1142



static const char hcd_name[] = "xhci_hcd";
@@ -142,13 +137,6 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
	if (pdev->vendor == PCI_VENDOR_ID_AMD)

		xhci->quirks |= XHCI_TRUST_TX_LENGTH;



	if ((pdev->vendor == PCI_VENDOR_ID_AMD) &&

		((pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_4) ||

		(pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_3) ||

		(pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_2) ||

		(pdev->device == PCI_DEVICE_ID_AMD_PROMONTORYA_1)))

		xhci->quirks |= XHCI_U2_DISABLE_WAKE;



	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {

		xhci->quirks |= XHCI_LPM_SUPPORT;

		xhci->quirks |= XHCI_INTEL_HOST;

drivers/usb/host/xhci.h

+1 −1
Original line number Diff line number Diff line
@@ -1828,7 +1828,7 @@ struct xhci_hcd { 
/* For controller with a broken Port Disable implementation */

#define XHCI_BROKEN_PORT_PED	(1 << 25)

#define XHCI_LIMIT_ENDPOINT_INTERVAL_7	(1 << 26)

#define XHCI_U2_DISABLE_WAKE	(1 << 27)

/* Reserved. It was XHCI_U2_DISABLE_WAKE */

#define XHCI_ASMEDIA_MODIFY_FLOWCONTROL	(1 << 28)



	unsigned int		num_active_eps;

CRA Git | Maintained and supported by SUSTech CRA and CCSE