Patch "xhci: fix wrong endpoint ESIT value shown in tracing" has been added to the 4.13-stable tree

This is a note to let you know that I've just added the patch titled

xhci: fix wrong endpoint ESIT value shown in tracing

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
xhci-fix-wrong-endpoint-esit-value-shown-in-tracing.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Mathias Nyman <[email protected]>
Date: Mon, 18 Sep 2017 17:39:15 +0300
Subject: xhci: fix wrong endpoint ESIT value shown in tracing

From: Mathias Nyman <[email protected]>

commit 76a14d7bf92960aac2f5450bfd23783bfa618be9 upstream.

Read the endpiont ESIT from endpiont context using correct macro. Add a macro for reading the high bits of ESIT for Large ESIT Payload Capable hosts (LEC=1)

---
 drivers/usb/host/xhci.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

@@ -728,6 +728,8 @@ struct xhci_ep_ctx {
 #define EP_MAXPSTREAMS(p)	(((p) << 10) & EP_MAXPSTREAMS_MASK)
 /* Endpoint is set up with a Linear Stream Array (vs. Secondary Stream Array) */
 #define	EP_HAS_LSA		(1 << 15)
+/* hosts with LEC=1 use bits 31:24 as ESIT high bits. */
+#define CTX_TO_MAX_ESIT_PAYLOAD_HI(p)	(((p) >> 24) & 0xff)
 
 /* ep_info2 bitmasks */
 /*

@@ -2452,8 +2454,8 @@ static inline const char *xhci_decode_ep
 	u8 lsa;
 	u8 hid;
 
-	esit = EP_MAX_ESIT_PAYLOAD_HI(info) << 16 |
-		EP_MAX_ESIT_PAYLOAD_LO(tx_info);
+	esit = CTX_TO_MAX_ESIT_PAYLOAD_HI(info) << 16 |
+		CTX_TO_MAX_ESIT_PAYLOAD(tx_info);
 
 	ep_state = info & EP_STATE_MASK;
 	max_pstr = info & EP_MAXPSTREAMS_MASK;

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/usb-xhci-free-the-right-ring-in-xhci_add_endpoint.patch queue-4.13/xhci-fix-finding-correct-bus_state-structure-for-usb-3.1-hosts.patch queue-4.13/revert-xhci-limit-usb2-port-wake-support-for-amd-promontory-hosts.patch queue-4.13/xhci-set-missing-superspeedplus-link-protocol-bit-in-roothub-descriptor.patch queue-4.13/usb-host-xhci-plat-allow-sysdev-to-inherit-from-acpi.patch queue-4.13/usb-pci-quirks.c-corrected-timeout-values-used-in-handshake.patch queue-4.13/xhci-fix-wrong-endpoint-esit-value-shown-in-tracing.patch queue-4.13/xhci-fix-sleeping-with-spin_lock_irq-held-in-asmedia-1042a-workaround.patch