From 09f0c98c38ce6b95d677b1c64d025f1101d0ca83 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 2 Jul 2025 15:13:55 +0800 Subject: [PATCH 1/5] change(ble): [AUTO_MR] Update lib_esp32h2 to d2d70d40 (cherry picked from commit 1671932345787d473ecbe3aa8f933f365b664159) Co-authored-by: zwl --- components/bt/controller/lib_esp32h2/esp32h2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib index e90088b356..513c3fb61e 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit e90088b35639ee9b41ab67fcd5b8dab5395cfacb +Subproject commit 513c3fb61e0aa30b22d920ec17408a13be4ef93a From 49fbf68cf69a121490516e128f7277f91b1fab00 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 2 Jul 2025 15:13:57 +0800 Subject: [PATCH 2/5] change(ble): [AUTO_MR] Update lib_esp32c6 to d2d70d40 (cherry picked from commit 736cd8496759d25017581f6961d72512e54583be) Co-authored-by: zwl --- components/bt/controller/lib_esp32c6/esp32c6-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib index fa4b7f913d..80f6b7e6e4 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit fa4b7f913d6b65ea30b8d06eb1e62dc1b86b7843 +Subproject commit 80f6b7e6e4bcfc28684a9273a2bc037097255e51 From 65b2b60aa2701e8deafc06d635dd8535a5ebc6dd Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 2 Jul 2025 15:13:59 +0800 Subject: [PATCH 3/5] change(ble): [AUTO_MR] Update lib_esp32c2 to 9af627ef (cherry picked from commit 6fac09d0c39de6379507e0aa2a7a3ba46b8569d2) Co-authored-by: zwl --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index 64ba4e23f3..7be8be96db 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 64ba4e23f3bb2e8ecf26f7901b0657a950682d3d +Subproject commit 7be8be96db63928b5c4c6785f633eddbffa3287c From f330a3c631adb35999a9ffc3f912513831fbeb00 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 2 Jul 2025 15:14:02 +0800 Subject: [PATCH 4/5] fix(ble): fixed occasional assert triggered during controller disable on ESP32-C2 (cherry picked from commit 7b1a7cc4c34a559bb848595468a804c9457c7ea8) Co-authored-by: zwl --- components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld index 7b2360a2c3..e6d3094d24 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld @@ -806,7 +806,7 @@ r_ble_lll_scan_process_rsp_in_isr = 0x400016e8; r_ble_lll_scan_restart = 0x400016f0; r_ble_lll_scan_rx_isr_on_aux = 0x400016f4; r_ble_lll_scan_rx_isr_on_legacy = 0x400016f8; -r_ble_lll_scan_rx_pkt_isr = 0x400016fc; +//r_ble_lll_scan_rx_pkt_isr = 0x400016fc; r_ble_lll_scan_sched_next_aux = 0x40001700; r_ble_lll_scan_sched_remove = 0x40001704; r_ble_lll_scan_start = 0x40001708; @@ -1156,8 +1156,8 @@ r_hal_timer_env_deinit = 0x40002f18; r_ble_ll_env_deinit = 0x40002f1c; r_ble_ll_generic_data_deinit = 0x40002f20; //r_ble_hci_trans_env_deinit = 0x40002f24; -r_ble_ll_conn_callout_env_init = 0x40002f28; -r_ble_ll_conn_callout_env_deinit = 0x40002f2c; +//r_ble_ll_conn_callout_env_init = 0x40002f28; +//r_ble_ll_conn_callout_env_deinit = 0x40002f2c; r_ble_ll_scan_callout_env_init = 0x40002f30; r_ble_ll_scan_callout_env_deinit = 0x40002f34; r_ble_ll_callout_env_init = 0x40002f38; From 0dba389a1c4086a83b0dd783af66fc37c9bc3cff Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 2 Jul 2025 15:14:04 +0800 Subject: [PATCH 5/5] fix(ble): ensure ble controller disable safety for ESP32-C2 (cherry picked from commit cbe6f68d3c2b43c0d23192f62cfc6a25fbcc1d88) Co-authored-by: Zhou Xiao --- components/bt/controller/esp32c2/bt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/bt/controller/esp32c2/bt.c b/components/bt/controller/esp32c2/bt.c index a329881eeb..2f5028e958 100644 --- a/components/bt/controller/esp32c2/bt.c +++ b/components/bt/controller/esp32c2/bt.c @@ -141,7 +141,7 @@ extern void esp_panic_handler_feed_wdts(void); #endif // CONFIG_BT_LE_CONTROLLER_LOG_ENABLED extern int ble_controller_deinit(void); extern int ble_controller_enable(uint8_t mode); -extern int ble_controller_disable(void); +extern void ble_controller_disable(void); extern int esp_register_ext_funcs (struct ext_funcs_t *); extern void esp_unregister_ext_funcs (void); extern int esp_ble_ll_set_public_addr(const uint8_t *addr); @@ -1077,9 +1077,9 @@ esp_err_t esp_bt_controller_disable(void) ESP_LOGW(NIMBLE_PORT_LOG_TAG, "invalid controller state"); return ESP_FAIL; } - if (ble_controller_disable() != 0) { - return ESP_FAIL; - } + ble_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; + + ble_controller_disable(); ble_stack_disable(); if (s_ble_active) { esp_phy_disable(PHY_MODEM_BT); @@ -1091,7 +1091,6 @@ esp_err_t esp_bt_controller_disable(void) #if CONFIG_SW_COEXIST_ENABLE coex_disable(); #endif - ble_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; return ESP_OK; }