xhci: fix wrong endpoint ESIT value shown in tracing (76a14d7b) · Commits · 戴 / test

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) Cc: <stable@vger.kernel.org> # 4.12 Signed-off-by:

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

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/host/xhci.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -735,6 +735,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 */
		/*
		@@ -2540,8 +2542,8 @@ static inline const char *xhci_decode_ep_context(u32 info, u32 info2, u64 deq,
		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;

Admin message