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

Commit 95241dbd authored by Hans de Goede's avatar Hans de Goede Committed by Sarah Sharp
Browse files

xhci: Set SCT field for Set TR dequeue on streams 



Nec XHCI controllers don't seem to care, but without this Intel XHCI
controllers reject Set TR dequeue commands with a COMP_TRB_ERR, leading
to the following warning:

WARN Set TR Deq Ptr cmd invalid because of stream ID configuration

And very shortly after this the system completely freezes.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent c4bedb77

drivers/usb/host/xhci-ring.c

+4 −1
Original line number Diff line number Diff line
@@ -4073,6 +4073,7 @@ static int queue_set_tr_deq(struct xhci_hcd *xhci, int slot_id, 
	u32 trb_slot_id = SLOT_ID_FOR_TRB(slot_id);

	u32 trb_ep_index = EP_ID_FOR_TRB(ep_index);

	u32 trb_stream_id = STREAM_ID_FOR_TRB(stream_id);

	u32 trb_sct = 0;

	u32 type = TRB_TYPE(TRB_SET_DEQ);

	struct xhci_virt_ep *ep;
@@ -4091,7 +4092,9 @@ static int queue_set_tr_deq(struct xhci_hcd *xhci, int slot_id, 
	}

	ep->queued_deq_seg = deq_seg;

	ep->queued_deq_ptr = deq_ptr;

	return queue_command(xhci, lower_32_bits(addr) | cycle_state,

	if (stream_id)

		trb_sct = SCT_FOR_TRB(SCT_PRI_TR);

	return queue_command(xhci, lower_32_bits(addr) | trb_sct | cycle_state,

			upper_32_bits(addr), trb_stream_id,

			trb_slot_id | trb_ep_index | type, false);

}

drivers/usb/host/xhci.h

+2 −1
Original line number Diff line number Diff line
@@ -1118,9 +1118,10 @@ enum xhci_setup_dev { 
#define TRB_TO_SUSPEND_PORT(p)		(((p) & (1 << 23)) >> 23)

#define LAST_EP_INDEX			30



/* Set TR Dequeue Pointer command TRB fields */

/* Set TR Dequeue Pointer command TRB fields, 6.4.3.9 */

#define TRB_TO_STREAM_ID(p)		((((p) & (0xffff << 16)) >> 16))

#define STREAM_ID_FOR_TRB(p)		((((p)) & 0xffff) << 16)

#define SCT_FOR_TRB(p)			(((p) << 1) & 0x7)





/* Port Status Change Event TRB fields */