Merge branch 'bugfix/invalid_feat_page_exec_v4.1' into 'release/v4.1'

bt controller: Fixed handling for invalid feature page.

See merge request espressif/esp-idf!13573

components/bt/CMakeLists.txt

@@ -568,6 +568,6 @@ idf_component_register(SRCS "${srcs}"
 if(CONFIG_BT_ENABLED)
     target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-implicit-fallthrough -Wno-unused-const-variable)
 
-    target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib")
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib/esp32")
     target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
 endif()

components/bt/Kconfig

@@ -427,21 +427,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

components/bt/component.mk

@@ -9,11 +9,11 @@ COMPONENT_ADD_INCLUDEDIRS := include
 
 LIBS := btdm_app
 
-COMPONENT_ADD_LDFLAGS     := -lbt -L $(COMPONENT_PATH)/controller/lib \
+COMPONENT_ADD_LDFLAGS     := -lbt -L $(COMPONENT_PATH)/controller/lib/esp32 \
                            $(addprefix -l,$(LIBS))
 
 # re-link program if BT binary libs change
-COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib/lib%.a,$(LIBS))
+COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib/esp32/lib%.a,$(LIBS))
 
 COMPONENT_SUBMODULES += controller/lib
 

components/bt/controller/bt.c

@@ -238,7 +238,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;
@@ -1461,12 +1460,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;

components/bt/controller/lib

@@ -1 +1 @@
-Subproject commit c2e961d07cba8e5a08749e1f1d5c6ffe76d4b115
+Subproject commit 3adb056b8ae4f67e929a6ba7ea1d918fec02aeaf

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 );
@@ -1603,5 +1604,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 */