]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
xhci: show correct U1 and U2 timeout values in debug messages
authorMathias Nyman <mathias.nyman@linux.intel.com>
Thu, 6 Mar 2025 14:49:40 +0000 (16:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Mar 2025 15:46:15 +0000 (16:46 +0100)
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: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20250306144954.3507700-2-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci.c

index 45653114ccd7fcc4a1c6872e749c660d4cab705f..3f2cd546a7a26ba1646be9540905d29dbbb7262f 100644 (file)
@@ -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);
 }