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

Commit 661878b7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "xhci: Add a flag to disable USB3 lpm on a xhci root port level." 



This reverts commit 30f9ad9f which is
commit 0522b9a1653048440da5f21747f21e498b9220d1 upstream.

It breaks the Android ABI for the xhci pci driver, for an issue that is
not needed in this Android branch.  If it is needed, it can come back in
the future in a way that preserves the ABI.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic580277efe436b17df5b4a4c4b3858b12fbd5532
parent 9621487f

drivers/usb/host/xhci.c

+0 −8
Original line number Diff line number Diff line
@@ -4915,7 +4915,6 @@ static int xhci_enable_usb3_lpm_timeout(struct usb_hcd *hcd, 
			struct usb_device *udev, enum usb3_link_state state)

{

	struct xhci_hcd	*xhci;

	struct xhci_port *port;

	u16 hub_encoded_timeout;

	int mel;

	int ret;
@@ -4929,13 +4928,6 @@ static int xhci_enable_usb3_lpm_timeout(struct usb_hcd *hcd, 
			!xhci->devs[udev->slot_id])

		return USB3_LPM_DISABLED;



	/* If connected to root port then check port can handle lpm */

	if (udev->parent && !udev->parent->parent) {

		port = xhci->usb3_rhub.ports[udev->portnum - 1];

		if (port->lpm_incapable)

			return USB3_LPM_DISABLED;

	}



	hub_encoded_timeout = xhci_calculate_lpm_timeout(hcd, udev, state);

	mel = calculate_max_exit_latency(udev, state, hub_encoded_timeout);

	if (mel < 0) {

drivers/usb/host/xhci.h

+0 −1
Original line number Diff line number Diff line
@@ -1723,7 +1723,6 @@ struct xhci_port { 
	int			hcd_portnum;

	struct xhci_hub		*rhub;

	struct xhci_port_cap	*port_cap;

	unsigned int		lpm_incapable:1;

};



struct xhci_hub {