Bluetooth: nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-picks #24800
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Enables the local support bit for the LE Power Class 1 Feature. Signed-off-by: Sean Madigan <[email protected]>
Update sdc and mpsl for v2.6.4-DRGN-25465 release. Signed-off-by: Sean Madigan <[email protected]>
cvinayak
requested review from
a team,
carlescufi and
tejlmand
as code owners
github-actions
bot
added
manifest
changelog-entry-required
|
The following west manifest projects have been modified in this Pull Request:
Note: This message is automatically posted and updated by the Manifest GitHub Action. |
Test specificationCI/Jenkins/NRF
CI/Jenkins/integration
test-sdk-sidewalk: added because there was no .github/test-spec.yml in 'sidewalk' Detailed information of selected test modules Note: This message is automatically posted and updated by the CI |
seko-nordic
reviewed
Oct 1, 2025
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
from
d0a8d8b to
b0eba10
Compare
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
from
b0eba10 to
bff7e09
Compare
Update test-manifest to reference the branch release/ncs-v2.6-branch-NCSIDB-1718 for test_nrf. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
from
bff7e09 to
0b8fc7d
Compare
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
3 times, most recently
from
5447117 to
bd1d3bc
Compare
cvinayak
requested review from
alwa-nordic,
nordic-auko and
a team
as code owners
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
2 times, most recently
from
99e15b2 to
a28b19b
Compare
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
from
a28b19b to
c537798
Compare
cvinayak
requested review from
koffes,
alexsven,
rick1082,
gWacey,
Frodevan and
MarekPieta
as code owners
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
from
c537798 to
98e50b4
Compare
Update sdk-zephyr, sdk-sidewalk, sdk-nrfxlib and dragoon revision for NCSIDB-1718. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-picks. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-pick fixes. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
This KConfig enables the feature bit for power class 1 in the controller. Required if a customer wants to transmit at >10dBm Signed-off-by: Sean Madigan <[email protected]> (cherry picked from commit d8f5a50) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Log an error and fail if an HCI packet was too big for the static HCI buffer. If for instance CONFIG_BT_BUF_RX_SIZE is too small, you get buffer overruns. Hopefully this can save some time for poor saps like me who spend all day trying to figure out why their code seems to produce random bus faults and other memory corruption symptoms Signed-off-by: Olivier Lesage <[email protected]> (cherry picked from commit 88b468e) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
This commit fixes deadlock in MPSL workq caused by bt_buf_get_rx with K_FOREVER. Previously, calling bt_buf_get_rx with K_FOREVER could block indefinitely if the requested pool had no available buffers. This blocking affected the MPSL work queue, preventing it from processing other work items, including critical timeslot events like MPSL_TIMESLOT_SIGNAL_CANCELLED and MPSL_TIMESLOT_SIGNAL_BLOCKED. The issue becomes more severe if a background flash operation coincides with this scenario. Flash operations often execute on the system work queue (sysworkq), which can delay host work items responsible for freeing buffers in the RX pool. In such cases: - Flash operations stall, waiting for a timeslot event from the MPSL work queue. - The MPSL work queue remains blocked by bt_buf_get_rx. - This results in a deadlock, causing the flash operation to timeout and triggering a warning. This commit modifies the HCI driver to call bt_buf_get_rx with K_NO_WAIT. If no buffer is immediately available, it relies on a callback to notify when a buffer is freed. This change ensures the MPSL work queue remains unblocked, allowing other work items to execute while waiting for a buffer. Signed-off-by: Pavel Vasilyev <[email protected]> (cherry picked from commit 52b6395) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
After replacing K_FOREVER with K_NO_WAIT when requesting a buffer from the host pool, it became possible to call `hci_driver_receive_process` directly from the SDC callback instead of going through `receive_signal_raise` as `hci_driver_receive_process` is now non-blocking. Signed-off-by: Pavel Vasilyev <[email protected]> (cherry picked from commit aec6383) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
The host will generate up to acl_pkts number of Host Number of Completed Packets plus a number of normal HCI commands, which use Num_HCI_Command_Packets. As such, if we do not provide enough (host) TX CMD buffers for the possible number of acl_pkts plus Num_HCI_Command_Packets, we may run into a deadlock. Currently the SDC controller delays sending disconnect events until it received all the ACKs for the ACL data packets sent to the host to avoid race conditions. Which, in case there aren't enough (host) TX CMD buffers, can result in a deadlock visible by a missing disconnect event. When Controller to Host data flow control is supported, this commit ensures that the `CONFIG_BT_BUF_CMD_TX_COUNT` is greater than or equal to `BT_BUF_ACL_RX_COUNT + Ncmd`, where Ncmd is the supported maximum Num_HCI_Command_Packets. Note: The SDC controller (currently) does not support Num_HCI_Command_Packets > 1. Ncmd is always 1. Furthermore this commit restricts the `host_total_num_acl_data_packets` communicated to the controller to how many acknowledgements + Ncmd the controller is able to receive from the host. This is especially valuable in a controller-only build where it cannot be foreseen what settings are used for the host. Signed-off-by: Kyra Lengfeld <[email protected]> (cherry picked from commit 7766183) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Refer to commit zephyrproject-rtos/zephyr@d382fca Signed-off-by: Vinayak Kariappa Chettimada <[email protected]> (cherry picked from commit beadde7) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
When power class 1 was enabled the feature feature bit was not being set. Signed-off-by: Thomas Johansen <[email protected]> (cherry picked from commit 399a846) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-picks revised. Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
from
98e50b4 to
8dae77f
Compare
This is needed after changes in upstream zephyr. Signed-off-by: Timothy Keys <[email protected]> (cherry picked from commit 85ce826) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
cvinayak
force-pushed
the
github_ncs_v2_6_4_branch_NCSIDB-1718
branch
from
8dae77f to
0f0bfcd
Compare
…ol buffers The host will generate up to acl_pkts number of Host Number of Completed Packets plus a number of normal HCI commands, which use Num_HCI_Command_Packets. As such, if we do not provide enough (host) TX CMD buffers for the possible number of acl_pkts plus Num_HCI_Command_Packets, we may run into a deadlock. Currently the SDC controller delays sending disconnect events until it received all the ACKs for the ACL data packets sent to the host to avoid race conditions. Which, in case there aren't enough (host) TX CMD buffers, can result in a deadlock visible by a missing disconnect event. When Controller to Host data flow control is supported, this commit ensures that the `CONFIG_BT_BUF_CMD_TX_COUNT` is greater than or equal to `BT_BUF_ACL_RX_COUNT + Ncmd`, where Ncmd is the supported maximum Num_HCI_Command_Packets. Note: The SDC controller (currently) does not support Num_HCI_Command_Packets > 1. Ncmd is always 1. Furthermore this commit restricts the `host_total_num_acl_data_packets` communicated to the controller to how many acknowledgements + Ncmd the controller is able to receive from the host. This is especially valuable in a controller-only build where it cannot be foreseen what settings are used for the host. Signed-off-by: Kyra Lengfeld <[email protected]> (cherry picked from commit 7766183) Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-picks.