feature(esp_tinyusb): Applied fix for UNPLUG event for v4.30a

Author: roma-jam

device/esp_tinyusb/README.md

@@ -349,6 +349,10 @@ To enable Mass Storage Device:
 - select the option from `menuconfig`
 - configure storage for MSC Device class: SPI Flash or SD/MMC (when supported by the hardware).
 
+> **🔧 Self-powered Flash Drive**:
+>
+> When VBUS monitoring is enabled with `TINYUSB_PORT_HIGH_SPEED_0` (ESP32-P4 USB OTG 2.0), the storage filesystem is mounted and unmounted between the application and the USB Host based on software VBUS monitoring events. In this scenario, the Timer Task Stack Size (`configTIMER_TASK_STACK_DEPTH`) must be large enough to handle filesystem operations during detach events. It is recommended to set this value to at least 2304 bytes (2048 + 256).
+
 **SPI-Flash Storage**
 
 ```c

device/esp_tinyusb/include_private/tinyusb_vbus_monitor.h

@@ -29,7 +29,7 @@ typedef struct {
  * @param config VBUS monitoring configuration
  *
  * @return
- *    - ESP_ERR_INVALID_ARG if config is NULL
+ *    - ESP_ERR_INVALID_ARG if config is NULL or Timer Task Stack Depth is insufficient when MSC is enabled
  *    - ESP_ERR_INVALID_STATE if VBUS monitoring is already initialized
  *    - ESP_ERR_NO_MEM if debounce timer creation failed
  *    - ESP_OK if VBUS monitoring was initialized successfully

device/esp_tinyusb/tinyusb_vbus_monitor.c

@@ -12,18 +12,23 @@
 #include "freertos/timers.h"
 #include "driver/gpio.h"
 #include "tinyusb_vbus_monitor.h"
-<<<<<<< HEAD
-=======
 #include "tinyusb_device.h"
->>>>>>> a562322070 (refactor(esp_tinyusb): Made attached and dettached functions available as private)
 
 const static char *TAG = "VBUS mon";
 
 #if (CONFIG_IDF_TARGET_ESP32P4)
-#include "soc/usb_dwc_struct.h"
+#include "soc/usb_dwc_struct.h"         // For GOTGCTL and DCTL registers access
+#define USB_DWC_REG                     USB_DWC_HS
+
+#if (CONFIG_ESP32P4_REV_MIN_300)
+#define BVALID_OVERRIDE_SUPPORT_ENABLE  0
+#else
 // On ESP32-P4 USB OTG 2.0 signals are not wired to GPIO matrix
 // So we need to override the Bvalid signal from PHY
-#define USB_DWC_REG                     USB_DWC_HS
+#define BVALID_OVERRIDE_SUPPORT_ENABLE  1
+#endif // CONFIG_ESP32P4_REV_MIN_300
+#else
+#error "VBUS monitoring is supported only on ESP32-P4, USB OTG 2.0"
 #endif // CONFIG_IDF_TARGET_ESP32P4
 
 /**
@@ -47,6 +52,7 @@ static vbus_monitor_context_t _vbus_ctx = {
 // Additional low-level USB DWC functions, which are not present in the IDF USB DWC HAL
 //
 
+#if (BVALID_OVERRIDE_SUPPORT_ENABLE)
 // --------------- GOTGCTL register ------------------
 
 static void usb_dwc_ll_gotgctl_set_bvalid_override_value(usb_dwc_dev_t *hw, uint8_t value)
@@ -58,6 +64,7 @@ static void usb_dwc_ll_gotgctl_enable_bvalid_override(usb_dwc_dev_t *hw, bool en
 {
     hw->gotgctl_reg.bvalidoven = enable ? 1 : 0;
 }
+#endif // BVALID_OVERRIDE_SUPPORT_ENABLE
 
 // ------------------ DCTL register --------------------
 
@@ -74,7 +81,9 @@ static void usb_dwc_ll_dctl_set_soft_disconnect(usb_dwc_dev_t *hw, bool enable)
 static void vbus_appeared(void)
 {
     ESP_LOGD(TAG, "Appeared");
+#if (BVALID_OVERRIDE_SUPPORT_ENABLE)
     usb_dwc_ll_gotgctl_set_bvalid_override_value(&USB_DWC_REG, 1);
+#endif // BVALID_OVERRIDE_SUPPORT_ENABLE
     usb_dwc_ll_dctl_set_soft_disconnect(&USB_DWC_REG, false);
 }
 
@@ -84,8 +93,15 @@ static void vbus_appeared(void)
 static void vbus_disappeared(void)
 {
     ESP_LOGD(TAG, "Disappeared");
-    usb_dwc_ll_gotgctl_set_bvalid_override_value(&USB_DWC_REG, 0);
     usb_dwc_ll_dctl_set_soft_disconnect(&USB_DWC_REG, true);
+#if (BVALID_OVERRIDE_SUPPORT_ENABLE)
+    usb_dwc_ll_gotgctl_set_bvalid_override_value(&USB_DWC_REG, 0);
+#else
+    // Workaround for ESP32-P4 ECO5, USB-OTG peripheral v4.30a
+    // We are not able to detect the disconnection event from the PHY after VBUS goes low
+    // So we need to notify the upper logic about the disconnection event manually
+    tinyusb_device_detached();
+#endif // BVALID_OVERRIDE_SUPPORT_ENABLE
 }
 
 /**
@@ -153,6 +169,14 @@ esp_err_t tinyusb_vbus_monitor_init(tinyusb_vbus_monitor_config_t *config)
         return ESP_ERR_INVALID_STATE;
     }
 
+#if (CONFIG_TINYUSB_MSC_ENABLED)
+    // When MSC is enabled, timer task stack size must be sufficient to handle FS operations during detach events
+#if (configTIMER_TASK_STACK_DEPTH < 2300)
+    ESP_LOGE(TAG, "When MSC is enabled, configTIMER_TASK_STACK_DEPTH must be at least 2300 bytes to handle FS operations during attach/detach events");
+    return ESP_ERR_INVALID_ARG;
+#endif // (configTIMER_TASK_STACK_DEPTH)
+#endif // (CONFIG_TINYUSB_MSC_ENABLED)
+
     _vbus_ctx.gpio_num = config->gpio_num;
     _vbus_ctx.prev_state = false;
 
@@ -189,12 +213,15 @@ esp_err_t tinyusb_vbus_monitor_init(tinyusb_vbus_monitor_config_t *config)
     }
     // Disable GPIO interrupt
     gpio_intr_disable(_vbus_ctx.gpio_num);
+
+#if (BVALID_OVERRIDE_SUPPORT_ENABLE)
     // Set initial Bvalid override value and enable override
     usb_dwc_ll_gotgctl_set_bvalid_override_value(&USB_DWC_REG, 0);
     // Wait 1 microsecond (sufficient for >5 PHY clocks)
     esp_rom_delay_us(1);
     // Enable to override the signal from PHY
     usb_dwc_ll_gotgctl_enable_bvalid_override(&USB_DWC_REG, true);
+#endif // BVALID_OVERRIDE_SUPPORT_ENABLE
 
     // Device could be already connected, check the status and start the timer if needed
     if (gpio_get_level(_vbus_ctx.gpio_num)) {
@@ -214,7 +241,9 @@ esp_err_t tinyusb_vbus_monitor_init(tinyusb_vbus_monitor_config_t *config)
 
 timer_err:
     gpio_isr_handler_remove(_vbus_ctx.gpio_num);
+#if (BVALID_OVERRIDE_SUPPORT_ENABLE)
     usb_dwc_ll_gotgctl_enable_bvalid_override(&USB_DWC_REG, false);
+#endif // BVALID_OVERRIDE_SUPPORT_ENABLE
 isr_err:
     gpio_reset_pin(_vbus_ctx.gpio_num);
     _vbus_ctx.gpio_num = GPIO_NUM_NC;
@@ -248,8 +277,11 @@ esp_err_t tinyusb_vbus_monitor_deinit(void)
     xTimerDelete(_vbus_ctx.debounce_timer, 0);
     _vbus_ctx.debounce_timer = NULL;
 
+#if (BVALID_OVERRIDE_SUPPORT_ENABLE)
     // Disable to override the signal from PHY
     usb_dwc_ll_gotgctl_enable_bvalid_override(&USB_DWC_REG, false);
+#endif // BVALID_OVERRIDE_SUPPORT_ENABLE
+
     ESP_LOGD(TAG, "Deinit");
     return ESP_OK;
 }