diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2013-10-04 00:29:47 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-05-23 10:35:19 +0200 |
| commit | 0da837ca84b26c3c4f560788a6e62b12d345e49f (patch) | |
| tree | 531a5e0da8269873a0ab28c8ba66b11dcfe150fa /drivers | |
| parent | aea22946135c7373d20d12d7c16470679b4c7455 (diff) | |
xhci: For streams the css flag most be read from the stream-ctx on ep stop
commit c4bedb77ec4cb42f37cae4cbfddda8283161f7c8 upstream.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/xhci-ring.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index cbecb5ff7d90..1dbfb52dbcd6 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -552,9 +552,9 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, struct xhci_dequeue_state *state) { struct xhci_virt_device *dev = xhci->devs[slot_id]; + struct xhci_virt_ep *ep = &dev->eps[ep_index]; struct xhci_ring *ep_ring; struct xhci_generic_trb *trb; - struct xhci_ep_ctx *ep_ctx; dma_addr_t addr; u64 hw_dequeue; @@ -570,8 +570,16 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, /* Dig out the cycle state saved by the xHC during the stop ep cmd */ xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, "Finding endpoint context"); - ep_ctx = xhci_get_ep_ctx(xhci, dev->out_ctx, ep_index); - hw_dequeue = le64_to_cpu(ep_ctx->deq); + /* 4.6.9 the css flag is written to the stream context for streams */ + if (ep->ep_state & EP_HAS_STREAMS) { + struct xhci_stream_ctx *ctx = + &ep->stream_info->stream_ctx_array[stream_id]; + hw_dequeue = le64_to_cpu(ctx->stream_ring); + } else { + struct xhci_ep_ctx *ep_ctx + = xhci_get_ep_ctx(xhci, dev->out_ctx, ep_index); + hw_dequeue = le64_to_cpu(ep_ctx->deq); + } /* Find virtual address and segment of hardware dequeue pointer */ state->new_deq_seg = ep_ring->deq_seg; |