refactor(hub): Moved list to dymanic member as the get parent info could come any moment

Author: roma-jam

host/usb/src/hub.c

@@ -87,11 +87,8 @@ typedef struct {
         } flags;                                    /**< Hub flags */
         root_port_state_t root_port_state;          /**< Root port state */
         unsigned int port_reqs;                     /**< Root port request flag */
-    } dynamic;                                      /**< Dynamic members. Require a critical section */
-
-    struct {
         TAILQ_HEAD(tailhead_devs, dev_tree_node_s) dev_nodes_tailq;     /**< Tailq of attached devices */
-    } single_thread;                                /**< Single thread members don't require a critical section so long as they are never accessed from multiple threads */
+    } dynamic;                                      /**< Dynamic members. Require a critical section */
 
     struct {
         hcd_port_handle_t root_port_hdl;            /**< Root port HCD handle */
@@ -150,12 +147,14 @@ static dev_tree_node_t *dev_tree_node_get_by_uid(unsigned int node_uid)
     dev_tree_node_t *dev_tree_node = NULL;
     dev_tree_node_t *dev_tree_iter;
     // Search the device tree nodes list for a device node with the specified parent
-    TAILQ_FOREACH(dev_tree_iter, &p_hub_driver_obj->single_thread.dev_nodes_tailq, tailq_entry) {
+    HUB_DRIVER_ENTER_CRITICAL();
+    TAILQ_FOREACH(dev_tree_iter, &p_hub_driver_obj->dynamic.dev_nodes_tailq, tailq_entry) {
         if (dev_tree_iter->uid == node_uid) {
             dev_tree_node = dev_tree_iter;
             break;
         }
     }
+    HUB_DRIVER_EXIT_CRITICAL();
     return dev_tree_node;
 }
 
@@ -200,9 +199,9 @@ static esp_err_t dev_tree_node_new(void *parent, uint8_t port_num, usb_speed_t s
         // Device registration may fail if there are no available HCD channels.
         goto fail;
     }
-
-    TAILQ_INSERT_TAIL(&p_hub_driver_obj->single_thread.dev_nodes_tailq, dev_tree_node, tailq_entry);
-
+    HUB_DRIVER_ENTER_CRITICAL();
+    TAILQ_INSERT_TAIL(&p_hub_driver_obj->dynamic.dev_nodes_tailq, dev_tree_node, tailq_entry);
+    HUB_DRIVER_EXIT_CRITICAL();
     ESP_LOGD(HUB_DRIVER_TAG, "Device tree node (port %d, uid %d): new", dev_tree_node->port_num, dev_tree_node->uid);
 
     hub_event_data_t event_data = {
@@ -225,13 +224,15 @@ static esp_err_t dev_tree_node_reset_completed(void *parent, uint8_t port_num)
     dev_tree_node_t *dev_tree_node = NULL;
     dev_tree_node_t *dev_tree_iter;
     // Search the device tree nodes list for a device node with the specified parent
-    TAILQ_FOREACH(dev_tree_iter, &p_hub_driver_obj->single_thread.dev_nodes_tailq, tailq_entry) {
+    HUB_DRIVER_ENTER_CRITICAL();
+    TAILQ_FOREACH(dev_tree_iter, &p_hub_driver_obj->dynamic.dev_nodes_tailq, tailq_entry) {
         if (dev_tree_iter->parent == parent &&
                 dev_tree_iter->port_num == port_num) {
             dev_tree_node = dev_tree_iter;
             break;
         }
     }
+    HUB_DRIVER_EXIT_CRITICAL();
 
     if (dev_tree_node == NULL) {
         ESP_LOGE(HUB_DRIVER_TAG, "Reset completed, but device tree node (port %d) not found", port_num);
@@ -253,13 +254,15 @@ static esp_err_t dev_tree_node_dev_gone(void *parent, uint8_t port_num)
     dev_tree_node_t *dev_tree_node = NULL;
     dev_tree_node_t *dev_tree_iter;
     // Search the device tree nodes list for a device node with the specified parent
-    TAILQ_FOREACH(dev_tree_iter, &p_hub_driver_obj->single_thread.dev_nodes_tailq, tailq_entry) {
+    HUB_DRIVER_ENTER_CRITICAL();
+    TAILQ_FOREACH(dev_tree_iter, &p_hub_driver_obj->dynamic.dev_nodes_tailq, tailq_entry) {
         if (dev_tree_iter->parent == parent &&
                 dev_tree_iter->port_num == port_num) {
             dev_tree_node = dev_tree_iter;
             break;
         }
     }
+    HUB_DRIVER_EXIT_CRITICAL();
 
     if (dev_tree_node == NULL) {
         ESP_LOGW(HUB_DRIVER_TAG, "Device tree node (port %d): not found", port_num);
@@ -289,22 +292,25 @@ static esp_err_t dev_tree_node_remove_by_parent(void *parent, uint8_t port_num)
     dev_tree_node_t *dev_tree_node = NULL;
     dev_tree_node_t *dev_tree_iter;
     // Search the device tree nodes list for a device node with the specified parent
-    TAILQ_FOREACH(dev_tree_iter, &p_hub_driver_obj->single_thread.dev_nodes_tailq, tailq_entry) {
+    HUB_DRIVER_ENTER_CRITICAL();
+    TAILQ_FOREACH(dev_tree_iter, &p_hub_driver_obj->dynamic.dev_nodes_tailq, tailq_entry) {
         if (dev_tree_iter->parent == parent &&
                 dev_tree_iter->port_num == port_num) {
             dev_tree_node = dev_tree_iter;
             break;
         }
     }
+    if (dev_tree_node) {
+        TAILQ_REMOVE(&p_hub_driver_obj->dynamic.dev_nodes_tailq, dev_tree_node, tailq_entry);
+    }
+    HUB_DRIVER_EXIT_CRITICAL();
 
     if (dev_tree_node == NULL) {
         ESP_LOGW(HUB_DRIVER_TAG, "Device tree node (port %d): not found", port_num);
         return ESP_ERR_NOT_FOUND;
     }
 
     ESP_LOGD(HUB_DRIVER_TAG, "Device tree node (port %d, uid %d): freeing", port_num, dev_tree_node->uid);
-
-    TAILQ_REMOVE(&p_hub_driver_obj->single_thread.dev_nodes_tailq, dev_tree_node, tailq_entry);
     heap_caps_free(dev_tree_node);
     return ESP_OK;
 }
@@ -596,8 +602,8 @@ esp_err_t hub_install(hub_config_t *hub_config, void **client_ret)
     hub_driver_obj->constant.proc_req_cb_arg = hub_config->proc_req_cb_arg;
     hub_driver_obj->constant.event_cb = hub_config->event_cb;
     hub_driver_obj->constant.event_cb_arg = hub_config->event_cb_arg;
-    TAILQ_INIT(&hub_driver_obj->single_thread.dev_nodes_tailq);
     // Driver is not installed, we can modify dynamic section outside of the critical section
+    TAILQ_INIT(&hub_driver_obj->dynamic.dev_nodes_tailq);
     hub_driver_obj->dynamic.root_port_state = ROOT_PORT_STATE_NOT_POWERED;
 
     HUB_DRIVER_ENTER_CRITICAL();