Merge branch 'bugfix/bug_ble_max_device_record_v5.4' into 'release/v5.4'

fix(ble/bluedroid): Fixed BLE incorrect device record count issue (v5.4)

See merge request espressif/esp-idf!43596

Author: Isl2017

components/bt/host/bluedroid/btc/core/btc_ble_storage.c

@@ -16,7 +16,7 @@
 #if (SMP_INCLUDED == TRUE)
 
 //the maximum number of bonded devices
-#define BONED_DEVICES_MAX_COUNT (BTM_SEC_MAX_DEVICE_RECORDS)
+#define BONED_DEVICES_MAX_COUNT (BTM_SEC_MAX_BONDS)
 
 static void _btc_storage_save(void)
 {

components/bt/host/bluedroid/btc/core/btc_storage.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -40,7 +40,7 @@ bt_status_t btc_storage_add_bonded_device(bt_bdaddr_t *remote_bd_addr,
     bdaddr_to_string(remote_bd_addr, bdstr, sizeof(bdstr));
 
     /* device not in bond list and exceed the maximum number of bonded devices, delete the inactive bonded device */
-    if (btc_storage_get_num_all_bond_devices() >= BTM_SEC_MAX_DEVICE_RECORDS && !btc_config_has_section(bdstr)) {
+    if (btc_storage_get_num_all_bond_devices() >= BTM_SEC_MAX_BONDS && !btc_config_has_section(bdstr)) {
         const btc_config_section_iter_t *iter = btc_config_section_begin();
         const btc_config_section_iter_t *remove_iter = iter;
         /* find the first device(the last node) */
@@ -57,7 +57,7 @@ bt_status_t btc_storage_add_bonded_device(bt_bdaddr_t *remote_bd_addr,
 
         // delete config info
         if (btc_config_remove_section(remove_section)) {
-            BTC_TRACE_WARNING("exceeded the maximum nubmer of bonded devices, delete the first device info : %02x:%02x:%02x:%02x:%02x:%02x",
+            BTC_TRACE_WARNING("exceeded the maximum number of bonded devices, delete the first device info : %02x:%02x:%02x:%02x:%02x:%02x",
                                 bd_addr.address[0], bd_addr.address[1], bd_addr.address[2], bd_addr.address[3], bd_addr.address[4], bd_addr.address[5]);
         }
     }
@@ -141,8 +141,8 @@ static bt_status_t btc_in_fetch_bonded_devices(int add)
             continue;
         }
         dev_cnt ++;
-        /* if the number of device stored in nvs not exceed to BTM_SEC_MAX_DEVICE_RECORDS, load it */
-        if (dev_cnt <= BTM_SEC_MAX_DEVICE_RECORDS) {
+        /* if the number of device stored in nvs not exceed to BTM_SEC_MAX_BONDS, load it */
+        if (dev_cnt <= BTM_SEC_MAX_BONDS) {
             if (btc_config_exist(name, BTC_STORAGE_LINK_KEY_TYPE_STR) && btc_config_exist(name, BTC_STORAGE_PIN_LENGTH_STR) &&
                 btc_config_exist(name, BTC_STORAGE_SC_SUPPORT) && btc_config_exist(name, BTC_STORAGE_LINK_KEY_STR)) {
                 /* load bt device */

components/bt/host/bluedroid/common/include/common/bt_target.h

@@ -1093,11 +1093,11 @@
 
 /* The number of security records for peer devices. 15 AS Default*/
 #ifndef BTM_SEC_MAX_DEVICE_RECORDS
-#if (UC_BT_SMP_MAX_BONDS < UC_BT_ACL_CONNECTIONS)
-#define BTM_SEC_MAX_DEVICE_RECORDS  UC_BT_ACL_CONNECTIONS
-#else
-#define BTM_SEC_MAX_DEVICE_RECORDS  UC_BT_SMP_MAX_BONDS
+#define BTM_SEC_MAX_DEVICE_RECORDS  (UC_BT_SMP_MAX_BONDS + UC_BT_ACL_CONNECTIONS)
 #endif
+
+#ifndef BTM_SEC_MAX_BONDS
+#define BTM_SEC_MAX_BONDS  UC_BT_SMP_MAX_BONDS
 #endif
 
 #if BTA_SDP_INCLUDED

components/bt/host/bluedroid/stack/btm/btm_ble.c

@@ -1700,6 +1700,9 @@ tBTM_STATUS btm_ble_start_encrypt(BD_ADDR bda, BOOLEAN use_stk, BT_OCTET16 stk)
 #if (SMP_INCLUDED == TRUE)
 void btm_ble_link_encrypted(BD_ADDR bd_addr, UINT8 encr_enable)
 {
+#if BLE_INCLUDED == TRUE
+    l2cble_notify_le_connection(bd_addr);
+#endif // BLE_INCLUDED == TRUE
     tBTM_SEC_DEV_REC    *p_dev_rec = btm_find_dev (bd_addr);
     BOOLEAN             enc_cback;