usb: gadget: tegra-xudc: drain EP pipeline before DMA unmap
Subsystems (3)
PATCH 1/1 usb: gadget: tegra-xudc: drain EP pipeline before DMA unmap
From: Vishal Kumar <[email protected]>
Date: Fri, 5 Jun 2026 14:08:54 +0900
Subject: [PATCH] usb: gadget: tegra-xudc: drain EP pipeline before DMA
unmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
On Tegra186/194/234 the XUDC appears to post a transfer-completion event when the DMA write is dispatched to the AXI interconnect, before the store is committed to memory. Under SMMU strict mode dma_unmap() synchronously removes the IOVA TLB entry. If an in-flight AXI write to that IOVA has not yet been committed, the SMMU raises a translation fault (fsr=0x402) that permanently wedges the bulk endpoint; the host cdc_ncm TX queue stalls and fires NETDEV WATCHDOG after 5 s.
Fix for non-control endpoints: poll EP_THREAD_ACTIVE until the endpoint sequencer goes idle before calling dma_unmap(). Follow the poll with an MMIO read-back that orders prior CPU writes to device memory. Only after that does dma_unmap() invalidate the TLB entry.
On timeout, skip the dma_unmap to avoid triggering the SMMU fault. The DMA mapping leaks, but the hardware is already in an unrecoverable state at that point.
ep_wait_for_inactive() uses readl_poll_timeout_atomic() (1 µs poll, 100 µs timeout), already called from IRQ context in __tegra_xudc_ep_dequeue(). Change its return type from void to int so both call sites can detect and report a timeout.
Control endpoints (EP0) are excluded: their completions go through the control-transfer state machine where the DMA is fully committed before req_done is called.
--- drivers/usb/gadget/udc/tegra-xudc.c | 35 ++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-)
drivers/usb/gadget/udc/tegra-xudc.c +30 -5
@@ -1026,9 +1026,9 @@ static void ep_wait_for_stopped(struct tegra_xudc *xudc, unsigned int ep)xudc_writel (xudc,BIT (ep),EP_STOPPED ); } -static void ep_wait_for_inactive (struct tegra_xudc *xudc,unsigned int ep) +static int ep_wait_for_inactive (struct tegra_xudc *xudc,unsigned int ep) { -xudc_readl_poll (xudc,EP_THREAD_ACTIVE ,BIT (ep),0 ); +return xudc_readl_poll (xudc,EP_THREAD_ACTIVE ,BIT (ep),0 ); } static void tegra_xudc_req_done(struct tegra_xudc_ep *ep,
@@ -1049,8 +1049,31 @@ static void tegra_xudc_req_done(struct tegra_xudc_ep *ep, (xudc->setup_state == DATA_STAGE_XFER)); }else { -usb_gadget_unmap_request (&xudc->gadget, &req->usb_req, -usb_endpoint_dir_in (ep->desc)); +/* +* Drain the endpoint DMA pipeline before unmapping. +* +* Under SMMU strict mode dma_unmap() synchronously +* invalidates the IOVA TLB entry. On Tegra186/194/234 the +* XUDC appears to post the completion event when the DMA +* write is dispatched to the AXI interconnect, before the +* store is committed to memory. A subsequent dma_unmap() +* can remove the IOVA translation while the write is still +* in-flight, triggering a translation fault (fsr=0x402) that +* permanently wedges the bulk endpoint. +* +* Wait for EP_THREAD_ACTIVE to clear (endpoint sequencer +* idle). On timeout skip the unmap to avoid the SMMU fault; +* the DMA mapping leaks but the hardware is already in an +* unrecoverable state. +*/ +if (!WARN_ONCE (ep_wait_for_inactive (xudc, ep->index), +"ep%u: DMA drain timed out; skipping dma_unmap\n" , + ep->index)) { +/* MMIO read-back orders prior CPU writes to device memory. */ +xudc_readl (xudc,EP_THREAD_ACTIVE ); +usb_gadget_unmap_request (&xudc->gadget, &req->usb_req, +usb_endpoint_dir_in (ep->desc)); + } }spin_unlock (&xudc->lock);
@@ -1451,7 +1474,9 @@ __tegra_xudc_ep_dequeue(struct tegra_xudc_ep *ep,/* Halt DMA for this endpoint. */ if (ep_ctx_read_state (ep->context) ==EP_STATE_RUNNING ) {ep_pause (xudc, ep->index); -ep_wait_for_inactive (xudc, ep->index); +if (ep_wait_for_inactive (xudc, ep->index)) +dev_warn (xudc->dev,"ep%u: DMA drain timed out during dequeue\n" , + ep->index); } deq_trb =trb_phys_to_virt (ep,ep_ctx_read_deq_ptr (ep->context));
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 7 lines · Vishal Kumar
From: Vishal Kumar <[email protected]>
Date: Fri, 5 Jun 2026 14:08:54 +0900
Subject: [PATCH] usb: gadget: tegra-xudc: drain EP pipeline before DMA
unmap
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Something went wrong here :(
thanks,
greg k-h