Skip to content

Commit 57fd051

Browse files
Isl2017Isl2017
committed
Merge branch 'change/ble_update_lib_20250414' into 'master'
change(ble): [AUTO_MR] 20250414 - Update ESP BLE Controller Lib Closes BLERP-1742, BLERP-1743, BLERP-1744, BLERP-1745, BLERP-1746, BLERP-1748, BLERP-1750, BLERP-1751, BLERP-1752, BLERP-1736, BLERP-1730, BLERP-1725, BLERP-1738, and BLERP-1706 See merge request espressif/esp-idf!38386
2 parents 93ff1ae + ece108c commit 57fd051

File tree

16 files changed

+79
-26
lines changed

16 files changed

+79
-26
lines changed

‎components/bt/common/Kconfig.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ config BT_ALARM_MAX_NUM
99
config BT_BLE_LOG_SPI_OUT_ENABLED
1010
bool "Output ble logs to SPI bus (Experimental)"
1111
default n
12-
select SPI_MASTER_IN_IRAM
1312
help
1413
Output ble logs to SPI bus
1514

‎components/bt/common/ble_log/ble_log_spi_out.c‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,14 +140,16 @@ static int spi_out_init_trans(spi_out_trans_cb_t **trans_cb, uint16_t buf_size)
140140
if (!(*trans_cb)) {
141141
return -1;
142142
}
143+
memset(*trans_cb, 0, sizeof(spi_out_trans_cb_t));
144+
143145
uint8_t *buf = (uint8_t *)spi_bus_dma_memory_alloc(SPI_OUT_BUS, (size_t)buf_size, 0);
144146
if (!buf) {
145147
free(*trans_cb);
148+
*trans_cb = NULL;
146149
return -1;
147150
}
148151

149152
// Initialization
150-
memset(*trans_cb, 0, sizeof(spi_out_trans_cb_t));
151153
(*trans_cb)->buf_size = buf_size;
152154
(*trans_cb)->trans.tx_buffer = buf;
153155
return 0;
@@ -158,8 +160,13 @@ static void spi_out_deinit_trans(spi_out_trans_cb_t **trans_cb)
158160
if (!(*trans_cb)) {
159161
return;
160162
}
163+
if ((*trans_cb)->trans.tx_buffer) {
164+
// Do not free buffer until recycled
165+
while ((*trans_cb)->flag == SPI_OUT_TRANS_CB_FLAG_IN_QUEUE) {}
166+
free((uint8_t *)(*trans_cb)->trans.tx_buffer);
167+
(*trans_cb)->trans.tx_buffer = NULL;
168+
}
161169

162-
free((uint8_t *)(*trans_cb)->trans.tx_buffer);
163170
free(*trans_cb);
164171
*trans_cb = NULL;
165172
return;
@@ -174,7 +181,7 @@ IRAM_ATTR static void spi_out_tx_done_cb(spi_transaction_t *ret_trans)
174181

175182
IRAM_ATTR static inline int spi_out_append_trans(spi_out_trans_cb_t *trans_cb)
176183
{
177-
if (trans_cb->flag != SPI_OUT_TRANS_CB_FLAG_NEED_QUEUE) {
184+
if (trans_cb->flag != SPI_OUT_TRANS_CB_FLAG_NEED_QUEUE || !trans_cb->length) {
178185
return -1;
179186
}
180187

@@ -185,6 +192,8 @@ IRAM_ATTR static inline int spi_out_append_trans(spi_out_trans_cb_t *trans_cb)
185192
trans_cb->flag = SPI_OUT_TRANS_CB_FLAG_IN_QUEUE;
186193
return 0;
187194
} else {
195+
trans_cb->length = 0;
196+
trans_cb->flag = SPI_OUT_TRANS_CB_FLAG_AVAILABLE;
188197
return -1;
189198
}
190199
}
@@ -224,6 +233,7 @@ static void spi_out_log_cb_deinit(spi_out_log_cb_t **log_cb)
224233
}
225234
}
226235
free(*log_cb);
236+
*log_cb = NULL;
227237
return;
228238
}
229239

@@ -578,7 +588,7 @@ static void spi_out_ts_sync_deinit(void)
578588
}
579589

580590
// CRITICAL: This function is called in ESP Timer task
581-
IRAM_ATTR static void esp_timer_cb_ts_sync(void)
591+
static void esp_timer_cb_ts_sync(void)
582592
{
583593
// Initialize variables
584594
uint32_t lc_ts = 0;
@@ -627,7 +637,9 @@ int ble_log_spi_out_init(void)
627637
.quadwp_io_num = -1,
628638
.quadhd_io_num = -1,
629639
.max_transfer_sz = SPI_OUT_MAX_TRANSFER_SIZE,
640+
#if CONFIG_SPI_MASTER_ISR_IN_IRAM
630641
.intr_flags = ESP_INTR_FLAG_IRAM
642+
#endif // CONFIG_SPI_MASTER_ISR_IN_IRAM
631643
};
632644
spi_device_interface_config_t dev_config = {
633645
.clock_speed_hz = SPI_MASTER_FREQ_20M,
@@ -782,7 +794,7 @@ IRAM_ATTR void ble_log_spi_out_ll_log_ev_proc(void)
782794
}
783795
#endif // CONFIG_BT_BLE_LOG_SPI_OUT_LL_ENABLED
784796

785-
IRAM_ATTR int ble_log_spi_out_write(uint8_t source, const uint8_t *addr, uint16_t len)
797+
int ble_log_spi_out_write(uint8_t source, const uint8_t *addr, uint16_t len)
786798
{
787799
if (!ul_log_inited) {
788800
return -1;
@@ -798,7 +810,7 @@ IRAM_ATTR int ble_log_spi_out_write(uint8_t source, const uint8_t *addr, uint16_
798810
return ret;
799811
}
800812

801-
IRAM_ATTR int ble_log_spi_out_printf(uint8_t source, const char *format, ...)
813+
int ble_log_spi_out_printf(uint8_t source, const char *format, ...)
802814
{
803815
if (!ul_log_inited) {
804816
return -1;
@@ -845,7 +857,7 @@ IRAM_ATTR int ble_log_spi_out_printf(uint8_t source, const char *format, ...)
845857
return ret;
846858
}
847859

848-
IRAM_ATTR int ble_log_spi_out_printf_enh(uint8_t source, uint8_t level, const char *tag, const char *format, ...)
860+
int ble_log_spi_out_printf_enh(uint8_t source, uint8_t level, const char *tag, const char *format, ...)
849861
{
850862
if (!ul_log_inited) {
851863
return -1;
@@ -897,7 +909,7 @@ IRAM_ATTR int ble_log_spi_out_printf_enh(uint8_t source, uint8_t level, const ch
897909
return ret;
898910
}
899911

900-
IRAM_ATTR int ble_log_spi_out_write_with_ts(uint8_t source, const uint8_t *addr, uint16_t len)
912+
int ble_log_spi_out_write_with_ts(uint8_t source, const uint8_t *addr, uint16_t len)
901913
{
902914
if (!ul_log_inited) {
903915
return -1;

‎components/bt/controller/esp32c2/Kconfig.in‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,11 @@ config BT_LE_PLACE_CONN_RELATED_INTO_IRAM
682682
depends on BT_CTRL_RUN_IN_FLASH_ONLY
683683
default n
684684

685+
config BT_LE_PLACE_SLEEP_RELATED_INTO_IRAM
686+
bool
687+
depends on BT_CTRL_RUN_IN_FLASH_ONLY && BT_LE_SLEEP_ENABLE
688+
default y
689+
685690
config BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
686691
bool "Enable enhanced Access Address check in CONNECT_IND"
687692
default n

‎components/bt/controller/esp32c2/bt.c‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -592,13 +592,6 @@ static int esp_intr_free_wrapper(void **ret_handle)
592592
return rc;
593593
}
594594

595-
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
596-
void sleep_modem_light_sleep_overhead_set(uint32_t overhead)
597-
{
598-
esp_ble_set_wakeup_overhead(overhead);
599-
}
600-
#endif /* CONFIG_FREERTOS_USE_TICKLESS_IDLE */
601-
602595
modem_clock_lpclk_src_t esp_bt_get_lpclk_src(void)
603596
{
604597
return s_bt_lpclk_src;
@@ -613,7 +606,7 @@ void esp_bt_set_lpclk_src(modem_clock_lpclk_src_t clk_src)
613606
s_bt_lpclk_src = clk_src;
614607
}
615608

616-
IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg)
609+
void controller_sleep_cb(uint32_t enable_tick, void *arg)
617610
{
618611
if (!s_ble_active) {
619612
return;
@@ -626,7 +619,7 @@ IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg)
626619
s_ble_active = false;
627620
}
628621

629-
IRAM_ATTR void controller_wakeup_cb(void *arg)
622+
void controller_wakeup_cb(void *arg)
630623
{
631624
if (s_ble_active) {
632625
return;
@@ -666,7 +659,7 @@ esp_err_t controller_sleep_init(modem_clock_lpclk_src_t slow_clk_src)
666659
esp_sleep_enable_bt_wakeup();
667660
ESP_LOGW(NIMBLE_PORT_LOG_TAG, "Enable light sleep, the wake up source is BLE timer");
668661

669-
rc = esp_pm_register_inform_out_light_sleep_overhead_callback(sleep_modem_light_sleep_overhead_set);
662+
rc = esp_pm_register_inform_out_light_sleep_overhead_callback(esp_ble_set_wakeup_overhead);
670663
if (rc != ESP_OK) {
671664
goto error;
672665
}
@@ -676,7 +669,7 @@ esp_err_t controller_sleep_init(modem_clock_lpclk_src_t slow_clk_src)
676669
error:
677670
#if CONFIG_FREERTOS_USE_TICKLESS_IDLE
678671
esp_sleep_disable_bt_wakeup();
679-
esp_pm_unregister_inform_out_light_sleep_overhead_callback(sleep_modem_light_sleep_overhead_set);
672+
esp_pm_unregister_inform_out_light_sleep_overhead_callback(esp_ble_set_wakeup_overhead);
680673
#endif /* CONFIG_FREERTOS_USE_TICKLESS_IDLE */
681674
/*lock should release first and then delete*/
682675
if (s_pm_lock != NULL) {
@@ -693,7 +686,7 @@ void controller_sleep_deinit(void)
693686
r_ble_rtc_wake_up_state_clr();
694687
esp_sleep_disable_bt_wakeup();
695688
esp_sleep_pd_config(ESP_PD_DOMAIN_XTAL, ESP_PD_OPTION_AUTO);
696-
esp_pm_unregister_inform_out_light_sleep_overhead_callback(sleep_modem_light_sleep_overhead_set);
689+
esp_pm_unregister_inform_out_light_sleep_overhead_callback(esp_ble_set_wakeup_overhead);
697690
#endif // CONFIG_FREERTOS_USE_TICKLESS_IDLE
698691
#ifdef CONFIG_PM_ENABLE
699692
/*lock should release first and then delete*/

‎components/bt/controller/esp32c5/Kconfig.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,3 +784,7 @@ config BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX
784784
When this option is enabled, auxiliary packets will be present in the events of
785785
'Non-Connectable and Non-Scannable' regardless of whether the advertising length is 0.
786786
If this option is not enabled, auxiliary packets will only be present when the advertising length is not 0.
787+
788+
config BT_LE_RXBUF_OPT_ENABLED
789+
bool "Enable rxbuf optimization feature"
790+
default y

‎components/bt/controller/esp32c5/ble.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ void adv_stack_enableScanReqRxdVsEvent(bool en);
4444
void conn_stack_enableChanMapUpdCompVsEvent(bool en);
4545
void sleep_stack_enableWakeupVsEvent(bool en);
4646
#endif // (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
47+
#if CONFIG_BT_LE_RXBUF_OPT_ENABLED
48+
extern void mmgmt_enableRxbufOptFeature(void);
49+
#endif // CONFIG_BT_LE_RXBUF_OPT_ENABLED
4750

4851
/* Local functions definition
4952
***************************************************************************
@@ -137,6 +140,10 @@ int ble_stack_enable(void)
137140
ble_stack_enableVsEvents(true);
138141
#endif // (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
139142

143+
#if CONFIG_BT_LE_RXBUF_OPT_ENABLED
144+
mmgmt_enableRxbufOptFeature();
145+
#endif // CONFIG_BT_LE_RXBUF_OPT_ENABLED
146+
140147
return 0;
141148
}
142149

‎components/bt/controller/esp32c6/Kconfig.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,3 +818,7 @@ config BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX
818818
When this option is enabled, auxiliary packets will be present in the events of
819819
'Non-Connectable and Non-Scannable' regardless of whether the advertising length is 0.
820820
If this option is not enabled, auxiliary packets will only be present when the advertising length is not 0.
821+
822+
config BT_LE_RXBUF_OPT_ENABLED
823+
bool "Enable rxbuf optimization feature"
824+
default y

‎components/bt/controller/esp32c6/ble.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ void adv_stack_enableScanReqRxdVsEvent(bool en);
4747
void conn_stack_enableChanMapUpdCompVsEvent(bool en);
4848
void sleep_stack_enableWakeupVsEvent(bool en);
4949
#endif // (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
50+
#if CONFIG_BT_LE_RXBUF_OPT_ENABLED
51+
extern void mmgmt_enableRxbufOptFeature(void);
52+
#endif // CONFIG_BT_LE_RXBUF_OPT_ENABLED
5053

5154
/* Local functions definition
5255
***************************************************************************
@@ -143,6 +146,10 @@ int ble_stack_enable(void)
143146
ble_stack_enableVsEvents(true);
144147
#endif // (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
145148

149+
#if CONFIG_BT_LE_RXBUF_OPT_ENABLED
150+
mmgmt_enableRxbufOptFeature();
151+
#endif // CONFIG_BT_LE_RXBUF_OPT_ENABLED
152+
146153
return 0;
147154
}
148155

‎components/bt/controller/esp32h2/Kconfig.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,3 +822,7 @@ config BT_LE_CTRL_ADV_DATA_LENGTH_ZERO_AUX
822822
When this option is enabled, auxiliary packets will be present in the events of
823823
'Non-Connectable and Non-Scannable' regardless of whether the advertising length is 0.
824824
If this option is not enabled, auxiliary packets will only be present when the advertising length is not 0.
825+
826+
config BT_LE_RXBUF_OPT_ENABLED
827+
bool "Enable rxbuf optimization feature"
828+
default y

‎components/bt/controller/esp32h2/ble.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ void adv_stack_enableScanReqRxdVsEvent(bool en);
4444
void conn_stack_enableChanMapUpdCompVsEvent(bool en);
4545
void sleep_stack_enableWakeupVsEvent(bool en);
4646
#endif // (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
47+
#if CONFIG_BT_LE_RXBUF_OPT_ENABLED
48+
extern void mmgmt_enableRxbufOptFeature(void);
49+
#endif // CONFIG_BT_LE_RXBUF_OPT_ENABLED
4750

4851
/* Local functions definition
4952
***************************************************************************
@@ -137,6 +140,10 @@ int ble_stack_enable(void)
137140
ble_stack_enableVsEvents(true);
138141
#endif // (CONFIG_BT_NIMBLE_ENABLED || CONFIG_BT_BLUEDROID_ENABLED)
139142

143+
#if CONFIG_BT_LE_RXBUF_OPT_ENABLED
144+
mmgmt_enableRxbufOptFeature();
145+
#endif // CONFIG_BT_LE_RXBUF_OPT_ENABLED
146+
140147
return 0;
141148
}
142149

0 commit comments

Comments
 (0)