[PATCH v16 08/50] xhci: Don't check if the event ring is valid before every event TRB
flat view
STALE982d
SUPERSEDED
From: Wesley Cheng <hidden>
Date: 2024-02-16 03:59:57
Also in:
alsa-devel, linux-arm-msm, linux-devicetree, linux-sound, linux-usb, lkml
Subsystem:
the rest, usb subsystem, usb xhci driver · Maintainers:
Linus Torvalds, Greg Kroah-Hartman, Mathias Nyman
Status: Superseded by v38 (posted 2025-04-09). [go to v38]
Revision v16 (38 revisions archived).
Revisions (38)
- rfc
- v2 [diff against previous]
- v3 [diff against previous]
- v4 [diff against previous]
- v5 [diff against previous]
- v6 [diff against previous]
- v7 [diff against previous]
- v8 [diff against previous]
- v9 [diff against previous]
- v10 [diff against previous]
- v11 [diff against previous]
- v12 [diff against previous]
- v13 [diff against previous]
- v14 [diff against previous]
- v15 [diff against previous]
- v16 current [diff against previous]
- v17 [diff against previous]
- v18 [diff against previous]
- v19 [diff against previous]
- v20 [diff against previous]
- v21 [diff against previous]
- v22 [diff against previous]
- v23 [diff against previous]
- v24 [diff against previous]
- v25 [diff against previous]
- v26 [diff against previous]
- v27 [diff against previous]
- v28 [diff against previous] re-posted go to this post re-posted go to this post
- v29 [diff against previous]
- v30 [diff against previous]
- v31 [diff against previous]
- v32 [diff against previous]
- v33 [diff against previous]
- v34 [diff against previous]
- v35 [diff against previous]
- v36 [diff against previous]
- v37 [diff against previous]
- v38 [diff against previous]
From: Mathias Nyman <redacted> Check if the event ring exists and is valid once when the event handler is called, not before every individual event TRB. At this point the interrupter is valid, so no need to check that. Change-Id: I2d69fc39c194d8fa93afd0a1cf3e209b929cee43 Signed-off-by: Mathias Nyman <redacted> Signed-off-by: Wesley Cheng <redacted> --- drivers/usb/host/xhci-ring.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 275164dc449d..d31599d46b92 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c@@ -2972,12 +2972,6 @@ static int xhci_handle_event(struct xhci_hcd *xhci, struct xhci_interrupter *ir) union xhci_trb *event; u32 trb_type; - /* Event ring hasn't been allocated yet. */ - if (!ir || !ir->event_ring || !ir->event_ring->dequeue) { - xhci_err(xhci, "ERROR interrupter not ready\n"); - return -ENOMEM; - } - event = ir->event_ring->dequeue; if (!unhandled_event_trb(ir->event_ring))
@@ -3081,6 +3075,12 @@ static int xhci_handle_events(struct xhci_hcd *xhci, struct xhci_interrupter *ir xhci_clear_interrupt_pending(xhci, ir); + /* Event ring hasn't been allocated yet. */ + if (!ir->event_ring || !ir->event_ring->dequeue) { + xhci_err(xhci, "ERROR interrupter event ring not ready\n"); + return -ENOMEM; + } + if (xhci->xhc_state & XHCI_STATE_DYING || xhci->xhc_state & XHCI_STATE_HALTED) { xhci_dbg(xhci, "xHCI dying, ignoring interrupt. Shouldn't IRQs be disabled?\n");