Fix USB host split transactions

Author: facchinm

libraries/USBHOST/examples/Shell/Shell.ino

@@ -31,6 +31,9 @@
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    SOFTWARE.
 */
+
+#include "USBHOST.h"
+
 extern "C" {
 #include "teeny_usb.h"
 #include "class/host/tusbh.h"
@@ -44,6 +47,8 @@ extern "C" {
 #include "class/host/usb_key_code.h"
 }
 
+#include "mbed.h"
+
 #define TEENYUSB_LOGO \
   " _______                    _    _  _____ ____  \n"           \
   "|__   __|                  | |  | |/ ____|  _ \\ \n"          \

libraries/USBHOST/src/board_config.h

@@ -45,7 +45,7 @@
 //#define  OTG_FS_EMBEDDED_PHY
 
 /* Enable DMA for High speed phy */
-//#define  OTG_HS_ENABLE_DMA
+#define  OTG_HS_ENABLE_DMA
 
 /* Support for other speed config and device qualifier descriptor */
 #define  SUPPORT_OTHER_SPEED
@@ -98,6 +98,9 @@ do {} while(0U)
 #define  HOST_PORT_POWER_ON_FS() \
 do{}while(0)
 
+//#define RTOS_INTERRUPT_ENTER    core_util_critical_section_enter
+//#define RTOS_INTERRUPT_LEAVE    core_util_critical_section_exit
+
 // init the stdio hardware
 void stdio_init(void);
 // stdin recv char handler

libraries/USBHOST/src/class/host/tusbh.c

@@ -95,6 +95,7 @@ const char* channelState(channel_state_t state)
         SSS( TUSB_CS_XFER_ONGOING          )
         SSS( TUSB_CS_XFER_CANCEL           )
         SSS( TUSB_CS_UNKNOWN_ERROR         )
+        SSS( TUSB_CS_TRANSFER_CSPLIT       )
     }
     return "Unknown Channel State";
 #undef SSS
@@ -151,6 +152,44 @@ void tusbh_close_pipe(tusbh_device_t* dev, int pipe_num)
     tusb_pipe_close(&pipe);
 }
 
+#if 1
+static channel_state_t tusbh_pipe_xfer_and_wait(tusbh_device_t* dev, int pipe_num, uint8_t is_data, void* data, uint16_t len, uint32_t timeout)
+{
+    void* bak = dev->host->hc[pipe_num].user_data;
+    dev->host->hc[pipe_num].user_data = &dev->xfer_evt;
+
+    channel_state_t r = TUSB_CS_UNKNOWN_ERROR;
+
+    uint16_t remain = len;
+    uint8_t* p = (uint8_t*)data;
+    int res = 0;
+
+    dev->host->hc[pipe_num].toggle_in = 1;
+    channel_state_t s;
+
+    do{
+        tusb_host_xfer_data(dev->host, pipe_num, is_data, p, remain);
+        tusbh_evt_wait(dev->xfer_evt.event, timeout);
+        tusb_hc_data_t* hc = &dev->host->hc[pipe_num];
+        s = (channel_state_t)hc->state;
+        if (s != TUSB_CS_TRANSFER_CSPLIT) {
+            if(s != TUSB_CS_TRANSFER_COMPLETE){
+                res = -(int)s;
+                goto error;
+            }
+            remain -= hc->count;
+            p += hc->count;
+        }
+    }while((remain && len) || (s == TUSB_CS_TRANSFER_CSPLIT));
+    res = p - ((uint8_t*)data);
+error:
+    dev->host->hc[pipe_num].user_data = bak;
+    r = (channel_state_t)dev->host->hc[pipe_num].state;
+    return r;
+}
+
+#else
+
 static channel_state_t tusbh_pipe_xfer_and_wait(tusbh_device_t* dev, int pipe_num, uint8_t is_data, void* data, uint16_t len, uint32_t timeout)
 {   
     void* bak = dev->host->hc[pipe_num].user_data;
@@ -170,6 +209,7 @@ static channel_state_t tusbh_pipe_xfer_and_wait(tusbh_device_t* dev, int pipe_nu
 
     return r;
 }
+#endif
 
 int tusbh_ep_xfer(tusbh_ep_info_t* ep, void* data, uint16_t len, uint32_t timeout)
 {

libraries/USBHOST/src/stm32_otg_init.c

@@ -428,6 +428,8 @@ static void tusb_otg_core_init(tusb_core_t* core)
     // only HS core has DMA feature
     USBx->GAHBCFG |= USB_OTG_GAHBCFG_HBSTLEN_2;
     USBx->GAHBCFG |= USB_OTG_GAHBCFG_DMAEN;
+    SCB_CleanInvalidateDCache();
+    SCB_DisableDCache();
   }
 #endif
 }

libraries/USBHOST/src/teeny_usb.h

@@ -285,6 +285,7 @@ typedef enum {
   TUSB_CS_XFER_ONGOING,             /**< Channel data transfer is on going */
   TUSB_CS_XFER_CANCEL,              /**< Channel data transfer is canceled */
   TUSB_CS_UNKNOWN_ERROR,            /**< Channel Unknown error */
+  TUSB_CS_TRANSFER_CSPLIT,          /**< Request complete split */
 }channel_state_t;
 
 /** Enums for ID line state

libraries/USBHOST/src/teeny_usb_stm32_otg_host.c

@@ -446,6 +446,15 @@ static void tusb_otg_in_channel_handler(tusb_host_t* host, uint8_t ch_num)
         }
       }
     }
+    else if (HC->HCSPLT & USB_OTG_HCSPLT_SPLITEN)
+    {
+      if (!(HC->HCSPLT & USB_OTG_HCSPLT_COMPLSPLT)) {
+        HC->HCSPLT |= USB_OTG_HCSPLT_COMPLSPLT;
+
+        hc->state = TUSB_CS_TRANSFER_CSPLIT;
+        hc->xfer_done = 1;
+      }
+    }
     else
     {
       /* ... */
@@ -675,6 +684,14 @@ static void tusb_otg_out_channel_handler(tusb_host_t* host, uint8_t ch_num)
     {
         hc->xfer_done = 1;
     }
+    else if (HC->HCSPLT & USB_OTG_HCSPLT_SPLITEN)
+    {
+      if (!(HC->HCSPLT & USB_OTG_HCSPLT_COMPLSPLT)) {
+        HC->HCSPLT |= USB_OTG_HCSPLT_COMPLSPLT;
+        hc->state = TUSB_CS_TRANSFER_CSPLIT;
+        hc->xfer_done = 1;
+      }
+    }
     else
     {
       /* ... */
@@ -990,6 +1007,11 @@ uint32_t tusb_otg_host_submit(tusb_host_t* host, uint8_t hc_num)
             hc->toggle_out = 1;
             data_pid = HC_PID_DATA1;
           }
+        } else {
+          if (is_in && is_dma && (len>=mps)){
+            // control in
+            data_pid = hc->toggle_in ? HC_PID_DATA1 : HC_PID_DATA0;
+          }
         }
       }else{
         // otherwise setup packet
@@ -1056,6 +1078,11 @@ uint32_t tusb_otg_host_xfer_data(tusb_host_t* host, uint8_t hc_num, uint8_t is_d
   hc->ch_buf = data;
   hc->size = len;
   hc->count = 0;
+
+  if (hc->state != TUSB_CS_TRANSFER_CSPLIT) {
+    HC->HCSPLT = 0;
+  }
+
   hc->state = TUSB_CS_INIT;
   hc->do_ping = 0;
   hc->is_data = is_data;
@@ -1076,6 +1103,22 @@ uint32_t tusb_otg_host_xfer_data(tusb_host_t* host, uint8_t hc_num, uint8_t is_d
     }
 #endif
   }
+
+  if (hc->speed != PORT_SPEED_HIGH) {
+    // SPLIT enable
+    uint32_t tmpreg = USB_OTG_HCSPLT_SPLITEN;
+    tmpreg |= USB_OTG_HCSPLT_XACTPOS_0;
+    tmpreg |= USB_OTG_HCSPLT_XACTPOS_1;
+    /* Hub device address */
+    tmpreg |= USB_OTG_HCSPLT_HUBADDR_0;
+    /* Port number */
+    //tmpreg |= USB_OTG_HCSPLT_PRTADDR_0; // port1 -> USB_OTG_HCSPLT_PRTADDR_0
+    tmpreg |= USB_OTG_HCSPLT_PRTADDR_1; // port2 -> USB_OTG_HCSPLT_PRTADDR_1
+    //tmpreg |= USB_OTG_HCSPLT_PRTADDR_2; // port4 -> USB_OTG_HCSPLT_PRTADDR_2
+    HC->HCSPLT |= tmpreg;
+    __HAL_HCD_UNMASK_HALT_HC_INT(hc_num);
+  }
+
   tusb_otg_host_submit(host, hc_num);
   return 0;
 }