Merge branch 'bugfix/ble_update_lib_1027_5.1' into 'release/v5.1'

ble: update c6 h2 lib to 5bd7cb83, c2 lib to 1d31e175

See merge request espressif/esp-idf!26711

components/bt/controller/esp32c2/bt.c

@@ -1003,7 +1003,7 @@ uint8_t esp_ble_get_chip_rev_version(void)
 static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, bool end)
 {
     for (int i = 0; i < len; i++) {
-        esp_rom_printf("%02x,", addr[i]);
+        esp_rom_printf("%02x ", addr[i]);
     }
     if (end) {
         esp_rom_printf("\n");

components/bt/controller/esp32c6/Kconfig.in

@@ -212,6 +212,15 @@ menu "Memory Settings"
         help
             Dynamic memory size of block 2
 
+    config BT_LE_MSYS_BUF_FROM_HEAP
+        bool "Get Msys Mbuf from heap"
+        default y
+        depends on BT_LE_MSYS_INIT_IN_CONTROLLER
+        help
+            This option sets the source of the shared msys mbuf memory between
+            the Host and the Controller. Allocate the memory from the heap if
+            this option is sets, from the mempool otherwise.
+
     config BT_LE_ACL_BUF_COUNT
         int "ACL Buffer count"
         default 10
@@ -539,5 +548,5 @@ config BT_LE_SCAN_DUPL_CACHE_REFRESH_PERIOD
         again.
 
 config BT_LE_MSYS_INIT_IN_CONTROLLER
-    bool
+    bool "Msys Mbuf Init in Controller"
     default y

components/bt/controller/esp32c6/bt.c

@@ -1173,7 +1173,7 @@ esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t po
 static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, bool end)
 {
     for (int i = 0; i < len; i++) {
-        esp_rom_printf("%02x,", addr[i]);
+        esp_rom_printf("%02x ", addr[i]);
     }
     if (end) {
         esp_rom_printf("\n");

components/bt/controller/esp32h2/bt.c

@@ -1147,7 +1147,7 @@ esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t po
 static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, bool end)
 {
     for (int i = 0; i < len; i++) {
-        esp_rom_printf("%02x,", addr[i]);
+        esp_rom_printf("%02x ", addr[i]);
     }
     if (end) {
         esp_rom_printf("\n");

components/bt/host/nimble/Kconfig.in

@@ -275,6 +275,15 @@ menu "Memory Settings"
         help
                 Dynamic memory size of block 2
 
+    config BT_NIMBLE_MSYS_BUF_FROM_HEAP
+        bool "Get Msys Mbuf from heap"
+        default y
+        depends on BT_LE_MSYS_INIT_IN_CONTROLLER
+        help
+            This option sets the source of the shared msys mbuf memory between
+            the Host and the Controller. Allocate the memory from the heap if
+            this option is sets, from the mempool otherwise.
+
     config BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT
         int "ACL Buffer count"
         depends on BT_NIMBLE_ENABLED

components/bt/porting/nimble/src/os_msys_init.c

@@ -30,6 +30,11 @@ static STAILQ_HEAD(, os_mbuf_pool) g_msys_pool_list =
 
 #define OS_MSYS_1_SANITY_MIN_COUNT MYNEWT_VAL(MSYS_1_SANITY_MIN_COUNT)
 #define OS_MSYS_2_SANITY_MIN_COUNT MYNEWT_VAL(MSYS_2_SANITY_MIN_COUNT)
+#if CONFIG_BT_NIMBLE_MSYS_BUF_FROM_HEAP
+#define OS_MSYS_BLOCK_FROM_HEAP                 (1)
+#else
+#define OS_MSYS_BLOCK_FROM_HEAP                 (0)
+#endif // CONFIG_BT_NIMBLE_MSYS_BUF_FROM_HEAP
 #else
 #define OS_MSYS_1_BLOCK_COUNT CONFIG_BT_LE_MSYS_1_BLOCK_COUNT
 #define OS_MSYS_1_BLOCK_SIZE CONFIG_BT_LE_MSYS_1_BLOCK_SIZE
@@ -38,6 +43,12 @@ static STAILQ_HEAD(, os_mbuf_pool) g_msys_pool_list =
 
 #define OS_MSYS_1_SANITY_MIN_COUNT 0
 #define OS_MSYS_2_SANITY_MIN_COUNT 0
+
+#if CONFIG_BT_LE_MSYS_BUF_FROM_HEAP
+#define OS_MSYS_BLOCK_FROM_HEAP                 (1)
+#else
+#define OS_MSYS_BLOCK_FROM_HEAP                 (0)
+#endif // CONFIG_BT_LE_MSYS_BUF_FROM_HEAP
 #endif
 
 
@@ -71,7 +82,7 @@ static struct os_mempool os_msys_init_2_mempool;
 #endif
 
 #if CONFIG_BT_LE_MSYS_INIT_IN_CONTROLLER
-extern int  esp_ble_msys_init(uint16_t msys_size1, uint16_t msys_size2, uint16_t msys_cnt1, uint16_t msys_cnt2);
+extern int  esp_ble_msys_init(uint16_t msys_size1, uint16_t msys_size2, uint16_t msys_cnt1, uint16_t msys_cnt2, uint8_t from_heap);
 extern void esp_ble_msys_deinit(void);
 
 int os_msys_init(void)
@@ -79,7 +90,8 @@ int os_msys_init(void)
     return esp_ble_msys_init(SYSINIT_MSYS_1_MEMBLOCK_SIZE,
                              SYSINIT_MSYS_2_MEMBLOCK_SIZE,
                              OS_MSYS_1_BLOCK_COUNT,
-                             OS_MSYS_2_BLOCK_COUNT);
+                             OS_MSYS_2_BLOCK_COUNT,
+                             OS_MSYS_BLOCK_FROM_HEAP);
 }
 
 void os_msys_deinit(void)

components/esp_rom/esp32c2/ld/esp32c2.rom.ld

@@ -1035,9 +1035,7 @@ r_ble_ll_utils_csa2_prng = 0x400013b8;
 r_ble_ll_utils_remapped_channel = 0x400013bc;
 r_ble_ll_whitelist_add = 0x400013c0;
 r_ble_ll_whitelist_chg_allowed = 0x400013c4;
-r_ble_ll_whitelist_clear = 0x400013c8;
 r_ble_ll_whitelist_read_size = 0x400013cc;
-r_ble_ll_whitelist_rmv = 0x400013d0;
 r_ble_ll_write_rf_path_compensation = 0x400013d8;
 r_ble_lll_adv_aux_schedule = 0x400013e0;
 r_ble_lll_adv_aux_schedule_first = 0x400013e4;
@@ -1113,7 +1111,6 @@ r_ble_lll_conn_master_common_init = 0x40001530;
 r_ble_lll_conn_master_new = 0x40001534;
 r_ble_lll_conn_module_reset = 0x40001540;
 r_ble_lll_conn_pre_process = 0x40001548;
-r_ble_lll_conn_process_acked_pdu = 0x4000154c;
 r_ble_lll_conn_recv_ack = 0x40001554;
 r_ble_lll_conn_recv_valid_packet = 0x40001558;
 r_ble_lll_conn_reset_pending_sched = 0x4000155c;
@@ -1196,7 +1193,6 @@ r_ble_lll_scan_npl_store = 0x400016dc;
 r_ble_lll_scan_period_timer_cb = 0x400016e0;
 r_ble_lll_scan_process_adv_in_isr = 0x400016e4;
 r_ble_lll_scan_req_backoff = 0x400016ec;
-r_ble_lll_scan_restart = 0x400016f0;
 r_ble_lll_scan_sched_next_aux = 0x40001700;
 r_ble_lll_scan_sched_remove = 0x40001704;
 r_ble_lll_scan_start = 0x40001708;