diff --git a/src/tusb_option.h b/src/tusb_option.h
index eb072faab..fe49f7bf2 100644
--- a/src/tusb_option.h
+++ b/src/tusb_option.h
@@ -309,7 +309,7 @@
     #define CFG_TUD_EDPT_DEDICATED_HWFIFO 1
   #endif
 
-  #if CFG_TUD_DWC2_SLAVE_ENABLE && !CFG_TUH_DWC2_DMA_ENABLE
+  #if CFG_TUH_DWC2_SLAVE_ENABLE && !CFG_TUH_DWC2_DMA_ENABLE
     #define CFG_TUH_EDPT_DEDICATED_HWFIFO 1
   #endif
 #endif
@@ -321,10 +321,18 @@
   #ifndef CFG_TUD_CI_HS_VBUS_CHARGE_DEFAULT
     #define CFG_TUD_CI_HS_VBUS_CHARGE_DEFAULT 0
   #endif
-
   #define CFG_TUD_CI_HS_VBUS_CHARGE CFG_TUD_CI_HS_VBUS_CHARGE_DEFAULT
 #endif
 
+// CI_HS support FIFO transfer if endpoint buffer is 4k aligned and size is multiple of 4k, also DCACHE is disabled
+#ifndef CFG_TUD_CI_HS_EPBUF_4K_ALIGNED
+  #define CFG_TUD_CI_HS_EPBUF_4K_ALIGNED 0
+#endif
+
+#if CFG_TUD_CI_HS_EPBUF_4K_ALIGNED && !CFG_TUD_MEM_DCACHE_ENABLE
+  #define CFG_TUD_EDPT_DEDICATED_HWFIFO 1
+#endif
+
 //------------- pio-usb -------------//
 // Enable PIO-USB software host controller
 #ifndef CFG_TUH_RPI_PIO_USB
@@ -335,11 +343,27 @@
   #define CFG_TUD_RPI_PIO_USB 0
 #endif
 
-// MAX3421 Host controller option
+//------------ MAX3421 -------------//
+// Enable MAX3421 USB host controller
 #ifndef CFG_TUH_MAX3421
   #define CFG_TUH_MAX3421  0
 #endif
 
+//------------ FSDEV --------------//
+#if defined(TUP_USBIP_FSDEV)
+  #define CFG_TUD_EDPT_DEDICATED_HWFIFO 1
+#endif
+
+//------------ MUSB --------------//
+#if defined(TUP_USBIP_MUSB)
+  #define CFG_TUD_EDPT_DEDICATED_HWFIFO 1
+#endif
+
+//------------ RUSB2 --------------//
+#if defined(TUP_USBIP_RUSB2)
+  #define CFG_TUD_EDPT_DEDICATED_HWFIFO 1
+#endif
+
 //--------------------------------------------------------------------
 // RootHub Mode detection
 //--------------------------------------------------------------------