Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97ef0faf authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: fix endpoint context tracer output 



Fix incorrent values showed for max Primary stream and
Linear stream array (LSA) values in the endpoint context
decoder.

Fixes: 19a7d0d6 ("usb: host: xhci: add Slot and EP Context tracers")
Cc: <stable@vger.kernel.org> # v4.12+
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b4d930e

drivers/usb/host/xhci.h

+12 −10
Original line number Diff line number Diff line
@@ -723,6 +723,7 @@ struct xhci_ep_ctx { 
#define CTX_TO_EP_INTERVAL(p)		(((p) >> 16) & 0xff)

#define EP_MAXPSTREAMS_MASK		(0x1f << 10)

#define EP_MAXPSTREAMS(p)		(((p) << 10) & EP_MAXPSTREAMS_MASK)

#define CTX_TO_EP_MAXPSTREAMS(p)	(((p) & EP_MAXPSTREAMS_MASK) >> 10)

/* 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. */
@@ -2549,21 +2550,22 @@ static inline const char *xhci_decode_ep_context(u32 info, u32 info2, u64 deq, 
	u8 burst;

	u8 cerr;

	u8 mult;

	u8 lsa;

	u8 hid;



	bool lsa;

	bool hid;



	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;

	max_pstr = CTX_TO_EP_MAXPSTREAMS(info);

	interval = CTX_TO_EP_INTERVAL(info);

	mult = CTX_TO_EP_MULT(info) + 1;

	lsa = info & EP_HAS_LSA;

	lsa = !!(info & EP_HAS_LSA);



	cerr = (info2 & (3 << 1)) >> 1;

	ep_type = CTX_TO_EP_TYPE(info2);

	hid = info2 & (1 << 7);

	hid = !!(info2 & (1 << 7));

	burst = CTX_TO_MAX_BURST(info2);

	maxp = MAX_PACKET_DECODED(info2);