feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/hub_error_handling_v5.0' into 'release/v5.0'

Browse Source 
fix(usb/host): Fix disconnection error handling (backport to v5.0)

See merge request espressif/esp-idf!37229
This commit is contained in:
morris
2025-02-26 10:00:41 +08:00
parent 90766acef1 e3b21fb932
commit 16aba9936a
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/usb/hub.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -834,6 +834,11 @@ static void root_port_handle_events(hcd_port_handle_t root_port_hdl)
break; break;
case HUB_DRIVER_STATE_ROOT_ENUM: case HUB_DRIVER_STATE_ROOT_ENUM:
// This occurred during enumeration. Therefore, we need to recover the failed enumeration // This occurred during enumeration. Therefore, we need to recover the failed enumeration
// Because we want to in this order:
// 1. Reset ENUM FSM
// 2. Recover the port
// We do not set action 'HUB_DRIVER_FLAG_ACTION_PORT_RECOVER' here,
// it will be set from enum_handle_events()->enum_stage_cleanup_failed()
p_hub_driver_obj->dynamic.flags.actions |= HUB_DRIVER_FLAG_ACTION_ENUM_EVENT; p_hub_driver_obj->dynamic.flags.actions |= HUB_DRIVER_FLAG_ACTION_ENUM_EVENT;
p_hub_driver_obj->single_thread.enum_ctrl.stage = ENUM_STAGE_CLEANUP_FAILED; p_hub_driver_obj->single_thread.enum_ctrl.stage = ENUM_STAGE_CLEANUP_FAILED;
break; break;
@@ -841,6 +846,14 @@ static void root_port_handle_events(hcd_port_handle_t root_port_hdl)
// There was an enumerated device. We need to indicate to USBH that the device is gone // There was an enumerated device. We need to indicate to USBH that the device is gone
pass_event_to_usbh = true; pass_event_to_usbh = true;
break; break;
case HUB_DRIVER_STATE_ROOT_RECOVERY:
// In a very rare case of having 2 or more events of type DISCONNECTION/ERROR/OVERCURRENT
// in a short time, we can endup here, where the driver has not yet recovered from
// the 1st error but already got a 2nd error.
// Just check that the RECOVER action is requested and return
assert(p_hub_driver_obj->dynamic.flags.actions | HUB_DRIVER_FLAG_ACTION_PORT_RECOVER);
break;
case HUB_DRIVER_STATE_INSTALLED:
default: default:
abort(); // Should never occur abort(); // Should never occur
break; break;