From 2064ee470d6c7b434d6b3aafe017ed60c3b17ab5 Mon Sep 17 00:00:00 2001
From: Maxime Vincent <maxime@veemax.be>
Date: Fri, 11 Apr 2025 12:14:07 +0200
Subject: [PATCH] dwc2/host: attach debouncing fixes

---
 src/host/usbh.c                       |  2 +-
 src/portable/synopsys/dwc2/hcd_dwc2.c | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/host/usbh.c b/src/host/usbh.c
index e60db53da..4b0f4d488 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -1038,7 +1038,7 @@ TU_ATTR_FAST_FUNC void hcd_event_handler(hcd_event_t const* event, bool in_isr)
       // Check if dev0 is removed
       if ((event->rhport == _dev0.rhport) && (event->connection.hub_addr == _dev0.hub_addr) &&
           (event->connection.hub_port == _dev0.hub_port)) {
-        _dev0.enumerating = 0;
+        //_dev0.enumerating = 0;// Causes assert in dwc2 process_enumeration() -> ENUM_ADDR0_DEVICE_DESC
       }
       break;
 
diff --git a/src/portable/synopsys/dwc2/hcd_dwc2.c b/src/portable/synopsys/dwc2/hcd_dwc2.c
index 7cbef05b7..65288e30c 100644
--- a/src/portable/synopsys/dwc2/hcd_dwc2.c
+++ b/src/portable/synopsys/dwc2/hcd_dwc2.c
@@ -109,6 +109,7 @@ typedef struct {
 typedef struct {
   hcd_xfer_t xfer[DWC2_CHANNEL_COUNT_MAX];
   hcd_endpoint_t edpt[CFG_TUH_DWC2_ENDPOINT_MAX];
+  bool attach_debounce; // if true: wait for the debounce delay before issuing new attach events
 } hcd_data_t;
 
 hcd_data_t _hcd_data;
@@ -413,6 +414,11 @@ uint32_t hcd_frame_number(uint8_t rhport) {
 
 // Get the current connect status of roothub port
 bool hcd_port_connect_status(uint8_t rhport) {
+  // this is called from enum_new_device() - after the debouncing delays
+  if (_hcd_data.attach_debounce) {
+    _hcd_data.attach_debounce = false; // allow new attach events again
+  }
+
   dwc2_regs_t* dwc2 = DWC2_REG(rhport);
   return dwc2->hprt & HPRT_CONN_STATUS;
 }
@@ -1265,9 +1271,10 @@ static void handle_hprt_irq(uint8_t rhport, bool in_isr) {
     hprt |= HPRT_CONN_DETECT;
 
     if (hprt_bm.conn_status) {
-      hcd_event_device_attach(rhport, in_isr);
-    } else {
-      hcd_event_device_remove(rhport, in_isr);
+      if (!_hcd_data.attach_debounce) {
+        _hcd_data.attach_debounce = true; // block new attach events until the debounce delay is over
+        hcd_event_device_attach(rhport, in_isr);
+      }
     }
   }
 
@@ -1330,6 +1337,19 @@ void hcd_int_handler(uint8_t rhport, bool in_isr) {
     handle_channel_irq(rhport, in_isr);
   }
 
+  if (gintsts & GINTSTS_DISCINT) {
+    // Device disconnected
+    dwc2->gintsts = GINTSTS_DISCINT;
+
+    // ignore device removal if attach debounce is active
+    // it will evaluate the port status after the debounce delay
+    if (!_hcd_data.attach_debounce) {
+      if (!(dwc2->hprt & HPRT_CONN_STATUS)) {
+        hcd_event_device_remove(rhport, in_isr);
+      }
+    }
+  }
+
 #if CFG_TUH_DWC2_SLAVE_ENABLE
   // RxFIFO non-empty interrupt handling
   if (gintsts & GINTSTS_RXFLVL) {