usb: xhci: improve debug message in xhci_ring_expansion_needed()

Address debug message inaccuracies in xhci_ring_expansion_needed().
Specifically, remove the portion of the debug message that indicates the
number of enqueue TRBs to be added to the dequeue segment. This part of
the message may mislead and the calculated value is incorrect. Given that
this value is not of significant importance and the statement is not
consistently accurate, it has been omitted.

The specific issues with the debug message that this commit resolves:
- The calculation of the number of TRBs is incorrect. The current
  calculation erroneously includes the link TRB, which is reserved.
  Furthermore, the calculated number of TRBs can exceed the dequeue
  segment, resulting in a misleading debug message.

- The current phrasing suggests that "ring expansion by X is needed,
  adding X TRBs moves enqueue Y TRBs into the dequeue segment".
  The intended message, however, is "IF the ring is NOT expanded by X,
  THEN adding X TRBs moves enqueue Y TRBs into the dequeue segment".

Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20240429140245.3955523-5-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 575f0fd9c9f11e3df95220dfc4be8bb62ea9fc54..3cc5c70d54c723a5acc001a9e9ae4b83779c9bca 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -351,10 +351,8 @@ static unsigned int xhci_ring_expansion_needed(struct xhci_hcd *xhci, struct xhc
        while (new_segs > 0) {
                seg = seg->next;
                if (seg == ring->deq_seg) {
-                       xhci_dbg(xhci, "Ring expansion by %d segments needed\n",
-                                new_segs);
-                       xhci_dbg(xhci, "Adding %d trbs moves enq %d trbs into deq seg\n",
-                                num_trbs, trbs_past_seg % TRBS_PER_SEGMENT);
+                       xhci_dbg(xhci, "Adding %d trbs requires expanding ring by %d segments\n",
+                                num_trbs, new_segs);
                        return new_segs;
                }
                new_segs--;