Skip to content

Commit 577c867

Browse files
Epicuriusgregkh
authored andcommitted
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>
1 parent db4460b commit 577c867

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/usb/host/xhci-ring.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,8 @@ static unsigned int xhci_ring_expansion_needed(struct xhci_hcd *xhci, struct xhc
351351
while (new_segs > 0) {
352352
seg = seg->next;
353353
if (seg == ring->deq_seg) {
354-
xhci_dbg(xhci, "Ring expansion by %d segments needed\n",
355-
new_segs);
356-
xhci_dbg(xhci, "Adding %d trbs moves enq %d trbs into deq seg\n",
357-
num_trbs, trbs_past_seg % TRBS_PER_SEGMENT);
354+
xhci_dbg(xhci, "Adding %d trbs requires expanding ring by %d segments\n",
355+
num_trbs, new_segs);
358356
return new_segs;
359357
}
360358
new_segs--;

0 commit comments

Comments
 (0)