xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 4d70a8a9ab which is
commit 0522b9a1653048440da5f21747f21e498b9220d1 upstream.

It breaks the android kernel abi and is not needed for android at this
point in time as the USB3 issues it resolves are not in Android devices.

If this is needed in the future, it can be brought back in an ABI-safe way.

Bug: 161946584
Change-Id: I06a9e667eb91d6502d040b7ba5db7c43f9ccdcb5
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2023-02-01 13:31:38 +00:00
parent 78da590924
commit fa89210a0e
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/host/xhci.c
View File

@@ -5003,7 +5003,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;
@@ -5017,13 +5016,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) {

1
drivers/usb/host/xhci.h
View File

@@ -1742,7 +1742,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 {