[PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Carlo Caione]

Fastboot unregisters the USB gadget from the completion callback of
its final OKAY response. MTU3 QMU can report that request complete
while bytes remain in the endpoint TX FIFO. Disabling the USB function
immediately can therefore disconnect the host before it receives the
response.

Before selecting the high-speed or SuperSpeed disconnect operation, poll
the FIFO state of enabled IN endpoints that have no pending requests.
Bound the wait to 1 ms. If a FIFO does not drain, reset its endpoint,
force the disconnect, and propagate -ETIMEDOUT through the gadget pullup
operation. Endpoints with pending requests are skipped so an ordinary
disconnect does not wait for an active transfer.

Fixes: e09b88cd083d ("usb: add MediaTek USB3 DRD driver")
Signed-off-by: Vitor Sato Eschholz <vsatoes@baylibre.com>
Signed-off-by: Carlo Caione <ccaione@baylibre.com>
---
Changes in v3:
- Return the value of readl_poll_timeout on error
- Link to v2: https://patch.msgid.link/20260718-ccaione-upstream-mtu3-tx-fifo-drain-v2-1-837345048224@baylibre.com

Changes in v2:
- Reset TX endpoints whose FIFO does not drain
- Propagate the drain timeout through the gadget pullup operation
- Link to v1: https://patch.msgid.link/20260717-ccaione-upstream-mtu3-tx-fifo-drain-v1-1-f867bdfc5d00@baylibre.com
---
 drivers/usb/mtu3/mtu3.h        |  2 +-
 drivers/usb/mtu3/mtu3_core.c   | 42 +++++++++++++++++++++++++++++++++++++++++-
 drivers/usb/mtu3/mtu3_gadget.c |  5 +++--
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/mtu3/mtu3.h b/drivers/usb/mtu3/mtu3.h
index 8a7ae83ee99..c812cd6fdcf 100644
--- a/drivers/usb/mtu3/mtu3.h
+++ b/drivers/usb/mtu3/mtu3.h
@@ -408,7 +408,7 @@ void mtu3_ep_stall_set(struct mtu3_ep *mep, bool set);
 void mtu3_ep0_setup(struct mtu3 *mtu);
 void mtu3_start(struct mtu3 *mtu);
 void mtu3_stop(struct mtu3 *mtu);
-void mtu3_dev_on_off(struct mtu3 *mtu, int is_on);
+int mtu3_dev_on_off(struct mtu3 *mtu, int is_on);
 void mtu3_set_speed(struct mtu3 *mtu, enum usb_device_speed speed);
 
 int mtu3_gadget_setup(struct mtu3 *mtu);
diff --git a/drivers/usb/mtu3/mtu3_core.c b/drivers/usb/mtu3/mtu3_core.c
index 2f5cc9b1480..d9df55ac5fe 100644
--- a/drivers/usb/mtu3/mtu3_core.c
+++ b/drivers/usb/mtu3/mtu3_core.c
@@ -10,10 +10,13 @@
 
 #include <linux/log2.h>
 #include <linux/bitmap.h>
+#include <linux/iopoll.h>
 
 #include "mtu3.h"
 #include "mtu3_dr.h"
 
+#define MTU3_TX_FIFO_DRAIN_TIMEOUT_US	1000
+
 static int ep_fifo_alloc(struct mtu3_ep *mep, u32 seg_size)
 {
 	struct mtu3_fifo_info *fifo = mep->fifo;
@@ -226,6 +229,34 @@ static void mtu3_ep_reset(struct mtu3_ep *mep)
 	mtu3_clrbits(mtu->mac_base, U3D_EP_RST, rst_bit);
 }
 
+static int mtu3_wait_for_tx_fifo_empty(struct mtu3 *mtu)
+{
+	struct mtu3_ep *mep;
+	u32 value;
+	int err;
+	int ret = 0;
+	int i;
+
+	for (i = 1; i < mtu->num_eps; i++) {
+		mep = mtu->in_eps + i;
+		if (!(mep->flags & MTU3_EP_ENABLED) ||
+		    !list_empty(&mep->req_list))
+			continue;
+
+		err = readl_poll_timeout(mtu->mac_base + MU3D_EP_TXCR0(i),
+					 value, value & TX_FIFOEMPTY,
+					 MTU3_TX_FIFO_DRAIN_TIMEOUT_US);
+		if (err) {
+			dev_warn(mtu->dev, "%s TX FIFO did not drain\n",
+				 mep->name);
+			mtu3_ep_reset(mep);
+			ret = err;
+		}
+	}
+
+	return ret;
+}
+
 /* set/clear the stall and toggle bits for non-ep0 */
 void mtu3_ep_stall_set(struct mtu3_ep *mep, bool set)
 {
@@ -261,8 +292,15 @@ void mtu3_ep_stall_set(struct mtu3_ep *mep, bool set)
 		set ? "SEND STALL" : "CLEAR STALL, with EP RESET");
 }
 
-void mtu3_dev_on_off(struct mtu3 *mtu, int is_on)
+int mtu3_dev_on_off(struct mtu3 *mtu, int is_on)
 {
+	int ret = 0;
+
+	/* QMU completion may precede transmission from the TX FIFO. */
+	if (!is_on)
+		ret = mtu3_wait_for_tx_fifo_empty(mtu);
+
+	/* Force the disconnect after a timeout; the failed endpoint was reset. */
 	if (mtu->is_u3_ip && mtu->speed >= USB_SPEED_SUPER)
 		mtu3_ss_func_set(mtu, is_on);
 	else
@@ -270,6 +308,8 @@ void mtu3_dev_on_off(struct mtu3 *mtu, int is_on)
 
 	dev_info(mtu->dev, "gadget (%s) pullup D%s\n",
 		 usb_speed_string(mtu->speed), is_on ? "+" : "-");
+
+	return ret;
 }
 
 void mtu3_start(struct mtu3 *mtu)
diff --git a/drivers/usb/mtu3/mtu3_gadget.c b/drivers/usb/mtu3/mtu3_gadget.c
index 027b7e61113..da633faae7b 100644
--- a/drivers/usb/mtu3/mtu3_gadget.c
+++ b/drivers/usb/mtu3/mtu3_gadget.c
@@ -451,6 +451,7 @@ static int mtu3_gadget_pullup(struct usb_gadget *gadget, int is_on)
 {
 	struct mtu3 *mtu = gadget_to_mtu3(gadget);
 	unsigned long flags;
+	int ret = 0;
 
 	dev_dbg(mtu->dev, "%s (%s) for %sactive device\n", __func__,
 		is_on ? "on" : "off", mtu->is_active ? "" : "in");
@@ -464,12 +465,12 @@ static int mtu3_gadget_pullup(struct usb_gadget *gadget, int is_on)
 		mtu->softconnect = is_on;
 	} else if (is_on != mtu->softconnect) {
 		mtu->softconnect = is_on;
-		mtu3_dev_on_off(mtu, is_on);
+		ret = mtu3_dev_on_off(mtu, is_on);
 	}
 
 	spin_unlock_irqrestore(&mtu->lock, flags);
 
-	return 0;
+	return ret;
 }
 
 static int mtu3_gadget_start(struct usb_gadget *gadget,

---
base-commit: 96c308b8d2a6a1496c0a7366db9a7becf42d2454
change-id: 20260717-ccaione-upstream-mtu3-tx-fifo-drain-fe4b66e5c1e4

Best regards,
--  
Carlo Caione <ccaione@baylibre.com>

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Carlo Caione]

On Mon Jul 20, 2026 at 10:03 AM CEST, Carlo Caione wrote:
> Fastboot unregisters the USB gadget from the completion callback of
> its final OKAY response. MTU3 QMU can report that request complete
> while bytes remain in the endpoint TX FIFO. Disabling the USB function
> immediately can therefore disconnect the host before it receives the
> response.
>
> Before selecting the high-speed or SuperSpeed disconnect operation, poll
> the FIFO state of enabled IN endpoints that have no pending requests.
> Bound the wait to 1 ms. If a FIFO does not drain, reset its endpoint,
> force the disconnect, and propagate -ETIMEDOUT through the gadget pullup
> operation. Endpoints with pending requests are skipped so an ordinary
> disconnect does not wait for an active transfer.

[...]

Hi Marek,
can you PTAL? Thanks,

--
Carlo Caione

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Marek Vasut via U-Boot]

On 8/1/26 8:42 AM, Carlo Caione wrote:
> On Mon Jul 20, 2026 at 10:03 AM CEST, Carlo Caione wrote:
>> Fastboot unregisters the USB gadget from the completion callback of
>> its final OKAY response. MTU3 QMU can report that request complete
>> while bytes remain in the endpoint TX FIFO. Disabling the USB function
>> immediately can therefore disconnect the host before it receives the
>> response.
>>
>> Before selecting the high-speed or SuperSpeed disconnect operation, poll
>> the FIFO state of enabled IN endpoints that have no pending requests.
>> Bound the wait to 1 ms. If a FIFO does not drain, reset its endpoint,
>> force the disconnect, and propagate -ETIMEDOUT through the gadget pullup
>> operation. Endpoints with pending requests are skipped so an ordinary
>> disconnect does not wait for an active transfer.
> 
> [...]
> 
> Hi Marek,
> can you PTAL? Thanks,

What does this mean ?

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Marek Vasut via U-Boot]

On 7/20/26 10:03 AM, Carlo Caione wrote:
> Fastboot unregisters the USB gadget from the completion callback of
> its final OKAY response. MTU3 QMU can report that request complete
> while bytes remain in the endpoint TX FIFO. Disabling the USB function
> immediately can therefore disconnect the host before it receives the
> response.
> 
> Before selecting the high-speed or SuperSpeed disconnect operation, poll
> the FIFO state of enabled IN endpoints that have no pending requests.
> Bound the wait to 1 ms. If a FIFO does not drain, reset its endpoint,
> force the disconnect, and propagate -ETIMEDOUT through the gadget pullup
> operation. Endpoints with pending requests are skipped so an ordinary
> disconnect does not wait for an active transfer.
> 
> Fixes: e09b88cd083d ("usb: add MediaTek USB3 DRD driver")
> Signed-off-by: Vitor Sato Eschholz <vsatoes@baylibre.com>
> Signed-off-by: Carlo Caione <ccaione@baylibre.com>

Reviewed-by: Marek Vasut <marek.vasut+usb@mailbox.org>

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Carlo Caione]

On Sat Aug 1, 2026 at 11:52 AM CEST, Marek Vasut wrote:
> On 8/1/26 8:42 AM, Carlo Caione wrote:

>> Hi Marek,
>> can you PTAL? Thanks,
>
> What does this mean ?

Please Take A Look? :)

Cheers,

--
Carlo Caione

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[David Lechner]

On 8/2/26 1:57 AM, Carlo Caione wrote:
> On Sat Aug 1, 2026 at 11:52 AM CEST, Marek Vasut wrote:
>> On 8/1/26 8:42 AM, Carlo Caione wrote:
> 
>>> Hi Marek,
>>> can you PTAL? Thanks,
>>
>> What does this mean ?
> 
> Please Take A Look? :)
> 
> Cheers,
> 
> --
> Carlo Caione

The question I had is that this patch (v3) is assigned to marex in patchwork
and is marked as "Superseded" [1], but there is no v4 that I saw that would
superseded it, so maybe it was marked that way by mistake? I just wanted
to make sure this patch didn't get forgotten because of that. (And I assume
Marek will pick up this and the other mtu3 series from Carlo in due time
rather than me picking them up via the MediaTek tree.)

[1]: https://patchwork.ozlabs.org/project/uboot/patch/20260720-ccaione-upstream-mtu3-tx-fifo-drain-v3-1-45c0e072b64a@baylibre.com/

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Marek Vasut via U-Boot]

On 8/2/26 8:57 AM, Carlo Caione wrote:
> On Sat Aug 1, 2026 at 11:52 AM CEST, Marek Vasut wrote:
>> On 8/1/26 8:42 AM, Carlo Caione wrote:
> 
>>> Hi Marek,
>>> can you PTAL? Thanks,
>>
>> What does this mean ?
> 
> Please Take A Look? :)

Please avoid such random acronyms if you expect others to understand you.

-- 
Best regards,
Marek Vasut

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Marek Vasut via U-Boot]

On 8/2/26 5:06 PM, David Lechner wrote:
> On 8/2/26 1:57 AM, Carlo Caione wrote:
>> On Sat Aug 1, 2026 at 11:52 AM CEST, Marek Vasut wrote:
>>> On 8/1/26 8:42 AM, Carlo Caione wrote:
>>
>>>> Hi Marek,
>>>> can you PTAL? Thanks,
>>>
>>> What does this mean ?
>>
>> Please Take A Look? :)
>>
>> Cheers,
>>
>> --
>> Carlo Caione
> 
> The question I had is that this patch (v3) is assigned to marex in patchwork
> and is marked as "Superseded" [1], but there is no v4 that I saw that would
> superseded it, so maybe it was marked that way by mistake?

Probably, Tom ?

> I just wanted
> to make sure this patch didn't get forgotten because of that. (And I assume
> Marek will pick up this and the other mtu3 series from Carlo in due time
> rather than me picking them up via the MediaTek tree.)

Which other series do you refer to ?

> [1]: https://patchwork.ozlabs.org/project/uboot/patch/20260720-ccaione-upstream-mtu3-tx-fifo-drain-v3-1-45c0e072b64a@baylibre.com/

-- 
Best regards,
Marek Vasut

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[David Lechner]

On 8/2/26 12:34 PM, Marek Vasut wrote:
> On 8/2/26 5:06 PM, David Lechner wrote:
>> On 8/2/26 1:57 AM, Carlo Caione wrote:
>>> On Sat Aug 1, 2026 at 11:52 AM CEST, Marek Vasut wrote:
>>>> On 8/1/26 8:42 AM, Carlo Caione wrote:
>>>
>>>>> Hi Marek,
>>>>> can you PTAL? Thanks,
>>>>
>>>> What does this mean ?
>>>
>>> Please Take A Look? :)
>>>
>>> Cheers,
>>>
>>> -- 
>>> Carlo Caione
>>
>> The question I had is that this patch (v3) is assigned to marex in patchwork
>> and is marked as "Superseded" [1], but there is no v4 that I saw that would
>> superseded it, so maybe it was marked that way by mistake?
> 
> Probably, Tom ?
> 
>> I just wanted
>> to make sure this patch didn't get forgotten because of that. (And I assume
>> Marek will pick up this and the other mtu3 series from Carlo in due time
>> rather than me picking them up via the MediaTek tree.)
> 
> Which other series do you refer to ?

v4 of "Add support for the MTU3 upstream devicetree binding"

https://patchwork.ozlabs.org/project/uboot/list/?series=515127

> 
>> [1]: https://patchwork.ozlabs.org/project/uboot/patch/20260720-ccaione-upstream-mtu3-tx-fifo-drain-v3-1-45c0e072b64a@baylibre.com/
> 

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Marek Vasut via U-Boot]

On 8/3/26 2:59 PM, David Lechner wrote:

Hello David,

>> Which other series do you refer to ?
> 
> v4 of "Add support for the MTU3 upstream devicetree binding"
> 
> https://patchwork.ozlabs.org/project/uboot/list/?series=515127

I think I commented on that one.

Also, are your concerns from V3 addressed ?

-- 
Best regards,
Marek Vasut

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[David Lechner]

On 8/3/26 12:05 PM, Marek Vasut wrote:
> On 8/3/26 2:59 PM, David Lechner wrote:
> 
> Hello David,
> 
>>> Which other series do you refer to ?
>>
>> v4 of "Add support for the MTU3 upstream devicetree binding"
>>
>> https://patchwork.ozlabs.org/project/uboot/list/?series=515127
> 
> I think I commented on that one.
> 
> Also, are your concerns from V3 addressed ?
> 

Yes.

Re: [PATCH v3] usb: mtu3: wait for TX FIFO to drain before disconnect

[Marek Vasut via U-Boot]

On 8/3/26 11:04 PM, David Lechner wrote:

Hello David,

>>>> Which other series do you refer to ?
>>>
>>> v4 of "Add support for the MTU3 upstream devicetree binding"
>>>
>>> https://patchwork.ozlabs.org/project/uboot/list/?series=515127
>>
>> I think I commented on that one.
>>
>> Also, are your concerns from V3 addressed ?
>>
> 
> Yes.
All right. I commented on the V4 too, let's continue the discussion there.

As for this patch, this one is applied and PR is out.