Merge branch 'feat/set_max_sync_conn_v5.5' into 'release/v5.5'

feat(bt): set BR/EDR max sync conn eff for Bluedroid HFP on ESP32 (v5.5)

See merge request espressif/esp-idf!45242

components/bt/controller/esp32/Kconfig.in

@@ -195,11 +195,6 @@ config BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF
     default BTDM_CTRL_BR_EDR_MAX_ACL_CONN if BTDM_CTRL_MODE_BR_EDR_ONLY || BTDM_CTRL_MODE_BTDM
     default 0
 
-config BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF
-    int
-    default BTDM_CTRL_BR_EDR_MAX_SYNC_CONN if BTDM_CTRL_MODE_BR_EDR_ONLY || BTDM_CTRL_MODE_BTDM
-    default 0
-
 choice BTDM_CTRL_PINNED_TO_CORE_CHOICE
     prompt "The cpu core which bluetooth controller run"
     depends on !FREERTOS_UNICORE

components/bt/controller/esp32/bt.c

@@ -1674,7 +1674,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
     }
 
     //overwrite some parameters
-    cfg->bt_max_sync_conn = CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF;
+    cfg->bt_max_sync_conn = UT_BR_EDR_CTRL_MAX_SYNC_CONN_EFF;
     cfg->magic  = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL;
 
     if (((cfg->mode & ESP_BT_MODE_BLE) && (cfg->ble_max_conn <= 0 || cfg->ble_max_conn > BTDM_CONTROLLER_BLE_MAX_CONN_LIMIT))

components/bt/controller/esp32/esp_bredr_cfg.h

@@ -0,0 +1,33 @@
+/*
+ * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#include "sdkconfig.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(CONFIG_BT_BLUEDROID_ENABLED) && (CONFIG_BT_BLUEDROID_ENABLED) && (CONFIG_BT_HFP_ENABLE) && \
+    defined(CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN) && (CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN == 0)
+
+#pragma message ("BT: forcing BR/EDR max sync conn eff to 1 (Bluedroid HFP requires SCO/eSCO)")
+#define UT_BR_EDR_CTRL_MAX_SYNC_CONN_EFF (1)
+
+#elif defined(CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN)
+
+#define UT_BR_EDR_CTRL_MAX_SYNC_CONN_EFF (CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN)
+
+#else
+
+#define UT_BR_EDR_CTRL_MAX_SYNC_CONN_EFF (0)
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif

components/bt/include/esp32/include/esp_bt.h

@@ -13,6 +13,7 @@
 #include "sdkconfig.h"
 #include "esp_task.h"
 #include "esp_assert.h"
+#include "../../../../controller/esp32/esp_bredr_cfg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,7 +47,7 @@ extern "C" {
 
 #define SOC_MEM_BT_EM_PER_SYNC_SIZE         0x870
 
-#define SOC_MEM_BT_EM_BREDR_REAL_END        (SOC_MEM_BT_EM_BREDR_NO_SYNC_END + CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF * SOC_MEM_BT_EM_PER_SYNC_SIZE)
+#define SOC_MEM_BT_EM_BREDR_REAL_END        (SOC_MEM_BT_EM_BREDR_NO_SYNC_END + UT_BR_EDR_CTRL_MAX_SYNC_CONN_EFF * SOC_MEM_BT_EM_PER_SYNC_SIZE)
 
 #endif //CONFIG_BT_ENABLED
 
@@ -241,7 +242,7 @@ the advertising packet will be discarded until the memory is restored. */
     .bt_sco_datapath = CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF,          \
     .auto_latency = BTDM_CTRL_AUTO_LATENCY_EFF,                            \
     .bt_legacy_auth_vs_evt = BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF,         \
-    .bt_max_sync_conn = CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF,         \
+    .bt_max_sync_conn = UT_BR_EDR_CTRL_MAX_SYNC_CONN_EFF,                  \
     .ble_sca = CONFIG_BTDM_BLE_SLEEP_CLOCK_ACCURACY_INDEX_EFF,             \
     .pcm_role = CONFIG_BTDM_CTRL_PCM_ROLE_EFF,                             \
     .pcm_polar = CONFIG_BTDM_CTRL_PCM_POLAR_EFF,                           \

components/bt/sdkconfig.rename

@@ -10,7 +10,6 @@ CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN                  CONFIG_BTDM_CTRL_BR_
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN                 CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF                     CONFIG_BTDM_CTRL_BLE_MAX_CONN_EFF
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF              CONFIG_BTDM_CTRL_BR_EDR_MAX_ACL_CONN_EFF
-CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF             CONFIG_BTDM_CTRL_BR_EDR_MAX_SYNC_CONN_EFF
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE_CHOICE                CONFIG_BTDM_CTRL_PINNED_TO_CORE_CHOICE
 CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE                       CONFIG_BTDM_CTRL_PINNED_TO_CORE
 CONFIG_BTDM_CONTROLLER_HCI_MODE_CHOICE                      CONFIG_BTDM_CTRL_HCI_MODE_CHOICE