Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dec08194 authored by Jiahau Chang's avatar Jiahau Chang Committed by Greg Kroah-Hartman
Browse files

xhci: Limit USB2 port wake support for AMD Promontory hosts 



For AMD Promontory xHCI host, although you can disable USB 2.0 ports in
BIOS settings, those ports will be enabled anyway after you remove a
device on that port and re-plug it in again. It's a known limitation of
the chip. As a workaround we can clear the PORT_WAKE_BITS.

This will disable wake on connect, disconnect and overcurrent on
AMD Promontory USB2 ports

[checkpatch cleanup and commit message reword -Mathias]
Cc: <stable@vger.kernel.org>
Cc: Tsai Nicholas <nicholas.tsai@amd.com>
Signed-off-by: default avatarJiahau Chang <Lars_Chang@asmedia.com.tw>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb731616

drivers/usb/host/xhci-hub.c

+3 −0
Original line number Diff line number Diff line
@@ -1461,6 +1461,9 @@ 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

+12 −0
Original line number Diff line number Diff line
@@ -54,6 +54,11 @@ 
#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



static const char hcd_name[] = "xhci_hcd";



static struct hc_driver __read_mostly xhci_pci_hc_driver;
@@ -135,6 +140,13 @@ 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 −0
Original line number Diff line number Diff line
@@ -1819,6 +1819,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)



	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;