You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
108 lines
4.3 KiB
108 lines
4.3 KiB
From 09e1caeb5f8b52fc704a04dc98c2f8e676c6517e Mon Sep 17 00:00:00 2001
|
|
|
|
From: Mathias Nyman <mathias.nyman@linux.intel.com>
|
|
|
|
Subject: [PATCH 2/4] xhci: Add stream id to to xhci_dequeue_state structure
|
|
|
|
The new dequeue segment, dequeue pointer and cycle state we manually want
|
|
the xHC to move ring to are conveniently stored in a xhci_dequeue_state
|
|
structure. The Stream support wad added later and stream_id was carried
|
|
as a fucntino parameter instead.
|
|
|
|
Include the stream_id to the xhci_dequeue_state structure instead.
|
|
|
|
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
|
|
---
|
|
drivers/usb/host/xhci-ring.c | 10 +++++-----
|
|
drivers/usb/host/xhci.c | 2 +-
|
|
drivers/usb/host/xhci.h | 2 +-
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
|
|
index d86ead4..cfe9072 100644
|
|
--- a/drivers/usb/host/xhci-ring.c
|
|
+++ b/drivers/usb/host/xhci-ring.c
|
|
@@ -518,7 +518,7 @@ static u64 xhci_get_hw_deq(struct xhci_hcd *xhci, struct xhci_virt_device *vdev,
|
|
/*
|
|
* Move the xHC's endpoint ring dequeue pointer past cur_td.
|
|
* Record the new state of the xHC's endpoint ring dequeue segment,
|
|
- * dequeue pointer, and new consumer cycle state in state.
|
|
+ * dequeue pointer, stream id, and new consumer cycle state in state.
|
|
* Update our internal representation of the ring's dequeue pointer.
|
|
*
|
|
* We do this in three jumps:
|
|
@@ -564,6 +564,7 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
|
|
new_seg = ep_ring->deq_seg;
|
|
new_deq = ep_ring->dequeue;
|
|
state->new_cycle_state = hw_dequeue & 0x1;
|
|
+ state->stream_id = stream_id;
|
|
|
|
/*
|
|
* We want to find the pointer, segment and cycle state of the new trb
|
|
@@ -808,7 +809,7 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id,
|
|
/* If necessary, queue a Set Transfer Ring Dequeue Pointer command */
|
|
if (deq_state.new_deq_ptr && deq_state.new_deq_seg) {
|
|
xhci_queue_new_dequeue_state(xhci, slot_id, ep_index,
|
|
- ep->stopped_td->urb->stream_id, &deq_state);
|
|
+ &deq_state);
|
|
xhci_ring_cmd_db(xhci);
|
|
} else {
|
|
/* Otherwise ring the doorbell(s) to restart queued transfers */
|
|
@@ -4175,13 +4176,12 @@ int xhci_queue_stop_endpoint(struct xhci_hcd *xhci, struct xhci_command *cmd,
|
|
/* Set Transfer Ring Dequeue Pointer command */
|
|
void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
|
|
unsigned int slot_id, unsigned int ep_index,
|
|
- unsigned int stream_id,
|
|
struct xhci_dequeue_state *deq_state)
|
|
{
|
|
dma_addr_t addr;
|
|
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_stream_id = STREAM_ID_FOR_TRB(deq_state->stream_id);
|
|
u32 trb_sct = 0;
|
|
u32 type = TRB_TYPE(TRB_SET_DEQ);
|
|
struct xhci_virt_ep *ep;
|
|
@@ -4221,7 +4221,7 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
|
|
|
|
ep->queued_deq_seg = deq_state->new_deq_seg;
|
|
ep->queued_deq_ptr = deq_state->new_deq_ptr;
|
|
- if (stream_id)
|
|
+ if (deq_state->stream_id)
|
|
trb_sct = SCT_FOR_TRB(SCT_PRI_TR);
|
|
ret = queue_command(xhci, cmd,
|
|
lower_32_bits(addr) | trb_sct | deq_state->new_cycle_state,
|
|
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
|
|
index f2e9f59..9a0892f 100644
|
|
--- a/drivers/usb/host/xhci.c
|
|
+++ b/drivers/usb/host/xhci.c
|
|
@@ -2940,7 +2940,7 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
|
|
xhci_dbg_trace(xhci, trace_xhci_dbg_reset_ep,
|
|
"Queueing new dequeue state");
|
|
xhci_queue_new_dequeue_state(xhci, udev->slot_id,
|
|
- ep_index, ep->stopped_stream, &deq_state);
|
|
+ ep_index, &deq_state);
|
|
} else {
|
|
/* Better hope no one uses the input context between now and the
|
|
* reset endpoint completion!
|
|
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
|
|
index fc2ee6c..a2ab28a 100644
|
|
--- a/drivers/usb/host/xhci.h
|
|
+++ b/drivers/usb/host/xhci.h
|
|
@@ -1363,6 +1363,7 @@ struct xhci_dequeue_state {
|
|
struct xhci_segment *new_deq_seg;
|
|
union xhci_trb *new_deq_ptr;
|
|
int new_cycle_state;
|
|
+ unsigned int stream_id;
|
|
};
|
|
|
|
enum xhci_ring_type {
|
|
@@ -1908,7 +1909,6 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
|
|
struct xhci_dequeue_state *state);
|
|
void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
|
|
unsigned int slot_id, unsigned int ep_index,
|
|
- unsigned int stream_id,
|
|
struct xhci_dequeue_state *deq_state);
|
|
void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
|
|
unsigned int ep_index, struct xhci_td *td);
|