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

Commit 2815ef7f authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci-pci: allow host runtime PM as default for Intel Alpine and Titan Ridge 



The xhci controller on Alpine and Titan Ridge keeps the whole thunderbolt
awake if the host controller is not allowed tp sleep.
This is the case even if no USB devices are connected to the host.

Because of this bigger impact, allow runtime pm as default for these xhci
controllers in the driver.

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8f80be5

drivers/usb/host/xhci-pci.c

+24 −0
Original line number Diff line number Diff line
@@ -41,6 +41,13 @@ 
#define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI		0x1aa8

#define PCI_DEVICE_ID_INTEL_APL_XHCI			0x5aa8

#define PCI_DEVICE_ID_INTEL_DNV_XHCI			0x19d0

#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI	0x15b5

#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI	0x15b6

#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_XHCI	0x15db

#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI	0x15d4

#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI		0x15e9

#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI		0x15ec

#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI		0x15f0



#define PCI_DEVICE_ID_AMD_PROMONTORYA_4			0x43b9

#define PCI_DEVICE_ID_AMD_PROMONTORYA_3			0x43ba
@@ -189,6 +196,16 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) 
	     pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI))

		xhci->quirks |= XHCI_MISSING_CAS;



	if (pdev->vendor == PCI_VENDOR_ID_INTEL &&

	    (pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI ||

	     pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI))

		xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;



	if (pdev->vendor == PCI_VENDOR_ID_ETRON &&

			pdev->device == PCI_DEVICE_ID_EJ168) {

		xhci->quirks |= XHCI_RESET_ON_RESUME;
@@ -332,6 +349,9 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	/* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */

	pm_runtime_put_noidle(&dev->dev);



	if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)

		pm_runtime_allow(&dev->dev);



	return 0;



put_usb3_hcd:
@@ -349,6 +369,10 @@ static void xhci_pci_remove(struct pci_dev *dev) 


	xhci = hcd_to_xhci(pci_get_drvdata(dev));

	xhci->xhc_state |= XHCI_STATE_REMOVING;



	if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)

		pm_runtime_forbid(&dev->dev);



	if (xhci->shared_hcd) {

		usb_remove_hcd(xhci->shared_hcd);

		usb_put_hcd(xhci->shared_hcd);

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1848,6 +1848,7 @@ struct xhci_hcd { 
#define XHCI_SUSPEND_DELAY	BIT_ULL(30)

#define XHCI_INTEL_USB_ROLE_SW	BIT_ULL(31)

#define XHCI_ZERO_64B_REGS	BIT_ULL(32)

#define XHCI_DEFAULT_PM_RUNTIME_ALLOW	BIT_ULL(33)



	unsigned int		num_active_eps;

	unsigned int		limit_active_eps;