From b7ab286edf98bd03ff655b5feac114af377a4014 Mon Sep 17 00:00:00 2001 From: Chinmay Chhajed Date: Mon, 17 May 2021 14:10:01 +0530 Subject: [PATCH 1/3] bt controller: Fixed handling for invalid feature page. --- components/bt/controller/lib_esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index ec61ca3caa..606e0f422c 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit ec61ca3caa64874e11f39a92654b4160bb5db06e +Subproject commit 606e0f422ce612936b857b1599bff2662544e12b From f0679fe17563c53cc1096ddb9a18fe95b9f59bd3 Mon Sep 17 00:00:00 2001 From: baohongde Date: Wed, 7 Apr 2021 16:46:52 +0800 Subject: [PATCH 2/3] components/bt: Delete BLE ADV priority high --- components/bt/controller/esp32/Kconfig.in | 15 --------------- components/bt/controller/esp32/bt.c | 7 ------- components/bt/controller/lib_esp32 | 2 +- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/components/bt/controller/esp32/Kconfig.in b/components/bt/controller/esp32/Kconfig.in index 04ec13d25f..d12712862d 100644 --- a/components/bt/controller/esp32/Kconfig.in +++ b/components/bt/controller/esp32/Kconfig.in @@ -415,18 +415,3 @@ config BTDM_BLE_ADV_REPORT_DISCARD_THRSHOLD of ADV packets lost in the controller reaches this threshold. It is better to set a larger value. 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. diff --git a/components/bt/controller/esp32/bt.c b/components/bt/controller/esp32/bt.c index c7c8ccf809..ff93b07ef1 100644 --- a/components/bt/controller/esp32/bt.c +++ b/components/bt/controller/esp32/bt.c @@ -240,7 +240,6 @@ extern uint8_t coex_schm_curr_period_get(void); extern void * coex_schm_curr_phase_get(void); extern int coex_wifi_channel_get(uint8_t *primary, uint8_t *secondary); extern int coex_register_wifi_channel_change_callback(void *cb); -extern void coex_ble_adv_priority_high_set(bool high); extern char _bss_start_btdm; extern char _bss_end_btdm; @@ -1464,12 +1463,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_esp32 b/components/bt/controller/lib_esp32 index 606e0f422c..1f7e45e2f6 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 606e0f422ce612936b857b1599bff2662544e12b +Subproject commit 1f7e45e2f645f115fc4ca7fc35ecee2d894ff2ea From 7e4f7867f0c5f7981169efa9e3dc3cb61c40c868 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_esp32 | 2 +- components/esp_rom/esp32/ld/esp32.rom.ld | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32 index 1f7e45e2f6..3adb056b8a 160000 --- a/components/bt/controller/lib_esp32 +++ b/components/bt/controller/lib_esp32 @@ -1 +1 @@ -Subproject commit 1f7e45e2f645f115fc4ca7fc35ecee2d894ff2ea +Subproject commit 3adb056b8ae4f67e929a6ba7ea1d918fec02aeaf diff --git a/components/esp_rom/esp32/ld/esp32.rom.ld b/components/esp_rom/esp32/ld/esp32.rom.ld index e4eb517ef3..d433cc5a54 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 ); @@ -1602,4 +1603,22 @@ 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 */