From 805f30fda97c80dc1ee9ca5d244d842d43614244 Mon Sep 17 00:00:00 2001 From: Chinmay Chhajed Date: Mon, 17 May 2021 16:13:36 +0530 Subject: [PATCH 1/3] bt controller: Fixed handling for invalid feature page. --- components/bt/controller/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 7703fca8bd..80c4416e20 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 7703fca8bdcb2a8feff40d47a95e4508b0e0e352 +Subproject commit 80c4416e20ec88c3363c6c3e602605b22b63d096 From cff9332ddd6fc53aa0d57f5001e41feec4b31f74 Mon Sep 17 00:00:00 2001 From: baohongde Date: Wed, 2 Jun 2021 11:35:56 +0800 Subject: [PATCH 2/3] components/bt: Delete BLE ADV priority high --- components/bt/Kconfig | 15 --------------- components/bt/controller/bt.c | 7 ------- components/bt/controller/lib | 2 +- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/components/bt/Kconfig b/components/bt/Kconfig index 343979a321..bdc361665c 100644 --- a/components/bt/Kconfig +++ b/components/bt/Kconfig @@ -426,21 +426,6 @@ menu "Bluetooth" If you set `BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD` to a small value or printf every adv lost event, it may cause adv packets lost more. - menuconfig BTDM_COEX_BT_OPTIONS - bool "Coexistence Bluetooth Side Options" - depends on ESP32_WIFI_SW_COEXIST_ENABLE - default n - help - Options of Bluetooth Side of WiFi and bluetooth coexistence. - - config BTDM_COEX_BLE_ADV_HIGH_PRIORITY - bool "Improve BLE ADV priority for WiFi & BLE coexistence" - depends on BTDM_COEX_BT_OPTIONS - default n - help - Improve BLE ADV coexistence priority to make it better performance. - For example, BLE mesh need to enable this option to improve BLE adv performance. - endmenu choice BT_HOST diff --git a/components/bt/controller/bt.c b/components/bt/controller/bt.c index 271182f068..885fca0265 100644 --- a/components/bt/controller/bt.c +++ b/components/bt/controller/bt.c @@ -222,7 +222,6 @@ extern int coex_bt_release_wrapper(uint32_t event); extern int coex_register_bt_cb_wrapper(coex_func_cb_t cb); extern uint32_t coex_bb_reset_lock_wrapper(void); extern void coex_bb_reset_unlock_wrapper(uint32_t restore); -extern void coex_ble_adv_priority_high_set(bool high); extern char _bss_start_btdm; extern char _bss_end_btdm; @@ -1313,12 +1312,6 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg) goto error; } - #ifdef CONFIG_BTDM_COEX_BLE_ADV_HIGH_PRIORITY - coex_ble_adv_priority_high_set(true); - #else - coex_ble_adv_priority_high_set(false); - #endif - btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; return ESP_OK; diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 80c4416e20..048bb4ba32 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 80c4416e20ec88c3363c6c3e602605b22b63d096 +Subproject commit 048bb4ba32e23f437b397ef9218ff99e295e65b6 From ac190b6a01efde740265d77c70d009f8175f58d5 Mon Sep 17 00:00:00 2001 From: liaowenhao Date: Fri, 21 May 2021 17:31:37 +0800 Subject: [PATCH 3/3] bugfix/fix crash when lmp flooding --- components/bt/controller/lib | 2 +- components/esp_rom/esp32/ld/esp32.rom.ld | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index 048bb4ba32..2289aaf8ed 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit 048bb4ba32e23f437b397ef9218ff99e295e65b6 +Subproject commit 2289aaf8ed5bbf3de7cab8f27d8b53653bdbddb2 diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld index b39b6ece06..e6859952d8 100644 --- a/components/esp_rom/esp32/ld/esp32.rom.ld +++ b/components/esp_rom/esp32/ld/esp32.rom.ld @@ -113,6 +113,7 @@ PROVIDE ( jd_prepare = 0x40060fa8 ); PROVIDE ( ke_env = 0x3ffb93cc ); PROVIDE ( ke_handler_search = 0x4001a430 ); PROVIDE ( ke_task_env = 0x3ffb81d4 ); +PROVIDE ( ke_event_env = 0x3ffb81a4 ); PROVIDE ( lb_default_handler = 0x3ff982b8 ); PROVIDE ( lb_default_state_tab_p_get = 0x4001c198 ); PROVIDE ( lb_env = 0x3ffb9424 ); @@ -1604,5 +1605,23 @@ PROVIDE ( prbs_64bytes = 0x3ff98992 ); PROVIDE ( nvds_env = 0x3ffb8364 ); PROVIDE ( nvds_magic_number = 0x3ff9912a ); PROVIDE ( TASK_DESC_LLD = 0x3ff98b58 ); + +PROVIDE ( ld_acl_clk_isr = 0x40030cf8 ); +PROVIDE ( ld_acl_evt_canceled_cbk = 0x40033944 ); +PROVIDE ( ld_acl_evt_stop_cbk = 0x40033870 ); +PROVIDE ( ld_acl_evt_start_cbk = 0x40030ab0 ); +PROVIDE ( ld_acl_test_mode_update = 0x40032050 ); +PROVIDE ( ld_acl_resched = 0x40033814 ); +PROVIDE ( ld_acl_rx_isr = 0x40033aa8 ); +PROVIDE ( lc_acl_disc_ind_handler = 0x4002f270 ); +PROVIDE ( lc_pca_sscan_start_req_handler = 0x40029b34 ); +PROVIDE ( lmp_feats_req_ext_handler = 0x4002ccb0 ); +PROVIDE ( ld_pscan_em_init = 0x4003e5e8 ); +PROVIDE ( ld_acl_rsw_start = 0x40032e90 ); +PROVIDE ( ld_acl_sniff_enter = 0x40031244 ); +PROVIDE ( ld_acl_sniff_trans_sched = 0x40033734 ); +PROVIDE ( lc_pwr_decr_ind_handler = 0x4002859c ); +PROVIDE ( lc_pwr_incr_ind_handler = 0x400284a8 ); +PROVIDE ( lc_pwr_max_ind_handler = 0x40028690 ); /* Above are static data, but can be used, not generated by script >>>>> btdm data */