Merge branch 'change/ble_update_lib_20251022' into 'master'

change(ble): [AUTO_MR] 20251022 - Update ESP BLE Controller Lib

Closes BLERP-2329, BLERP-2315, BLERP-2316, BLERP-2325, BLERP-2256, BLERP-2326, BLERP-2327, BLERP-2328, BLERP-2330, BLERP-2331, BLERP-2302, BLERP-2300, and BLERP-2301

See merge request espressif/esp-idf!42821

components/bt/controller/esp32c2/bt.c

@@ -749,7 +749,7 @@ void controller_wakeup_cb(void *arg)
 #if CONFIG_FREERTOS_USE_TICKLESS_IDLE
 static bool esp_bt_check_wakeup_by_bt(void)
 {
-   return (esp_sleep_get_wakeup_causes() & ESP_SLEEP_WAKEUP_BT);
+   return (esp_sleep_get_wakeup_causes() & BIT(ESP_SLEEP_WAKEUP_BT));
 }
 #endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
 

components/bt/controller/esp32c5/Kconfig.in

@@ -881,3 +881,65 @@ endmenu
 config BT_LE_DTM_ENABLED
     bool "Enable Direct Test Mode (DTM) feature"
     default n
+
+menu "Scheduling Priority Level Config"
+    choice BT_LE_ADV_SCHED_PRIO_LEVEL
+        prompt "The Adv scheduling priority level"
+        default BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+        help
+            The Adv scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_ADV_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_ADV_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_ADV_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_ADV_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_ADV_SCHED_PRIO_HIGH_LEVEL
+        default 0
+
+    choice BT_LE_PERIODIC_ADV_SCHED_PRIO_LEVEL
+        prompt "The Periodic Adv scheduling priority level"
+        default BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+        help
+            The Periodic Adv scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_PERIODIC_ADV_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_PERIODIC_ADV_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_PERIODIC_ADV_SCHED_PRIO_HIGH_LEVEL
+        default 1
+
+    choice BT_LE_SYNC_SCHED_PRIO_LEVEL
+        prompt "The Sync scheduling priority level"
+        default BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+        help
+            The SYNC scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_SYNC_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_SYNC_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_SYNC_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_SYNC_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_SYNC_SCHED_PRIO_HIGH_LEVEL
+        default 1
+endmenu

components/bt/controller/esp32c5/bt.c

@@ -736,7 +736,7 @@ IRAM_ATTR void controller_wakeup_cb(void *arg)
 #if CONFIG_FREERTOS_USE_TICKLESS_IDLE
 static bool esp_bt_check_wakeup_by_bt(void)
 {
-   return (esp_sleep_get_wakeup_causes() & ESP_SLEEP_WAKEUP_BT);
+   return (esp_sleep_get_wakeup_causes() & BIT(ESP_SLEEP_WAKEUP_BT));
 }
 
 static esp_err_t sleep_modem_ble_mac_retention_init(void *arg)

components/bt/controller/esp32c5/esp_bt_cfg.h

@@ -297,7 +297,7 @@ extern "C" {
 #define RUN_BQB_TEST                        (0)
 #define RUN_QA_TEST                         (0)
 #define NIMBLE_DISABLE_SCAN_BACKOFF         (0)
-
+#define BT_LL_CTRL_PRIO_LVL_CFG ((CONFIG_BT_LE_DFT_SYNC_SCHED_PRIO_LEVEL << 4) | (CONFIG_BT_LE_DFT_PERIODIC_ADV_SCHED_PRIO_LEVEL << 2) | CONFIG_BT_LE_DFT_ADV_SCHED_PRIO_LEVEL)
 #ifdef __cplusplus
 }
 #endif

components/bt/controller/esp32c6/Kconfig.in

@@ -915,3 +915,65 @@ endmenu
 config BT_LE_DTM_ENABLED
     bool "Enable Direct Test Mode (DTM) feature"
     default n
+
+menu "Scheduling Priority Level Config"
+    choice BT_LE_ADV_SCHED_PRIO_LEVEL
+        prompt "The Adv scheduling priority level"
+        default BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+        help
+            The Adv scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_ADV_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_ADV_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_ADV_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_ADV_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_ADV_SCHED_PRIO_HIGH_LEVEL
+        default 0
+
+    choice BT_LE_PERIODIC_ADV_SCHED_PRIO_LEVEL
+        prompt "The Periodic Adv scheduling priority level"
+        default BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+        help
+            The Periodic Adv scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_PERIODIC_ADV_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_PERIODIC_ADV_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_PERIODIC_ADV_SCHED_PRIO_HIGH_LEVEL
+        default 1
+
+    choice BT_LE_SYNC_SCHED_PRIO_LEVEL
+        prompt "The Sync scheduling priority level"
+        default BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+        help
+            The SYNC scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_SYNC_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_SYNC_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_SYNC_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_SYNC_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_SYNC_SCHED_PRIO_HIGH_LEVEL
+        default 1
+endmenu

components/bt/controller/esp32c6/bt.c

@@ -796,7 +796,7 @@ IRAM_ATTR void controller_wakeup_cb(void *arg)
 #if CONFIG_FREERTOS_USE_TICKLESS_IDLE
 static bool esp_bt_check_wakeup_by_bt(void)
 {
-   return (esp_sleep_get_wakeup_causes() & ESP_SLEEP_WAKEUP_BT);
+   return (esp_sleep_get_wakeup_causes() & BIT(ESP_SLEEP_WAKEUP_BT));
 }
 
 static esp_err_t sleep_modem_ble_mac_retention_init(void *arg)

components/bt/controller/esp32c6/esp_bt_cfg.h

@@ -300,6 +300,7 @@ extern "C" {
 #define RUN_BQB_TEST                        (0)
 #define RUN_QA_TEST                         (0)
 #define NIMBLE_DISABLE_SCAN_BACKOFF         (0)
+#define BT_LL_CTRL_PRIO_LVL_CFG ((CONFIG_BT_LE_DFT_SYNC_SCHED_PRIO_LEVEL << 4) | (CONFIG_BT_LE_DFT_PERIODIC_ADV_SCHED_PRIO_LEVEL << 2) | CONFIG_BT_LE_DFT_ADV_SCHED_PRIO_LEVEL)
 
 #ifdef __cplusplus
 }

components/bt/controller/esp32h2/Kconfig.in

@@ -919,3 +919,65 @@ endmenu
 config BT_LE_DTM_ENABLED
     bool "Enable Direct Test Mode (DTM) feature"
     default n
+
+menu "Scheduling Priority Level Config"
+    choice BT_LE_ADV_SCHED_PRIO_LEVEL
+        prompt "The Adv scheduling priority level"
+        default BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+        help
+            The Adv scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_ADV_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_ADV_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_ADV_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_ADV_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_ADV_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_ADV_SCHED_PRIO_HIGH_LEVEL
+        default 0
+
+    choice BT_LE_PERIODIC_ADV_SCHED_PRIO_LEVEL
+        prompt "The Periodic Adv scheduling priority level"
+        default BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+        help
+            The Periodic Adv scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_PERIODIC_ADV_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_PERIODIC_ADV_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_PERIODIC_ADV_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_PERIODIC_ADV_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_PERIODIC_ADV_SCHED_PRIO_HIGH_LEVEL
+        default 1
+
+    choice BT_LE_SYNC_SCHED_PRIO_LEVEL
+        prompt "The Sync scheduling priority level"
+        default BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+        help
+            The SYNC scheduling priority level is used for arbitration when internal scheduling conflicts.
+        config BT_LE_SYNC_SCHED_PRIO_LOW_LEVEL
+            bool "low priority level"
+        config BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+            bool "medium priority level"
+        config BT_LE_SYNC_SCHED_PRIO_HIGH_LEVEL
+            bool "high priority level"
+    endchoice
+
+    config BT_LE_DFT_SYNC_SCHED_PRIO_LEVEL
+        int
+        default 0 if BT_LE_SYNC_SCHED_PRIO_LOW_LEVEL
+        default 1 if BT_LE_SYNC_SCHED_PRIO_MID_LEVEL
+        default 2 if BT_LE_SYNC_SCHED_PRIO_HIGH_LEVEL
+        default 1
+endmenu

components/bt/controller/esp32h2/bt.c

@@ -764,7 +764,7 @@ IRAM_ATTR void controller_wakeup_cb(void *arg)
 #ifdef CONFIG_FREERTOS_USE_TICKLESS_IDLE
 static bool esp_bt_check_wakeup_by_bt(void)
 {
-   return (esp_sleep_get_wakeup_causes() & ESP_SLEEP_WAKEUP_BT);
+   return (esp_sleep_get_wakeup_causes() & BIT(ESP_SLEEP_WAKEUP_BT));
 }
 
 static esp_err_t sleep_modem_ble_mac_retention_init(void *arg)

components/bt/controller/esp32h2/esp_bt_cfg.h

@@ -297,7 +297,7 @@ extern "C" {
 #define RUN_BQB_TEST                        (0)
 #define RUN_QA_TEST                         (0)
 #define NIMBLE_DISABLE_SCAN_BACKOFF         (0)
-
+#define BT_LL_CTRL_PRIO_LVL_CFG ((CONFIG_BT_LE_DFT_SYNC_SCHED_PRIO_LEVEL << 4) | (CONFIG_BT_LE_DFT_PERIODIC_ADV_SCHED_PRIO_LEVEL << 2) | CONFIG_BT_LE_DFT_ADV_SCHED_PRIO_LEVEL)
 #ifdef __cplusplus
 }
 #endif

components/bt/include/esp32c5/include/esp_bt.h

@@ -159,7 +159,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
  */
 esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);
 
-#define CONFIG_VERSION  0x20250606
+#define CONFIG_VERSION  0x20251022
 #define CONFIG_MAGIC    0x5A5AA5A5
 
 /**
@@ -234,6 +234,7 @@ typedef struct {
     int8_t ch39_txpwr;                              /*!< BLE transmit power (in dBm) used for BLE advertising on channel 39. */
     uint8_t adv_rsv_cnt;                             /*!< BLE adv state machine reserve count number */
     uint8_t conn_rsv_cnt;                            /*!< BLE conn state machine reserve count number */
+    uint8_t priority_level_cfg;                      /*!< The option for priority level configuration */
     uint32_t config_magic;                           /*!< Magic number for configuration validation */
 } esp_bt_controller_config_t;
 
@@ -295,6 +296,7 @@ typedef struct {
     .ch39_txpwr                 = BLE_LL_TX_PWR_DBM_N,                                  \
     .adv_rsv_cnt                = BLE_LL_ADV_SM_RESERVE_CNT_N,                          \
     .conn_rsv_cnt               = BLE_LL_CONN_SM_RESERVE_CNT_N,                         \
+    .priority_level_cfg         = BT_LL_CTRL_PRIO_LVL_CFG,                              \
     .config_magic = CONFIG_MAGIC,                                                       \
 }
 

components/bt/include/esp32c6/include/esp_bt.h

@@ -156,7 +156,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
  */
 esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);
 
-#define CONFIG_VERSION  0x20250606
+#define CONFIG_VERSION  0x20251022
 #define CONFIG_MAGIC    0x5A5AA5A5
 
 /**
@@ -234,6 +234,7 @@ typedef struct {
     int8_t ch39_txpwr;                               /*!< BLE transmit power (in dBm) used for BLE advertising on channel 39. */
     uint8_t adv_rsv_cnt;                             /*!< BLE adv state machine reserve count number */
     uint8_t conn_rsv_cnt;                            /*!< BLE conn state machine reserve count number */
+    uint8_t priority_level_cfg;                      /*!< The option for priority level configuration */
     uint32_t config_magic;                           /*!< Magic number for configuration validation */
 } esp_bt_controller_config_t;
 
@@ -298,6 +299,7 @@ typedef struct {
     .ch39_txpwr                 = BLE_LL_TX_PWR_DBM_N,                                  \
     .adv_rsv_cnt                = BLE_LL_ADV_SM_RESERVE_CNT_N,                          \
     .conn_rsv_cnt               = BLE_LL_CONN_SM_RESERVE_CNT_N,                         \
+    .priority_level_cfg         = BT_LL_CTRL_PRIO_LVL_CFG,                              \
     .config_magic = CONFIG_MAGIC,                                                       \
 }
 #elif CONFIG_IDF_TARGET_ESP32C61
@@ -359,6 +361,7 @@ typedef struct {
     .ch39_txpwr                 = BLE_LL_TX_PWR_DBM_N,                                  \
     .adv_rsv_cnt                = BLE_LL_ADV_SM_RESERVE_CNT_N,                          \
     .conn_rsv_cnt               = BLE_LL_CONN_SM_RESERVE_CNT_N,                         \
+    .priority_level_cfg         = BT_LL_CTRL_PRIO_LVL_CFG,                              \
     .config_magic = CONFIG_MAGIC,                                                       \
 }
 #endif

components/bt/include/esp32h2/include/esp_bt.h

@@ -161,7 +161,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
  */
 esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);
 
-#define CONFIG_VERSION  0x20250606
+#define CONFIG_VERSION  0x20251022
 #define CONFIG_MAGIC    0x5A5AA5A5
 
 /**
@@ -236,6 +236,7 @@ typedef struct {
     int8_t ch39_txpwr;                              /*!< BLE transmit power (in dBm) used for BLE advertising on channel 39. */
     uint8_t adv_rsv_cnt;                            /*!< BLE adv state machine reserve count number */
     uint8_t conn_rsv_cnt;                           /*!< BLE conn state machine reserve count number */
+    uint8_t priority_level_cfg;                     /*!< The option for priority level configuration */
     uint32_t config_magic;                          /*!< Configuration magic value */
 } esp_bt_controller_config_t;
 
@@ -298,6 +299,7 @@ typedef struct {
     .ch39_txpwr                 = BLE_LL_TX_PWR_DBM_N,                                  \
     .adv_rsv_cnt                = BLE_LL_ADV_SM_RESERVE_CNT_N,                          \
     .conn_rsv_cnt               = BLE_LL_CONN_SM_RESERVE_CNT_N,                         \
+    .priority_level_cfg         = BT_LL_CTRL_PRIO_LVL_CFG,                              \
     .config_magic = CONFIG_MAGIC,                                                       \
 }