Commit Graph

4987 Commits

Author SHA1 Message Date
Zhou Xiao fcb4e4f77d feat(ble_log): define multi-buffer transport types and Kconfig
Replace ping-pong (2-buffer) transport constants with configurable
multi-buffer (4-buffer) types. Add buffer utilization reporting types,
unified queue depth derivation macros, and compile-time guards.

Rename Kconfig options to total-per-LBM semantics:
- BLE_LOG_LBM_TRANS_SIZE (512) -> BLE_LOG_LBM_TRANS_BUF_SIZE (2048)
- BLE_LOG_LBM_LL_TRANS_SIZE (1024) -> BLE_LOG_LBM_LL_TRANS_BUF_SIZE (2048)

Key type changes:
- ble_log_prph_trans_t: volatile bool -> plain bool (atomic ops used),
  add void *owner back-reference
- ble_log_lbm_t: trans array sized to BLE_LOG_TRANS_BUF_CNT (4),
  add trans_inflight and trans_inflight_peak counters
- BLE_LOG_TRANS_BUF_CNT replaces BLE_LOG_TRANS_PING_PONG_BUF_CNT
- New ble_log_buf_util_t for buffer utilization telemetry
- _Static_assert guards for divisibility, power-of-2, index limits
2026-04-07 11:49:43 +08:00
Zhou Xiao 30ad222662 feat(ble_log): consume frame_sn on loss path and bump BLE_LOG_VERSION
Add BLE_LOG_GET_FRAME_SN() on the buffer-full loss path so the SN
counter advances even when frames are dropped. This allows the console
to detect firmware-side buffer loss via SN gaps. Bump BLE_LOG_VERSION
to reflect the semantic change.
2026-04-07 11:44:44 +08:00
Zhou Xiao 490acad912 feat(bt/ble_log): implement UART redirection stream write
Introduce stream write API with deferred frame encapsulation for UART
redirection on port 0. Redirected data is now properly framed (header +
payload + checksum) instead of being sent as raw ASCII, preventing frame
parser sync oscillation on the receiver.

- Add stream_seal/stream_write/stream_flush in ble_log_lbm.c
- Add BLE_LOG_SRC_REDIR source and BLE_LOG_UART_REDIR_ENABLED gate
- Simplify redir_uart_tx_chars and timer callback to use stream API
- Flush pending stream data in ble_log_prph_deinit
- Make get_trans static (no external callers after refactor)
- Move UART wrap linker flags outside CONFIG_BT_ENABLED guard
- Default UART DMA peripheral when SOC_UHCI_SUPPORTED
- Default baud rate 921600 -> 3000000
2026-04-07 11:44:38 +08:00
Zhou Xiao 24a368974e fix(bt/ble_log): fix flush timer callback in UART redirect module
Fix incorrect esp_timer callback signature, replace blocking mutex
with non-blocking trylock, add prph_inited guard, correct timer
period from 100us to 1s, and remove fragile idle-based flush logic.
2026-04-07 11:44:32 +08:00
Zhou Xiao 992b2f75c5 fix(bt/ble_log): use aligned counters in ble_log_stat_mgr_t
Replace embedded ble_log_enh_stat_t (packed wire struct) inside
ble_log_stat_mgr_t with flat uint32_t counters. Natural 4-byte
alignment ensures each load/store compiles to a single l32i/s32i
on Xtensa/RISC-V, making individual field access atomic without
locks.

Build the packed wire format on the stack inside a critical section
in ble_log_write_enh_stat() so the full snapshot is consistent.
2026-04-07 11:44:26 +08:00
Zhou Xiao 812edd64c8 change(bt/ble_log): make checksum and enhanced statistics always enabled
Remove CONFIG_BLE_LOG_PAYLOAD_CHECKSUM_ENABLED conditional compilation
-- payload checksum is always computed over the full frame.

Remove CONFIG_BLE_LOG_XOR_CHECKSUM_ENABLED conditional -- XOR checksum
is always used; delete the sum checksum dead code path.

Remove CONFIG_BLE_LOG_ENH_STAT_ENABLED conditional -- enhanced
statistics (frame/byte counters per source) are always active.

Remove incorrect select on choice symbol
BT_LE_CONTROLLER_LOG_MODE_BLE_LOG_V2 from BLE_LOG_IS_ESP_CONTROLLER.
2026-04-07 11:44:21 +08:00
Zhou Xiao 54a5fe04e6 change(bt/ble_log): deprecate legacy SPI log output module
Move ble_log_spi_out.c and ble_log_spi_out.h into a deprecated/
subdirectory under components/bt/common/ble_log/. Extract all
BT_BLE_LOG_SPI_OUT_* Kconfig options into deprecated/Kconfig.in
with an if-block to reduce depends-on repetition, sourced from
ble_log/Kconfig.in inside a "Legacy SPI Log Output (Deprecated)"
menu. Add mutual exclusion with BLE_LOG_ENABLED so that the legacy
SPI Out and the new BLE Log Module cannot be enabled simultaneously.
Update CMakeLists.txt source path and add deprecated/include to
include dirs so existing callers are unaffected. The BLE Log
Module's SPI Master DMA peripheral transport is the replacement.
2026-04-07 11:44:14 +08:00
Zhou Xiao 1fee2c3a0f change(bt/ble_log): remove BLE Log UHCI Out module
Delete ble_log_uhci_out.c and its header. Remove the UHCI Out source
from CMakeLists.txt and all BT_BLE_LOG_UHCI_OUT_* Kconfig options.
Remove per-chip BT_LE_CONTROLLER_LOG_UHCI_OUT_ENABLED Kconfig and
all UHCI Out caller references in esp32c5/c6/h2 controller bt.c.
Update ble_log_console README to reference the new BLE Log Module
UART DMA config. The functionality is superseded by the BLE Log
Module's UART DMA peripheral transport.
2026-04-07 11:43:22 +08:00
Island 8a289d2c78 Merge branch 'bugfix/fix_privacy_callback_trigger_multipe_times_v5.2' into 'release/v5.2'
Bugfix/fix privacy callback trigger multiple times (5.2)

See merge request espressif/esp-idf!47254
2026-04-03 20:35:52 +08:00
Zhi Wei Jian 1a532094a0 fix(ble/bluedroid): Fixed privacy callback triggering multiple times
(cherry picked from commit 5272b7e75b)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-04-03 14:02:33 +08:00
Astha Verma 9fe3137223 fix(nimble): fix null dereference of ble_gatts_conn_aware_states after gatts stop 2026-04-03 09:48:41 +05:30
cjin 3f32fefaec feat(ble): supported ble mempool run time allocation for esp ip chips 2026-04-02 16:40:03 +08:00
Jin Chen 953692616a feat(ble): make env init function cuttable on ESP32-C2
(cherry picked from commit 5ec82368ba)

Co-authored-by: cjin <jinchen@espressif.com>
2026-04-02 16:36:22 +08:00
Jin Chen 2502afa094 change(ble): [AUTO_MR] Update lib_esp32h2 to 913c704d
(cherry picked from commit a8d705ff7a)

Co-authored-by: zhaoweiliang <zhaoweiliang@espressif.com>
2026-04-02 16:36:22 +08:00
Jin Chen 8e067d416f change(ble): [AUTO_MR] Update lib_esp32c2 to b8594335
(cherry picked from commit a2ef5c0ff9)

Co-authored-by: zhaoweiliang <zhaoweiliang@espressif.com>
2026-04-02 16:36:22 +08:00
Jin Chen ef9c3a7972 change(ble): [AUTO_MR] Update lib_esp32c6 to 913c704d
(cherry picked from commit 06010a8b79)

Co-authored-by: zhaoweiliang <zhaoweiliang@espressif.com>
2026-04-02 16:36:22 +08:00
Wang Meng Yang 55e88b4e27 Merge branch 'bugfix/improve_spp_hid_v5.2' into 'release/v5.2'
fix(bt/bluedroid): fixed multiple high-severity issues from AI code review in SPP & HID (v5.2)

See merge request espressif/esp-idf!47148
2026-04-02 14:24:23 +08:00
Sumeet Singh 4c30f20afb feat(nimble): Update blecent example README.md with EATT documentation 2026-04-02 06:57:07 +05:30
Rahul Tank e8e60bb6cf Merge branch 'bugfix/nimble_example_fixes_v5.2' into 'release/v5.2'
fix(nimble): Address nimble example issues (v5.2)

See merge request espressif/esp-idf!47075
2026-04-01 15:42:52 +05:30
Island 1e07f40a93 Merge branch 'bugfix/fix_some_bluedroid_bugs_260121_v5.2' into 'release/v5.2'
Bugfix/fix some bluedroid bugs 260121 (5.2)

See merge request espressif/esp-idf!46980
2026-04-01 11:45:16 +08:00
Astha Verma 65474b7fba fix(nimble): fix missing gatt caching header in examples 2026-03-31 17:31:13 +05:30
zhiweijian bd3e284921 fix(ble/bluedroid): Fixed bluedrodi CI build error 2026-03-31 14:05:07 +08:00
zhiweijian e022bea682 fix(bt/bluedroid): Fixed AddCharacteristic failed when attr_len is zero for AUTO_RSP 2026-03-31 12:03:33 +08:00
Jin Cheng 1de651d067 fix(bt/bluedroid): fixed multiple high-severity issues from AI code review in SPP 2026-03-30 19:28:45 +08:00
Jin Cheng 419f6aa7f5 fix(bt/bluedroid): fixed multiple high-severity issues from AI code review in HID 2026-03-30 19:27:27 +08:00
Rahul Tank 93b0ad0c90 fix(nimble): Correct adv_list_init / deinit during nimble init / deinit 2026-03-30 16:18:18 +05:30
Island 495871916e Merge branch 'feat/allow_creat_vendor_descriptor_by_service_table_v5.2' into 'release/v5.2'
feat(ble/bluedroid): Allow add vendor descriptor by service table create API (5.2)

See merge request espressif/esp-idf!47039
2026-03-30 17:01:39 +08:00
Island 6049d79e41 Merge branch 'feat/support_adv_monitor_for_bluedroid_host_v5.2' into 'release/v5.2'
feat(ble/bluedroid): support adv monitor feature (5.2)

See merge request espressif/esp-idf!47034
2026-03-30 17:01:17 +08:00
zhiweijian 945d041610 fix(ble/bluedroid): Fixed build error due to rebase conflict 2026-03-30 16:45:03 +08:00
zhiweijian 00b3483208 disable some parameters check in CTE APIs 2026-03-30 16:45:03 +08:00
luoxu aae75d6d58 fix(ble/bluedroid): Change BLE mesh adapter to use BTA APIs 2026-03-30 16:45:03 +08:00
zhiweijian 1321f3355d fix(ble/bluedroid): optimize bluedroid host and fix GAP, memory, status and BTM API issues
- return HCI_ERR_MEMORY_FULL on cmd buffer alloc failure
- remove legacy adv/scan semaphores and mutex
- Use the same legacy gap callback instead of each independent legacy gap event callback
2026-03-30 16:45:03 +08:00
Zhi Wei Jian aa89634475 fix(ble/bluedroid): Null/range checks, crypto cleanup and API consistency
- smp_api.h/smp_int.h: SMP_OPCODE_ARRAY_SIZE and SecureConnectionOobDataReply
  declaration alignment
- p_256_ecc_pp/p_256_multprecision: bounds and overflow fixes in ECC/multiprecision
- smp_act: init le_key; p_dev_rec null check in smp_key_distribution;
  smp_compute_dhkey failure notify in smp_both_have_public_keys
- smp_api: early state/cb_evt check in SMP_SecureConnectionOobDataReply
- smp_cmac: input/length validation in cmac_aes_k_calculate and
  aes_cipher_msg_auth_code
- smp_keys: smp_gen_p2_4_confirm return and smp_calculate_comfirm_cont;
  smp_process_private_key/smp_compute_dhkey cleanup and peer_pub_be clear
- smp_l2c: fix callback param types with L2CAP
- smp_main: event/state bounds in smp_sm_event; smp_get_event_name default string
- smp_utils: cmd_code<SMP_OPCODE_ARRAY_SIZE and smp_cmd_build_act check;
  smp_mask_enc_key/smp_command_has_invalid_parameters bounds

(cherry picked from commit 50747e4f63)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:03 +08:00
Zhi Wei Jian ff49f989a7 fix(ble/bluedroid): Align config, controller indent and init error paths
- bt_target: remove/align obsolete macros with Kconfig
- device/controller: fix start_up() Secure Connections indent,
  get_ble_resolving_list_max_size return type
- controller.h: align type/interface declarations with implementation
- bte_init: remove unused/redundant code
- bte_main: return -1 on osi_init failure, null check in bte_main_hci_send

(cherry picked from commit b83647f5ea)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:03 +08:00
Zhi Wei Jian c89b01c3e5 fix(ble/bluedroid): BLE credit, reject when p_rcb NULL, timeout and leak fixes
- l2c_int: align struct/constant types with l2c_ble/l2c_main
- l2c_api: null/state checks in L2CA_SendFixedChnlData
- l2c_ble: reject when p_rcb==NULL, add L2CAP_CMD_BLE_FLOW_CTRL_CREDIT;
  l2cble_init_direct_conn int64_t timeout and link_timeout==0 fix
- l2c_link: null/state checks and cleanup in hci_disc_comp/timeout/send_to_lower
- l2c_main: free p_msg on FCR non-Basic and COC branches; fix LE credit handling;
  process_l2cap_cmd bounds
- l2c_utils: credit/queue cleanup and null checks in l2cu_disconnect_chnl


(cherry picked from commit 16d523e9bf)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:03 +08:00
Zhi Wei Jian 5399361622 fix(ble/bluedroid): Fix double-free, exec write, bounds and HCI param checks
- gap_ble: add length/attribute checks in gap_proc_write_req
- gatt_cl: set p_cmd->p_cmd=NULL before memset to avoid double-free;
  pending_cl_req %= GATT_CL_MAX_LCB
- gatt_sr: fix exec write zeroed_attrs and offset/len bounds, OOM cleanup
- gatt_sr_hash: null checks for p_attr->p_next, p_data+=2, len==0 in
  gatts_calculate_datebase_hash, gatts_show_local_database
- gatt_utils: explicit return NULL, indent, idx<GATT_MAX_APPS checks,
  len>GATT_MAX_ATTR_LEN, gatt_cleanup_upon_disc dealloc branch
- hciblecmds: length/handle validation in BLE ext adv/BIG sync HCI commands


(cherry picked from commit 1d31286f1a)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:03 +08:00
Zhi Wei Jian 890cbb1d54 fix(ble/bluedroid): Event length checks and timer/alarm error handling
- btu_hcif: validate p_msg->len and hci_evt_len in process_event; pass evt_len to
  sub-handlers; fix cs_subevt num_steps_reported==0 malloc; bounds in
  command_complete and role_change_evt
- btu_task: handle osi_alarm_new/hash_map_set failure in btu_start_timer,
  btu_start_quick_timer, btu_start_timer_oneshot


(cherry picked from commit 537661fb2e)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:03 +08:00
Zhi Wei Jian 6e56940435 fix(ble/bluedroid): BLE GAP/ACL/ISO/SCO null checks, evt_len and resource handling
- btm_acl: malloc/list_append failure handling, remove/memset order in btm_acl_removed
- btm_ble: remove incorrect sec_flags in SMP_OOB/NC/SC_OOB fall-through
- btm_ble_5_gap: btm_ble_hci_status_to_str unreachable return,
  BTM_BleSetExtendedAdvParams/BleStartExtAdv leak and bounds
- btm_ble_addr: fix indent in btm_find_dev_by_identity_addr
- btm_ble_gap: null check p_service_data, pass evt_len to btm_ble_process_adv_pkt,
  bounds in process_adv_pkt
- btm_ble_iso: align param types with declaration
- btm_ble_privacy: handle BTM_BLE_IRK_LIST_INVALID_INDEX in update_resolving_list,
  comment fixes
- btm_devctl: fix btm_vsc_complete param order/type
- btm_sco: add evt_len to btm_sco_process_num_completed_pkts for bounds check
- btm_ble_int.h/btm_int.h: add evt_len to process_adv_pkt and
  process_num_completed_pkts declarations


(cherry picked from commit 65b2cb2728)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:03 +08:00
Zhi Wei Jian 852c3b210e fix(ble/bluedroid): Add length/pointer checks and fix error paths
- hci_hal_h4: validate packet length and pointers in hci_packet_complete,
  hdl_rx_adv_rpt, callbacks
- hci_layer: align hci_start_up error path and return; validate packet len in
  filter_incoming_event
- hci_packet_factory: ensure BT_HDR length/offset initialized in make_command_no_params
- packet_fragmenter: validate length before fragment_and_dispatch


(cherry picked from commit 778dd2ab5e)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 80414d0012 fix(ble/bluedroid): Fix init failure handling, storage/config and GATT leaks
- btc_main: handle bte_main_boot_entry failure with cleanup and future_ready(FUTURE_FAIL)
- btc_ble_storage: fix key/length validation in _btc_storage_get_ble_bonding_key
- btc_config: align return/error contract with callers
- btc_dm: use safe BTA_SERVICE_ID_TO_SERVICE_MASK, fix sec_cb_handler type
- btc_gatt_util: fix btc_to_bta_response/set_read_value length and bounds
- btc_gatts: future_free on early return, max_nb_attr uint16_t, fail cleanup,
  handle bounds
- btc_ble_cte/btc_iso_ble: fix callback type/param consistency with BTA


(cherry picked from commit 6f5d9e3440)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian f964d8dc50 fix(ble/bluedroid): Add null/range checks and fix resource handling in BTA layer
- bta_dm_int: fix BTA_SERVICE_ID_TO_SERVICE_MASK undefined behavior (1<<id when id>=32)
- bta_gattc_main: add event bounds check before state table lookup
- bta_gattc_utils: null checks for remote_bda/p_rcb, fix list_free in clcb_dealloc,
  bta_to_btif_uuid fixes
- bta_gatts_act: fix formatting/indent in send_service_change_indication
- bta_gatts_api: validate attr_val/len, add error logs on alloc failure
- bta_sys_main: null/range checks in sm_execute, alarm/hash_map error handling in
  bta_alarm_cb


(cherry picked from commit f4cec2ac4e)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 8d7b046b81 fix(ble/bluedroid): fix ISO HCI layer and update Kconfig
- Fix ISO HCI functions and remove unused code
- Fix spelling: BROCASTER to BROADCASTER in Kconfig and headers
- Update common config headers for consistency



(cherry picked from commit 611eef480a)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 22b75a0a05 fix(ble/bluedroid): fix L2CAP, SMP and HCI command issues
- Fix active_count check in l2cu_ble_plcb_active_count
- Restore previous state if connection command fails
- Fix HCI cmd buffer size off-by-one errors
- Fix connect handle length errors
- Fix channel sounding event status handling
- Fix SMP param_len check in smp_rand_back
- Fix spelling: BROCASTER to BROADCASTER in definitions



(cherry picked from commit e118d053b3)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 9501b978b2 fix(ble/bluedroid): fix GAP, advertising and security issues in BTM layer
- Fix adv state restore and reset if start/stop failed
- Fix periodic adv v2 event without PAWR feature enabled
- Fix periodic adv sync establish skip handling
- Fix resolving list max_size validation
- Fix RPA addr_type update after host-side resolution
- Fix pairing_state reset if p_dev_rec alloc failed
- Fix ISO cis_cnt limit and ext adv parameter check
- Try to delete smp keys even if not in device list



(cherry picked from commit e0ccc644a8)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 9025560b11 fix(ble/bluedroid): fix GATT protocol and database operation issues
- Fix GATTC read by type length error and rsp pdu format check
- Fix p_cur_handle update in gatts_db_read_attr_value_by_type
- Fix len calculation error in calculate_database_info_size
- Replace gatt_find_the_connected_bda with p_tcb_list iteration
- Send cmd reject if cid is invalid
- Fix param_len check in smp_rand_back
- Remove duplicate uuid compare functions



(cherry picked from commit 6242e0244c)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 90f5b74002 fix(ble/bluedroid): fix parameter handling and deep copy in BTC layer
- Fix CS and CTE callback deep copy errors in btc_gap_ble
- Fix incorrect parameter check in btc_gattc_prepare_write_char_descr
- Fix conn_handle length error and malloc failure handling
- Fix memcpy error and reset params if malloc failed
- Fix spelling: BROCASTER to BROADCASTER
- Delete unused ISO functions in btc_iso_ble



(cherry picked from commit 1fea299dc9)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 5c85f0b237 fix(ble/bluedroid): fix state management and security issues in BTA DM layer
- Fix out-of-bounds read and peer_device cleanup in bta_dm_acl_change
- Fix adv state restore and BTM status usage in bta_dm_ble_advstop
- Fix remove security device failed due to invalid transport
- Rename tBTA_DM_API_BLE_OBSERVE to tBTA_DM_API_BLE_ADVACTION
- Remove unused btm_sec_find_bonded_dev()



(cherry picked from commit c7931bedf5)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 91436f5d3e fix(ble/bluedroid): fix memory safety and state issues in BTA GATT layer
- Fix use-after-free and double-free in bta_gattc_update_include_service
- Fix heap buffer overflow in GATT database operations
- Fix GATTC cache load attr length check and NVS handle leak
- Fix parameter validation in bta_gattc_uuid_compare
- Ensure all CLCBs are cleaned up on deregister
- Remove unused bta_gattc_open_error
- Unify GATT db count/fill by declaration handle range
- Fix return status in gatts_set_attribute_value



(cherry picked from commit d4f3517da4)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian a7c296254a fix(ble/bluedroid): fix parameter validation and cleanup in ISO and CTE APIs
- Add parameter validation in esp_ble_iso_api and esp_ble_cte_api
- Delete unused ISO functions and incorrect parameter checks
- Add host status check in esp_ble_iso_get_callback()
- Fix CTE parameter handling when enable value is 0



(cherry picked from commit 562cd2eae5)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00
Zhi Wei Jian 033eba6d6d fix(ble/bluedroid): fix parameter validation and initialization in BLE APIs
- Add parameter validation in esp_gap_ble_api, esp_gattc_api, esp_gatts_api
- Initialize API args to prevent undefined behavior
- Add host status checks in API functions
- Fix memory leak if bluedroid init failed



(cherry picked from commit d439a3fcce)

Co-authored-by: zhiweijian <zhiweijian@espressif.com>
2026-03-30 16:45:02 +08:00