Skip to content

Commit b13497e

Browse files
committed
Bluetooth: nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-pick revised
nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-pick revised. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
1 parent d7758a8 commit b13497e

File tree

1 file changed

+40
-21
lines changed

1 file changed

+40
-21
lines changed

ncs-2.6.4-branch-cherry-picks.txt

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
# 161aadd5909 Bluetooth: Mesh: Return immediately if labels not supported
1616
# b782b11f16a Bluetooth: L2CAP: l2cap_create_le_sig_pdu() no longer uses buf
1717
f0032a369da Bluetooth: L2CAP: Fix leaking tx metadata
18+
1819
# 56a59019559 Bluetooth: Controller: Add Kconfig for LE Power Control Request Feature
1920
# 93e5cf6e618 Bluetooth: Host: Add LE Power Control Request Procedure APIs
2021
# 2c9af855bc6 Bluetooth: Host: Add bt shell functions LE Power Control Request Feature
@@ -102,20 +103,21 @@ f0032a369da Bluetooth: L2CAP: Fix leaking tx metadata
102103
# 6c5fc658efc Bluetooth: Mesh: suspend/resume gatt advs
103104
# 3bfb2e3ab2d Bluetooth: Audio: Add implementation for PBP and dedicated sample apps.
104105
# 19da13313d5 Bluetooth: L2CAP: remove usage of `bt_l2cap_send_cb` by BR/EDR
105-
1e6ff5ff05d Bluetooth: L2CAP: separate BR/EDR and LE internal headers
106+
# 1e6ff5ff05d Bluetooth: L2CAP: separate BR/EDR and LE internal headers
106107
# 79af154ae7d tests: bsim: Bluetooth: CAP broadcast AC testing
107108
# 2b30259e9f0 Bluetooth: Controller: Fix ull_prepare_dequeue for skipped events
108109
# 7f99677aa6b Bluetooth: Controller: Add support for DYNAMIC_INTERRUPTS
109110
# 27b1f4eb7f9 Bluetooth: Mesh: Fix dereferencing before null pointer check
110111
75c2aeb8bd0 Bluetooth: L2CAP: stop stealing buffers from SDU pool
112+
111113
# 234b322dc30 Bluetooth: Audio: Fix len check in ltv_set_val
112114
# a72da864e04 Bluetooth: BAP: Restrict application ASCS response codes
113115
# 13b0052cfae Bluetooth: MPL: Add notification to track change
114116
# e2b271fbc45 Bluetooth: ASCS: Add additional dbg info in state changes
115117
# 400cdcaca4f Bluetooth: BAP: Fix invalid GATT error codes in scan delegator
116118
# 68f8c8ff29d Bluetooth: Audio: Fix off-by-one error in codec.c:ltv_set_val
117119
# 4e7d64b1b45 Bluetooth: Mesh: enable access responses randomization
118-
38c39af4df1 Bluetooth: L2CAP: Prepend SDU header immediately
120+
# 38c39af4df1 Bluetooth: L2CAP: Prepend SDU header immediately
119121
# f9c116ec73b Bluetooth: CAP: Shell: Fix channel allocation
120122
# 64adf0b0656 Bluetooth: BAP: Add log of err in bt_bap_stream_detach
121123
# 9fc630d303d Bluetooth: CSIP: Use bt_crypto_aes_cmac instead of own
@@ -124,7 +126,7 @@ f0032a369da Bluetooth: L2CAP: Fix leaking tx metadata
124126
# 06fa287d459 Bluetooth: Audio: Update audio location definitions
125127
# 60c0087555f Bluetooth: Controller: Fix ISO Sync Receiver time reservation calc
126128
# 2dcb91ab46b Bluetooth: L2CAP: extract LE part of `bt_l2cap_chan_send`
127-
81d524d0816 Bluetooth: L2CAP: always send from workqueue
129+
# 81d524d0816 Bluetooth: L2CAP: always send from workqueue
128130
# 056d5a354bc Bluetooth: controller: Handle peripheral CIS creation latency
129131
# 11175c3ad31 tf-m: Change NS include path for TF-M 2.0.0
130132
# 476e7b3fa33 Bluetooth: Audio: Ensure that read callbacks can handle conn == NULL
@@ -389,8 +391,8 @@ f0032a369da Bluetooth: L2CAP: Fix leaking tx metadata
389391
# 4dae6623bc1 Bluetooth: BT_HCI_RESERVE set to 1 if BT_SILABS_HCI
390392
# 6af7ad5a529 Bluetooth: Mesh: Prevent duplicate cdb appkeys
391393
# 0483d68334c Bluetooth: Mesh: Add missing model extensions
392-
76015745df1 Bluetooth: ATT: lock scheduler when sending from user thread
393-
e71b56e87ba [nrf fromlist] Bluetooth: ATT: lock scheduler when sending from user thread
394+
# 76015745df1 Bluetooth: ATT: lock scheduler when sending from user thread
395+
# e71b56e87ba [nrf fromlist] Bluetooth: ATT: lock scheduler when sending from user thread
394396
# 3a927a28339 Bluetooth: Host: Move BR/EDR files to host/classic
395397
# 081024b7fa3 Bluetooth: Host: Include full path of l2cap_br_interface.h
396398
# 83bfa4c91b2 Bluetooth: Host: Move BR headers to subfolder classic
@@ -429,7 +431,7 @@ e71b56e87ba [nrf fromlist] Bluetooth: ATT: lock scheduler when sending from user
429431
# 11bae5cfa95 Bluetooth: Controller: Fix missing radio timer comp and range delay
430432
# bd5e906f681 Bluetooth: Controller: Fix assertion establishing periodic sync
431433
# 4a55bc00f01 Bluetooth: Shell: Add support for EAD
432-
584f653de22 Bluetooth: conn: Don't deadlock on `BT_RECV_WORKQ_SYS`
434+
# 584f653de22 Bluetooth: conn: Don't deadlock on `BT_RECV_WORKQ_SYS`
433435
# 7845c0e3d64 Bluetooth: Controller: Ticker low latency with lazy skip
434436
# 14191f11fde Bluetooth: controller: Fix ISO Broadcast control subevent channel
435437
# 85b503e23b1 Bluetooth: controller: ISO Sync Receiver vendor data path fixes
@@ -495,7 +497,7 @@ e71b56e87ba [nrf fromlist] Bluetooth: ATT: lock scheduler when sending from user
495497
# 24f0a833268 Bluetooth: Audio: Shell: Fix chan alloc print for mono
496498
# dd7e77b77c2 Bluetooth: BAP: Shell: Fix bad PA sync ref for sink auto scan
497499
# 2b7f5dce258 Bluetooth: Audio: Shell: Runtime config of CAP/GMAP ACs
498-
0794b22c9c1 Bluetooth: l2cap: Fix SDU buffer leak
500+
# 0794b22c9c1 Bluetooth: l2cap: Fix SDU buffer leak
499501
# b4eac67b8b2 Bluetooth: BAP: Shell: Add support for decoding LC3 data
500502
# d96f98188c5 Bluetooth: CAP: Shell: Add cancel command
501503
# 7724b3e356f Bluetooth: controller: refactor of procedure init for mem optim
@@ -509,10 +511,11 @@ e71b56e87ba [nrf fromlist] Bluetooth: ATT: lock scheduler when sending from user
509511
# 1c132c90aa6 Bluetooth: Host: Document flags used for connection establishment
510512
# 237c59585ea Bluetooth: Host: Rename bt_conn_state_t states for clarity
511513
# baf3cc9fe0b bluetooth: OTS: Delay indications to system workqueue
512-
a5ae3b026b1 Bluetooth: conn: Don't wait for buf allocation in syswq
514+
# a5ae3b026b1 Bluetooth: conn: Don't wait for buf allocation in syswq
513515
# df1e4aa70fc Bluetooth: refactor add `is_host_managed_ccc`
514-
57b94080b2f Bluetooth: L2CAP: don't use NULL buf
516+
# 57b94080b2f Bluetooth: L2CAP: don't use NULL buf
515517
e4364413c26 Bluetooth: L2CAP: Don't try to send on disconnected channel
518+
516519
# e7ee26d5ed4 Bluetooth: BAP: Shell: Moved RX and TX fields into a union
517520
# e56494634ab bluetooth: mesh: Adapt BLOB IO to RRAM write size
518521
# 9bcf275d8be Bluetooth: Controller: Ignore bit 1 set in Initiating_PHYs
@@ -557,7 +560,7 @@ e4364413c26 Bluetooth: L2CAP: Don't try to send on disconnected channel
557560
# 2dd987713b0 Bluetooth: Coverity fix dereference before null check
558561
# 44199f3a486 Bluetooth: Host: Fix auto-connect/sync establishment on Coded PHY
559562
# 9631cd14b0f Bluetooth: OTS: Fix calling obj_created callback with NULL conn
560-
24c7ad344f9 Bluetooth: conn: check `k_work_submit()` retcode
563+
# 24c7ad344f9 Bluetooth: conn: check `k_work_submit()` retcode
561564
# 28d7d145716 Bluetooth: ATT: add debug log for timeout override
562565
# d45b462f23f Bluetooth: CSIP: Set Coordinator move data to instances
563566
# 68ea1c4fe45 Bluetooth: CAP: Fix issue with parallel CAP discover
@@ -567,6 +570,7 @@ e4364413c26 Bluetooth: L2CAP: Don't try to send on disconnected channel
567570
# 6a0cdb4eaa5 Bluetooth: CAP: Commander Reception start procedure
568571
# b2e235d5305 Bluetooth: Remove legacy debug symbols
569572
aa30d075637 Bluetooth: host: handle not getting a buffer
573+
570574
# 0d479a0091c Bluetoioth: CAP: Shell: Added qos config to unicast_start cmd
571575
# 425dcc46786 Bluetooth: controller: Sync ISO Establishment fixes
572576
# e4ea597a778 Bluetooth: Controller: BIG/CIG count based upon app configs
@@ -578,7 +582,7 @@ aa30d075637 Bluetooth: host: handle not getting a buffer
578582
# 2c6306d0995 Bluetooth: Controller: BT_CTLR_ISO_TX_BUFFER_SIZE from BT_ISO_TX_MTU
579583
# 76559f27fd6 Bluetooth: Host: Map HCI cmd disallowed to errno
580584
# 7d4c13f55f2 Bluetooth: CAP: Shell: Initiator fix chan_alloc
581-
b8fedfb6c16 bluetooth: host: conn: Fix assertion failure in wait_for_tx_work
585+
# b8fedfb6c16 bluetooth: host: conn: Fix assertion failure in wait_for_tx_work
582586
# 01b4f9d2637 Bluetooth: Controller: Fix BIS IRC range check
583587
# 36c1aeaf19e Bluetooth: BAP: Shell: Add support for USB audio in
584588
# 0cb828d4437 Bluetooth: CAP: Fix check for volume_mute_changed callback
@@ -599,14 +603,15 @@ b8fedfb6c16 bluetooth: host: conn: Fix assertion failure in wait_for_tx_work
599603
# f58ac3476fa Bluetooth: CAP: Add reference to the set member for CAP discover
600604
# c40856e5aab Bluetooth: ISO: Support bt_disable
601605
4a977463122 Bluetooth: Host: Guard set state in conn_destroy
606+
602607
# 7c96743fae2 Bluetooth: ISO: Upgrade from experimental to unstable
603608
# edef1b7cf45 Bluetooth: controller: fixing rx node leak on CPR reject of parallel CPR
604609
# 806a4fcf92a Bluetooth: controller: fix node_rx retention mechanism
605610
# 9d8059b6e55 Bluetooth: controller: minor cleanup and a fix-up re. LLCP
606611
# f8bbf753fca Bluetooth: Mesh: Change log lvl for element_model_recv
607612
# 274507fc52a Bluetooth: Controller: Add BT_CTLR_HCI Kconfig option
608613
# 261b358dc31 Bluetooth: Mesh: Shell: Update DFD start bool parse
609-
93d0eac8345 Bluetooth: Host: Forbid holding on to buf given to stack
614+
# 93d0eac8345 Bluetooth: Host: Forbid holding on to buf given to stack
610615
# 31c048f4e36 Bluetooth: Controller: Remove legacy LL optimize for speed dependency
611616
# 1b7fe792e0c Bluetooth: Controller: Support Link Time Optimizations (LTO)
612617
# 2adb4cac173 mbedtls: default enable USE_PSA_CRYPTO when CRYPTO_C
@@ -793,6 +798,7 @@ b8fedfb6c16 bluetooth: host: conn: Fix assertion failure in wait_for_tx_work
793798
# 4284f99870c bluetooth: host: hci_core: Safer checking of conn complete events
794799
32212bfb63a Bluetooth: host: extract sending of host num complete
795800
147ee3daaf4 Bluetooth: host: Send host num completes as early as possible
801+
796802
# 8be6db67fc3 Bluetooth: ISO/BAP: Refactor BIS bitfield
797803
# 7ed8bb50200 Bluetooth: BAP: Add PAST Kconfig dependency for BASS
798804
# ad63ca284e9 kconfig: replace known integer constants with variables
@@ -834,6 +840,7 @@ b8fedfb6c16 bluetooth: host: conn: Fix assertion failure in wait_for_tx_work
834840
# 58ec51616da Bluetooth: host: fix incorrect ISO HCI fragmentation logic
835841
# 5a4fdfbf3e6 Bluetooth: hci_common: Add assert on `buf` allocation
836842
8a2fe27c00e Bluetooth: Host: Free ACL RX fragments on disconnection
843+
837844
# 42c8732dda6 Bluetooth: Gatt: Make CCC_STORE_MAX configurable
838845
# e3da5c3d390 Bluetooth: Mesh: Fix build warning with gcc 13
839846
# ba62c8d8764 Bluetooth: BAP: Support setting different values per dir in CIG
@@ -874,7 +881,7 @@ b8fedfb6c16 bluetooth: host: conn: Fix assertion failure in wait_for_tx_work
874881
# 4bdca17e217 Bluetooth: OTS: Use proper kconfig log option
875882
# 0f7f6edcf65 Bluetooth: Mesh: Fix uninitialized field when cancelling transfer blob
876883
# 98ddf107fa1 mbedtls: rename CONFIG_MBEDTLS_ZEPHYR_ENTROPY and move it
877-
5736b71193f Bluetooth: Host: Fix incorrect build assert
884+
# 5736b71193f Bluetooth: Host: Fix incorrect build assert
878885
# d5da582e00a Bluetooth: Controller: Fix PA setup for ISO Broadcast
879886
# f05d16dabb7 Bluetooth: Controller: Fix missing Broadcast ISO Sync MIC failure
880887
# eaf92a1494c tests: Bluetooth: CAP: Initiator unicast start unittests
@@ -1068,7 +1075,7 @@ b8fedfb6c16 bluetooth: host: conn: Fix assertion failure in wait_for_tx_work
10681075
# de14efef98d Bluetooth: BASS: add scan cb to scan delegator module.
10691076
# f712bde1220 bluetooth: host: att: Implement disconnect on ATT timeout
10701077
# f7e8a8717b1 tests: bsim: bluetooth: host: att: Add ATT timeout test
1071-
74972e694b4 bluetooth: host: l2cap: Check conn state before queueing PDU
1078+
# 74972e694b4 bluetooth: host: l2cap: Check conn state before queueing PDU
10721079
# 257c5e6affb bluetooth: conn: increase log level of timeout ignore
10731080
# 7f1589e23b9 Bluetooth: ISO: Add ISO BIS bitfield check macro
10741081
# 405492f009b Bluetooth: Audio: Shell: Fix BIS sync bit field validity check
@@ -1171,6 +1178,7 @@ b8fedfb6c16 bluetooth: host: conn: Fix assertion failure in wait_for_tx_work
11711178
# 1b8ad2cf404 Bluetooth: AVRCP: allow to parse unit info resposne.
11721179
# a785548df63 bluetooth: CTS: Fix includes to avoid build error with some libCs
11731180
b478ffe2ef7 Bluetooth: host: Fix bug in disconnected handling
1181+
11741182
# b54f49cb8c1 Bluetooth: Mesh: Fix proxy advertising set sending Mesh messages
11751183
# 665a555e756 Bluetooth: Mesh: Use relay bufs/pool for brg_cfg
11761184
# b38773f14b9 Bluetooth: Mesh: Use net xmit params for bridge
@@ -1237,7 +1245,7 @@ b478ffe2ef7 Bluetooth: host: Fix bug in disconnected handling
12371245
# aa1a38e2aa0 bluetooth: shell: refactor shell print to eliminate `ctx_shell` usage
12381246
# a047113556b Bluetooth: Classic: SDP: Improve SDP discover
12391247
# d37402f4477 Bluetooth: Shell: BR: Update command `sdp-find`
1240-
b3ffaf4441e Bluetooth: Host: Cancel pending deferred work on disconnect
1248+
# b3ffaf4441e Bluetooth: Host: Cancel pending deferred work on disconnect
12411249
# e8bcb29f3f0 Bluetooth: ISO: Add BIG callbacks
12421250
# ab9ee0817d1 Bluetooth: BAP: Add broadcast source callback structs
12431251
# 0ae976166ff Bluetooth: CAP: Add broadcast source callback structs
@@ -1249,7 +1257,16 @@ b3ffaf4441e Bluetooth: Host: Cancel pending deferred work on disconnect
12491257
# 2424bfd8699 Bluetooth: BR: improve br_sufficient_key_size
12501258
# 69d415c9ce5 Bluetooth: SSP: Improve BR SC only mode
12511259
# 0156a322b13 bluetooth: host: hci_core: fix `num_handles` assignment
1252-
# c2488fdd302 bluetooth: buf: Add a callback for freed buffer in rx pool
1260+
0ddb6aa82e3 Bluetooth: Host: Use actual user_data size
1261+
1cb83a81f09 Bluetooth: Host: Remove use of `bt_buf_get_cmd_complete`
1262+
b6a10516b0c Bluetooth: Host: Remove `bt_buf_get_cmd_complete`
1263+
9426309dbe2 Bluetooth: Host: Refactor `bt_buf_get_evt`
1264+
95533470803 Bluetooth: ISO: Add CONFIG_BT_ISO_{RX/TX}
1265+
2a7adae6c13 Bluetooth: Rename `num_complete_pool` -> `sync_evt_pool`
1266+
792ae681653 Bluetooth: host: Use correct user_data size for hci_rx_pool
1267+
6d5cce662af Bluetooth: buf: Put command complete/status in sync buf pool
1268+
c2488fdd302 bluetooth: buf: Add a callback for freed buffer in rx pool
1269+
12531270
# 519f8889426 Bluetooth: Mesh: Fix gatt advertiser start in bt_mesh_resume
12541271
# 1d7826c2ade bluetooth: host: conn.c fix Constant variable guards dead code issue
12551272
# f279f61551e Bluetooth: SDP: Correct record length of service att rsp
@@ -1447,6 +1464,7 @@ b3ffaf4441e Bluetooth: Host: Cancel pending deferred work on disconnect
14471464
# 17d695a5353 Bluetooth: Controller: Simplify required ISO PDU length and buffer count
14481465
05b16b971bf Bluetoth: Host: Fix buffer allocation warnings in system workqueue
14491466
6464ffa3f94 Bluetooth: Host: Fix deadlock when failing to alloc on BT RX thread
1467+
14501468
# 3a996c570b4 Bluetooth: Controller: Fix BT_CTLR_LOW_LAT_ULL dependency
14511469
# 65d69ec176d Bluetooth: Controller: Fix active mode extended scanning assert
14521470
# f67a94f47a5 Bluetooth: Controller: Fix single timer end time capture
@@ -1566,7 +1584,7 @@ b3ffaf4441e Bluetooth: Host: Cancel pending deferred work on disconnect
15661584
# 905aed99fa1 Bluetooth: Fixed null byte check in DIS UDI
15671585
# c9240cc99f9 bluetooth: host: Report status of Channel Sounding complete events
15681586
# 9ba60d3eb74 bluetooth: host: Apply callback changes of CS complete events
1569-
39c26059305 Bluetooth: Fix deadlock with settings and bt_hci_cmd_send_sync()
1587+
# 39c26059305 Bluetooth: Fix deadlock with settings and bt_hci_cmd_send_sync()
15701588
# a3b8954ae9a Bluetooth: Controller: Fix assert when flushing multiple CISes
15711589
# 384e31977f5 Bluetooth: Classic: L2CAP: Discard the response with a invalid `ident`
15721590
# 18beac9c575 Bluetooth: Classic: L2CAP: Support `L2CAP_COMMAND_REJECT_RSP`
@@ -1709,7 +1727,7 @@ b3ffaf4441e Bluetooth: Host: Cancel pending deferred work on disconnect
17091727
# cd43e03bbe2 Bluetooth: classic: shell: Support L2CAP channel `seg_recv`
17101728
# 5b17b5b44f1 Bluetooth: Controller: Fix adv aux release on insufficient resources
17111729
# 114bc8086d2 Bluetooth: ISO: fix hci_le_set_cig_params validation
1712-
379eb7a0ff8 bluetooth: host: Fix premature semaphore giving
1730+
# 379eb7a0ff8 bluetooth: host: Fix premature semaphore giving
17131731
# b9ddaf7a5f0 Bluetooth: Audio: Shell: Fix includes
17141732
# b04d6386dbe Bluetooth: Audio: Fix includes
17151733
# 6abdc389d4d Bluetooth: CSIP: Remove bt_csip_set_member_get_sirk
@@ -1726,11 +1744,12 @@ b3ffaf4441e Bluetooth: Host: Cancel pending deferred work on disconnect
17261744
# 9ecca872816 Bluetooth: Host make the long workqueue stack size configurable
17271745
# af77efb77e9 Bluetooth: Host: Remove unnecessary ifdef from cs.c
17281746
# 3c661a17659 Bluetooth: Controller: Fix LOW_LAT_ULL implementation for ISO support
1729-
ddeeecd0b4f bluetooth: host: Add a check for num of bt_conn_tx and ACL/ISO bufs
1730-
14b4e30cdf6 bluetooth: host: Deprecated BT_CONN_TX_MAX
1747+
# ddeeecd0b4f bluetooth: host: Add a check for num of bt_conn_tx and ACL/ISO bufs
1748+
# 14b4e30cdf6 bluetooth: host: Deprecated BT_CONN_TX_MAX
17311749
# cc9279e3ce6 Bluetooth: Controller: Only select BT_TICKER_LAZY_GET for ZLL
17321750
da9acbcf11a Revert "Bluetooth: host: Send host num completes as early as possible"
17331751
971c2c94265 Revert "Bluetooth: host: extract sending of host num complete"
1752+
17341753
# 70a97a8222c Bluetooth: BAP: Add control point cbs to BASS
17351754
# 0e138cb7775 Bluetooth: Host: K_NO_WAIT in bt_att_req_alloc() in SYS WQ
17361755
# 6887b58d4e3 Bluetooth: ISO: Remove BT_ISO_TX_FRAG_COUNT
@@ -1791,7 +1810,7 @@ da9acbcf11a Revert "Bluetooth: host: Send host num completes as early as possibl
17911810
# 2d8cdbbd295 [nrf fromtree] bluetooth: host: rename bool scan_enabled -> scan_disabled
17921811
# 3abc5c2cc2a [nrf fromtree] bluetooth: host: Do not try to set NRPA when scanning with identity
17931812
# 6453478e6c8 [nrf fromtree] bluetooth: host: Handle failure to disable scan when updating own_addr
1794-
720dc042525 [nrf fromtree] bluetooth: fix bug when destroying tx queue buffers on disconnect
1813+
# 720dc042525 [nrf fromtree] bluetooth: fix bug when destroying tx queue buffers on disconnect
17951814
# c61e3f3ce2b [nrf fromtree] Bluetooth: Decode Bluetooth 6.1 version number
17961815
# 71c24b8a084 [nrf noup] Bluetooth: Mesh: zero randomization for friend's adv
17971816
# 43189afa7ee [nrf noup] Bluetooth: Mesh: Fix adv randomness bug

0 commit comments

Comments
 (0)