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

xhci: show correct U1 and U2 timeout values in debug messages 



U2 value is encoded in 256 microsecond intervals, show in microseconds.
U1 value is in microseconds. debug message incorrectly showed "ms"

Unwrap debug messages while we anyway modify them.

Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20250306144954.3507700-2-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 811d2214

drivers/usb/host/xhci.c

+4 −4
Original line number Diff line number Diff line
@@ -4755,8 +4755,8 @@ static u16 xhci_calculate_u1_timeout(struct xhci_hcd *xhci, 
	 */

	if (timeout_ns <= USB3_LPM_U1_MAX_TIMEOUT)

		return timeout_ns;

	dev_dbg(&udev->dev, "Hub-initiated U1 disabled "

			"due to long timeout %llu ms\n", timeout_ns);

	dev_dbg(&udev->dev, "Hub-initiated U1 disabled due to long timeout %lluus\n",

		timeout_ns);

	return xhci_get_timeout_no_hub_lpm(udev, USB3_LPM_U1);

}
@@ -4813,8 +4813,8 @@ static u16 xhci_calculate_u2_timeout(struct xhci_hcd *xhci, 
	 */

	if (timeout_ns <= USB3_LPM_U2_MAX_TIMEOUT)

		return timeout_ns;

	dev_dbg(&udev->dev, "Hub-initiated U2 disabled "

			"due to long timeout %llu ms\n", timeout_ns);

	dev_dbg(&udev->dev, "Hub-initiated U2 disabled due to long timeout %lluus\n",

		timeout_ns * 256);

	return xhci_get_timeout_no_hub_lpm(udev, USB3_LPM_U2);

}