From 0077b1b2c8d9ad5f7a08b62fb8524cdb9938388f Mon Sep 17 00:00:00 2001

From: Li Jun <jun.li@nxp.com>

Date: Fri, 21 Aug 2020 12:15:47 +0300

Subject: [PATCH] usb: host: xhci: fix ep context print mismatch in debugfs

Git-commit: 0077b1b2c8d9ad5f7a08b62fb8524cdb9938388f

References: git-fixes

Patch-mainline: v5.9-rc3

dci is 0 based and xhci_get_ep_ctx() will do ep index increment to get

the ep context.

[rename dci to ep_index -Mathias]

Cc: stable <stable@vger.kernel.org> # v4.15+

Fixes: 02b6fdc2a153 ("usb: xhci: Add debugfs interface for xHCI driver")

Signed-off-by: Li Jun <jun.li@nxp.com>

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>

Link: https://lore.kernel.org/r/20200821091549.20556-2-mathias.nyman@linux.intel.com

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

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/usb/host/xhci-debugfs.c |    8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/drivers/usb/host/xhci-debugfs.c

+++ b/drivers/usb/host/xhci-debugfs.c

@@ -276,7 +276,7 @@ static int xhci_slot_context_show(struct

 static int xhci_endpoint_context_show(struct seq_file *s, void *unused)

 {

-	int			dci;

+	int			ep_index;

 	dma_addr_t		dma;

 	struct xhci_hcd		*xhci;

 	struct xhci_ep_ctx	*ep_ctx;

@@ -285,9 +285,9 @@ static int xhci_endpoint_context_show(st

 	xhci = hcd_to_xhci(bus_to_hcd(dev->udev->bus));

-	for (dci = 1; dci < 32; dci++) {

-		ep_ctx = xhci_get_ep_ctx(xhci, dev->out_ctx, dci);

-		dma = dev->out_ctx->dma + dci * CTX_SIZE(xhci->hcc_params);

+	for (ep_index = 0; ep_index < 31; ep_index++) {

+		ep_ctx = xhci_get_ep_ctx(xhci, dev->out_ctx, ep_index);

+		dma = dev->out_ctx->dma + (ep_index + 1) * CTX_SIZE(xhci->hcc_params);

 		seq_printf(s, "%pad: %s\n", &dma,

 			   xhci_decode_ep_context(ep_ctx->ep_info,

 						  ep_ctx->ep_info2,