FAILED: patch "[PATCH] usb: cdns3: gadget: fix request skipping after clearing halt" failed to apply to 5.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x c8778ff817a7047d6848fefba99dcb27b1bf01fe
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026060411-untoasted-urologist-7591@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From c8778ff817a7047d6848fefba99dcb27b1bf01fe Mon Sep 17 00:00:00 2001
From: Yongchao Wu <[email protected]>
Date: Thu, 14 May 2026 00:00:12 +0800
Subject: [PATCH] usb: cdns3: gadget: fix request skipping after clearing halt
According to the cdns3 datasheet, the EPRST (Endpoint Reset) command causes the DMA engine to reposition its internal pointer to the next Transfer Descriptor (TD) if it was already processing one.
This issue is consistently observed during the ADB identification process on macOS hosts, where the host issues a Clear_Halt. Although commit 4bf2dd65135a ("usb: cdns3: gadget: toggle cycle bit before reset endpoint") attempted to avoid DMA advance by toggling the cycle bit, trace logs show that on certain hosts like macOS, the DMA pointer (EP_TRADDR) still shifts after EPRST:
cdns3_ctrl_req: Clear Endpoint Feature(Halt ep1out)
cdns3_doorbell_epx: ep1out, ep_trbaddr f9c04030 <-- Should be f9c04000
cdns3_gadget_giveback: ep1out: req: ... length: 16384/16384
As shown above, the DMA pointer jumped to the next TD, causing the controller to skip the initial TRBs of the request. This leads to data misalignment and ADB protocol hangs on macOS.
Fix this by manually restoring the EP_TRADDR register to the starting physical address of the current request after the EPRST operation is complete.
drivers/usb/cdns3/cdns3-gadget.c +11 -1
@@ -2817,9 +2817,19 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) priv_ep->flags &= ~(EP_STALLED |EP_STALL_PENDING );if (request) { -if (trb) +if (trb) { *trb = trb_tmp; +/* +* Per datasheet, EPRST causes DMA to reposition to the next TD. +* Manually reset EP_TRADDR to the current TRB to prevent +* the hardware from skipping the interrupted request. +*/ +writel (EP_TRADDR_TRADDR (priv_ep->trb_pool_dma + + priv_req->start_trb *TRB_SIZE ), + &priv_dev->regs->ep_traddr); + } +cdns3_rearm_transfer (priv_ep,1 ); }
Sasha Levin
maintainerPATCH 1/1 usb: cdns3: gadget: fix request skipping after clearing halt
From: Yongchao Wu <[email protected]>
[ Upstream commit c8778ff817a7047d6848fefba99dcb27b1bf01fe ]
According to the cdns3 datasheet, the EPRST (Endpoint Reset) command causes the DMA engine to reposition its internal pointer to the next Transfer Descriptor (TD) if it was already processing one.
This issue is consistently observed during the ADB identification process on macOS hosts, where the host issues a Clear_Halt. Although commit 4bf2dd65135a ("usb: cdns3: gadget: toggle cycle bit before reset endpoint") attempted to avoid DMA advance by toggling the cycle bit, trace logs show that on certain hosts like macOS, the DMA pointer (EP_TRADDR) still shifts after EPRST:
cdns3_ctrl_req: Clear Endpoint Feature(Halt ep1out)
cdns3_doorbell_epx: ep1out, ep_trbaddr f9c04030 <-- Should be f9c04000
cdns3_gadget_giveback: ep1out: req: ... length: 16384/16384
As shown above, the DMA pointer jumped to the next TD, causing the controller to skip the initial TRBs of the request. This leads to data misalignment and ADB protocol hangs on macOS.
Fix this by manually restoring the EP_TRADDR register to the starting physical address of the current request after the EPRST operation is complete.
--- drivers/usb/cdns3/gadget.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/usb/cdns3/gadget.c +11 -1
@@ -2798,9 +2798,19 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) priv_ep->flags &= ~(EP_STALLED |EP_STALL_PENDING );if (request) { -if (trb) +if (trb) { *trb = trb_tmp; +/* +* Per datasheet, EPRST causes DMA to reposition to the next TD. +* Manually reset EP_TRADDR to the current TRB to prevent +* the hardware from skipping the interrupted request. +*/ +writel (EP_TRADDR_TRADDR (priv_ep->trb_pool_dma + + priv_req->start_trb *TRB_SIZE ), + &priv_dev->regs->ep_traddr); + } +cdns3_rearm_transfer (priv_ep,1 ); }
Signature · 1 line
2.53.0