Commit cd9d9491 authored Oct 04, 2019 by Mathias Nyman Committed by Greg Kroah-Hartman Oct 04, 2019

xhci: Prevent device initiated U1/U2 link pm if exit latency is too long

If host/hub initiated link pm is prevented by a driver flag we still must
ensure that periodic endpoints have longer service intervals than link pm
exit latency before allowing device initiated link pm.

Fix this by continue walking and checking endpoint service interval if
xhci_get_timeout_no_hub_lpm() returns anything else than USB3_LPM_DISABLED

While at it fix the split line error message

Tested-by: Jan Schmidt <jan@centricular.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/1570190373-30684-3-git-send-email-mathias.nyman@linux.intel.com

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent c03101ff

drivers/usb/host/xhci.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -4790,10 +4790,12 @@ static u16 xhci_calculate_lpm_timeout(struct usb_hcd *hcd,
		if (intf->dev.driver) {
		driver = to_usb_driver(intf->dev.driver);
		if (driver && driver->disable_hub_initiated_lpm) {
		dev_dbg(&udev->dev, "Hub-initiated %s disabled "
		"at request of driver %s\n",
		dev_dbg(&udev->dev, "Hub-initiated %s disabled at request of driver %s\n",
		state_name, driver->name);
		return xhci_get_timeout_no_hub_lpm(udev, state);
		timeout = xhci_get_timeout_no_hub_lpm(udev,
		state);
		if (timeout == USB3_LPM_DISABLED)
		return timeout;
		}
		}