From ac4e4c569d9ded124b25a0d82c8aebec94bbb921 Mon Sep 17 00:00:00 2001
From: sakumisu <1203593632@qq.com>
Date: Tue, 3 Jun 2025 22:46:48 +0800
Subject: [PATCH] feat(port/dwc2): add dcache api for esp & st

Signed-off-by: sakumisu <1203593632@qq.com>
---
 osal/idf/usb_config.h    | 11 +++++++++++
 port/dwc2/usb_glue_esp.c | 31 +++++++++++++++++++++++++------
 port/dwc2/usb_glue_st.c  | 19 ++++++++++++++++++-
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/osal/idf/usb_config.h b/osal/idf/usb_config.h
index 414a4c74..d7cc5885 100644
--- a/osal/idf/usb_config.h
+++ b/osal/idf/usb_config.h
@@ -334,4 +334,15 @@
 #define CONFIG_USB_HS
 #else
 #error "Unsupported SoC"
+#endif
+
+#if CONFIG_IDF_TARGET_ESP32P4
+#define CONFIG_USB_DCACHE_ENABLE
+
+#undef CONFIG_USB_ALIGN_SIZE
+#define CONFIG_USB_ALIGN_SIZE 32
+
+void usb_dcache_clean(uintptr_t addr, uint32_t size);
+void usb_dcache_invalidate(uintptr_t addr, uint32_t size);
+void usb_dcache_flush(uintptr_t addr, uint32_t size);
 #endif
\ No newline at end of file
diff --git a/port/dwc2/usb_glue_esp.c b/port/dwc2/usb_glue_esp.c
index 9b62db4e..ae197e2d 100644
--- a/port/dwc2/usb_glue_esp.c
+++ b/port/dwc2/usb_glue_esp.c
@@ -14,13 +14,13 @@
 #include "usbh_core.h"
 
 #ifdef CONFIG_IDF_TARGET_ESP32S2
-#define DEFAULT_CPU_FREQ_MHZ CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ
+#define DEFAULT_CPU_FREQ_MHZ    CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ
 #define DEFAULT_USB_INTR_SOURCE ETS_USB_INTR_SOURCE
 #elif CONFIG_IDF_TARGET_ESP32S3
-#define DEFAULT_CPU_FREQ_MHZ CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ
+#define DEFAULT_CPU_FREQ_MHZ    CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ
 #define DEFAULT_USB_INTR_SOURCE ETS_USB_INTR_SOURCE
 #elif CONFIG_IDF_TARGET_ESP32P4
-#define DEFAULT_CPU_FREQ_MHZ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ
+#define DEFAULT_CPU_FREQ_MHZ    CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ
 #define DEFAULT_USB_INTR_SOURCE ETS_USB_OTG_INTR_SOURCE
 #else
 #define DEFAULT_CPU_FREQ_MHZ 160
@@ -56,7 +56,7 @@ void usb_dc_low_level_init(uint8_t busid)
         USB_LOG_ERR("USB Interrupt Init Failed!\r\n");
         return;
     }
-    USB_LOG_INFO("cherryusb, version: "CHERRYUSB_VERSION_STR"\r\n");
+    USB_LOG_INFO("cherryusb, version: " CHERRYUSB_VERSION_STR "\r\n");
 }
 
 void usb_dc_low_level_deinit(uint8_t busid)
@@ -106,7 +106,7 @@ void usb_hc_low_level_init(struct usbh_bus *bus)
         USB_LOG_ERR("USB Interrupt Init Failed!\r\n");
         return;
     }
-    USB_LOG_INFO("cherryusb, version: "CHERRYUSB_VERSION_STR"\r\n");
+    USB_LOG_INFO("cherryusb, version: " CHERRYUSB_VERSION_STR "\r\n");
 }
 
 void usb_hc_low_level_deinit(struct usbh_bus *bus)
@@ -129,4 +129,23 @@ uint32_t usbh_get_dwc2_gccfg_conf(uint32_t reg_base)
 void usbd_dwc2_delay_ms(uint8_t ms)
 {
     vTaskDelay(pdMS_TO_TICKS(ms));
-}
\ No newline at end of file
+}
+
+#ifdef CONFIG_USB_DCACHE_ENABLE
+#include "esp_cache.h"
+
+void usb_dcache_clean(uintptr_t addr, size_t size)
+{
+    esp_cache_msync((void *)addr, size, ESP_CACHE_MSYNC_FLAG_TYPE_DATA | ESP_CACHE_MSYNC_FLAG_DIR_C2M);
+}
+
+void usb_dcache_invalidate(uintptr_t addr, size_t size)
+{
+    esp_cache_msync((void *)addr, size, ESP_CACHE_MSYNC_FLAG_TYPE_DATA | ESP_CACHE_MSYNC_FLAG_DIR_M2C);
+}
+
+void usb_dcache_flush(uintptr_t addr, size_t size)
+{
+    esp_cache_msync((void *)addr, size, ESP_CACHE_MSYNC_FLAG_TYPE_DATA | ESP_CACHE_MSYNC_FLAG_DIR_C2M | ESP_CACHE_MSYNC_FLAG_DIR_M2C);
+}
+#endif
\ No newline at end of file
diff --git a/port/dwc2/usb_glue_st.c b/port/dwc2/usb_glue_st.c
index cabf57d0..9925f5e9 100644
--- a/port/dwc2/usb_glue_st.c
+++ b/port/dwc2/usb_glue_st.c
@@ -235,4 +235,21 @@ void OTG_FS_IRQHandler(void)
 void OTG_HS_IRQHandler(void)
 {
     g_usb_dwc2_irq[1](g_usb_dwc2_busid[1]);
-}
\ No newline at end of file
+}
+
+#ifdef CONFIG_USB_DCACHE_ENABLE
+void usb_dcache_clean(uintptr_t addr, size_t size)
+{
+    SCB_CleanDCache_by_Addr((void *)addr, size);
+}
+
+void usb_dcache_invalidate(uintptr_t addr, size_t size)
+{
+    SCB_InvalidateDCache_by_Addr((void *)addr, size);
+}
+
+void usb_dcache_flush(uintptr_t addr, size_t size)
+{
+    SCB_CleanInvalidateDCache_by_Addr((void *)addr, size);
+}
+#endif
\ No newline at end of file