rp2040: avoid device-mode state machine hang
Don't mark IN buffers as available during the last 200us of a full-speed frame. This avoids a situation seen with the USB2.0 hub on a Raspberry Pi 4 where a late IN token before the next full-speed SOF can cause port babble and a corrupt ACK packet. The nature of the data corruption has a chance to cause device lockup. Use the next SOF to mark delayed buffers as available. This reduces available Bulk IN bandwidth by approximately 20%, and requires that the SOF interrupt is enabled while these transfers are ongoing. Inherit the top-level enable from the corresponding Pico-SDK flag. Applications that will not use the device in a situation where it could be plugged into a Pi 4 or Pi 400 (for example, when directly connected to a commodity hub or other host) can turn off the flag in the SDK. v2: use a field in hw_endpoint to mark pending. v3: Partial rewrite following review comments - Stub functions out if the workaround is not required - Only force-enable SOF while any vulnerable endpoints are active - Respect dcd_sof_enable() functionality - Get rid of all but necessary ifdef hackery - Fix a bug where the "endpoint lock" was used with an uninitialised pointer.
This commit is contained in:
@@ -38,10 +38,6 @@ const char *ep_dir_string[] = {
|
||||
"in",
|
||||
};
|
||||
|
||||
#if TUD_OPT_RP2040_USB_DEVICE_UFRAME_FIX
|
||||
volatile uint32_t last_sof = 0;
|
||||
#endif
|
||||
|
||||
static void _hw_endpoint_xfer_sync(struct hw_endpoint *ep);
|
||||
|
||||
// if usb hardware is in host mode
|
||||
@@ -54,6 +50,41 @@ TU_ATTR_ALWAYS_INLINE static inline bool is_host_mode(void)
|
||||
//
|
||||
//--------------------------------------------------------------------+
|
||||
|
||||
#if TUD_OPT_RP2040_USB_DEVICE_UFRAME_FIX
|
||||
volatile uint32_t last_sof = 0;
|
||||
|
||||
bool rp2040_critical_frame_period(struct hw_endpoint *ep)
|
||||
{
|
||||
uint32_t delta;
|
||||
|
||||
if (usb_hw->main_ctrl & USB_MAIN_CTRL_HOST_NDEVICE_BITS)
|
||||
return false;
|
||||
|
||||
if (tu_edpt_dir(ep->ep_addr) == TUSB_DIR_OUT ||
|
||||
ep->transfer_type == TUSB_XFER_INTERRUPT ||
|
||||
ep->transfer_type == TUSB_XFER_ISOCHRONOUS)
|
||||
return false;
|
||||
|
||||
/* Avoid the last 200us (uframe 6.5-7) of a frame, up to the EOF2 point.
|
||||
* The device state machine cannot recover from receiving an incorrect PID
|
||||
* when it is expecting an ACK.
|
||||
*/
|
||||
delta = time_us_32() - last_sof;
|
||||
if (delta < 800 || delta > 998) {
|
||||
return false;
|
||||
}
|
||||
TU_LOG(3, "Avoiding sof %u now %lu last %lu\n", (usb_hw->sof_rd + 1) & USB_SOF_RD_BITS, now, last_sof);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool rp2040_ep_needs_sof(struct hw_endpoint *ep) {
|
||||
if (tu_edpt_dir(ep->ep_addr) == TUSB_DIR_IN &&
|
||||
ep->transfer_type == TUSB_XFER_BULK)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
void rp2040_usb_init(void)
|
||||
{
|
||||
// Reset usb controller
|
||||
@@ -215,7 +246,14 @@ void hw_endpoint_xfer_start(struct hw_endpoint *ep, uint8_t *buffer, uint16_t to
|
||||
ep->active = true;
|
||||
ep->user_buf = buffer;
|
||||
|
||||
hw_endpoint_start_next_buffer(ep);
|
||||
if (rp2040_ep_needs_sof(ep))
|
||||
usb_hw_set->inte = USB_INTS_DEV_SOF_BITS;
|
||||
|
||||
if(!rp2040_critical_frame_period(ep)) {
|
||||
hw_endpoint_start_next_buffer(ep);
|
||||
} else {
|
||||
ep->pending = 1;
|
||||
}
|
||||
hw_endpoint_lock_update(ep, -1);
|
||||
}
|
||||
|
||||
@@ -331,7 +369,11 @@ bool __tusb_irq_path_func(hw_endpoint_xfer_continue)(struct hw_endpoint *ep)
|
||||
}
|
||||
else
|
||||
{
|
||||
hw_endpoint_start_next_buffer(ep);
|
||||
if(!rp2040_critical_frame_period(ep)) {
|
||||
hw_endpoint_start_next_buffer(ep);
|
||||
} else {
|
||||
ep->pending = 1;
|
||||
}
|
||||
}
|
||||
|
||||
hw_endpoint_lock_update(ep, -1);
|
||||
|
||||
Reference in New Issue
Block a user