Skip to content

[v2.6.4-NCSDK-34113-branch] Bluetooth: nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-picks #24800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 24, 2025
Merged

[v2.6.4-NCSDK-34113-branch] Bluetooth: nRF Connect SDK v2.6.4 NCSIDB-1718 cherry-picks #24800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a7157e7
bluetooth: controller: hci_driver: Add option to enable power class 1
sean-madigan Oct 23, 2024
84eceb5
bluetooth: controller: add k_panic() if the hci packet is too big
olivier-le-sage Sep 20, 2024
e6bd215
bluetooth: hci_driver: Fix deadlock in MPSL workq
PavelVPV Nov 7, 2024
13bb626
bluetooth: hci_driver: Process recvd msgs directly from SDC callback
PavelVPV Nov 27, 2024
f7897b5
Bluetooth: Controller: Ensure controller can handle flow control buffers
KyraLengfeld Jan 13, 2025
d596e47
Bluetooth: Controller: Disable new unit test missing framework
cvinayak Oct 21, 2025
4b11391
Bluetooth: Controller: Port HCI Command buffer allocation
cvinayak Apr 30, 2025
b498533
bluetooth: controller: add missing feature bit for power class 1
thomas-m-johansen Jun 13, 2025
390e553
Samples: Bluetooth: Explicitly set CONFIG_BT_BUF_EVT_RX_COUNT
weeTike Apr 30, 2025
61fbe37
test-manifest: Update to reference ncs-v2.6-branch-NCSDK-34113-2-prev…
cvinayak Oct 3, 2025
82a2504
manifest: Update zephyr, sidewalk, nrfxlib and dragoon for NCSIDB-1718
cvinayak Sep 30, 2025
858c259
version: Update to 2.6.4-NCSDK-34113-2-preview1
cvinayak Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ Kconfig* @tejlmand
/tests/modules/mcuboot/external_flash/ @hakonfam @sigvartmh
/tests/nrf5340_audio/ @koffes @alexsven @erikrobstad @rick1082 @nordic-auko
/tests/subsys/audio_module/ @koffes @alexsven @erikrobstad @rick1082 @gWacey
/tests/subsys/bluetooth/controller/ @nrfconnect/ncs-dragoon
/tests/subsys/bluetooth/gatt_dm/ @doki-nordic
/tests/subsys/bluetooth/mesh/ @ludvigsj
/tests/subsys/bluetooth/fast_pair/ @alstrzebonski @MarekPieta @kapi-no
Expand Down
4 changes: 0 additions & 4 deletions Kconfig.nrf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ config MCUMGR_TRANSPORT_NETBUF_SIZE
default 2475 if MCUMGR_TRANSPORT_BT_REASSEMBLY
default 1024 if UPDATEABLE_IMAGE_NUMBER > 1

# When using HCI on the nRF5340 we need a larger command buffer.
config BT_BUF_CMD_TX_COUNT
default 10 if SOC_COMPATIBLE_NRF5340_CPUAPP || SOC_COMPATIBLE_NRF5340_CPUNET

config INIT_ARCH_HW_AT_BOOT
default y
help
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.4
2.6.4-NCSDK-34113-2-preview1
1 change: 1 addition & 0 deletions applications/connectivity_bridge/boards/thingy91_nrf52840.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_SMP=y
CONFIG_BT_CTLR=y
CONFIG_BT_CTLR_RX_BUFFERS=10
CONFIG_BT_BUF_EVT_RX_COUNT=11
CONFIG_BT_BUF_ACL_TX_COUNT=10
CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
Expand Down
1 change: 1 addition & 0 deletions applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251
CONFIG_BT_NUS=y
CONFIG_BT_GATT_CLIENT=y
CONFIG_BT_SMP=y
CONFIG_BT_BUF_EVT_RX_COUNT=11
CONFIG_BT_BUF_ACL_TX_COUNT=10
CONFIG_BT_BUF_ACL_TX_SIZE=251
CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
Expand Down
4 changes: 3 additions & 1 deletion applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ CONFIG_BT_MAX_PAIRED=2
CONFIG_BT_ID_MAX=3
CONFIG_BT_LL_SW_SPLIT=y

CONFIG_BT_CONN_TX_MAX=4
CONFIG_BT_BUF_EVT_RX_COUNT=4
CONFIG_BT_BUF_ACL_TX_COUNT=3
CONFIG_BT_CONN_TX_MAX=3
Copy link
Contributor

@MarekPieta MarekPieta Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess that your intention here is to reduce RAM usage next to setting CONFIG_BT_BUF_EVT_RX_COUNT=4 (to prevent RAM overflows). I am slightly worried that the extra configuration changes added here might introduce edge cases.

Copy link
Contributor

@MarekPieta MarekPieta Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E.g. IIRC CONFIG_BT_CONN_TX_MAX used value of 4 here to allow transmitting:

2 * GATT notification with HID mouse input report (required for motion data pipeline)
1 * GATT notification with battery data (BAS)
1 * GATT read response

Setting it to the value of 3 might not cover all of the edge cases.

Copy link
Contributor

@MarekPieta MarekPieta Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updates in dongle's configuration might require additional testing too

Copy link
Contributor

@MarekPieta MarekPieta Oct 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The RAM overflows seem small:

  • 52 bytes for nrf52810dmouse
  • 24 bytes for nrf52820dongle

Still, I do not see a simple change that could allow us to reduce the memory usage here. This might require further investigation.

Copy link
Contributor Author

@cvinayak cvinayak Oct 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see support for 52810 was dropped here: f66256c

Is this a concern for the v2.6.4-x? this is a preview tag.

Copy link
Contributor

@MarekPieta MarekPieta Oct 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think customers are likely to use the preview tag with the updated nRF Desktop devices? If so, then they might possibly reveal some edge cases.

Still I am not sure if it's mandatory to support these 2 devices from this particular tag (I think this would need to be consulted with PMT).

CONFIG_BT_CTLR_FAL_SIZE=1
CONFIG_BT_CTLR_RL_SIZE=2

Expand Down
4 changes: 3 additions & 1 deletion applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,13 @@ CONFIG_SIZE_OPTIMIZATIONS=y
CONFIG_LED=y
CONFIG_LED_GPIO=y

CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16
CONFIG_USB_NRFX_EVT_QUEUE_SIZE=10

CONFIG_BT_PRIVACY=y
CONFIG_BT_LL_SW_SPLIT=y

CONFIG_BT_BUF_EVT_RX_COUNT=4
CONFIG_BT_BUF_ACL_TX_COUNT=3
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_L2CAP_TX_BUF_COUNT=6
Expand Down
4 changes: 3 additions & 1 deletion applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,13 @@ CONFIG_SIZE_OPTIMIZATIONS=y
CONFIG_LED=y
CONFIG_LED_GPIO=y

CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16
CONFIG_USB_NRFX_EVT_QUEUE_SIZE=10

CONFIG_BT_PRIVACY=y
CONFIG_BT_LL_SW_SPLIT=y

CONFIG_BT_BUF_EVT_RX_COUNT=4
CONFIG_BT_BUF_ACL_TX_COUNT=3
CONFIG_BT_BUF_ACL_TX_SIZE=35
CONFIG_BT_CTLR_DATA_LENGTH_MAX=35
CONFIG_BT_L2CAP_TX_BUF_COUNT=6
Expand Down
3 changes: 3 additions & 0 deletions boards/arm/thingy91_nrf52840/thingy91_nrf52840_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ CONFIG_SERIAL=y
CONFIG_CONSOLE=y

CONFIG_BOOTLOADER_MCUBOOT=y

# BT
CONFIG_BT_BUF_CMD_TX_COUNT=3
2 changes: 1 addition & 1 deletion samples/bluetooth/peripheral_lbs/prj_minimal.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ CONFIG_BT_CTLR_PHY_2M=n
# Reduce Bluetooth buffers
CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=43
CONFIG_BT_BUF_EVT_RX_COUNT=2

CONFIG_BT_CONN_TX_MAX=2
CONFIG_BT_L2CAP_TX_BUF_COUNT=2
CONFIG_BT_BUF_EVT_RX_COUNT=4
CONFIG_BT_BUF_ACL_TX_COUNT=3
CONFIG_BT_BUF_ACL_TX_SIZE=27
2 changes: 1 addition & 1 deletion samples/bluetooth/peripheral_uart/prj_minimal.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ CONFIG_BT_CTLR_PHY_2M=n
# Reduce Bluetooth buffers
CONFIG_BT_BUF_EVT_DISCARDABLE_COUNT=1
CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=43
CONFIG_BT_BUF_EVT_RX_COUNT=2

CONFIG_BT_CONN_TX_MAX=2
CONFIG_BT_L2CAP_TX_BUF_COUNT=2
CONFIG_BT_BUF_EVT_RX_COUNT=4
CONFIG_BT_BUF_ACL_TX_COUNT=3
CONFIG_BT_BUF_ACL_TX_SIZE=27
1 change: 1 addition & 0 deletions samples/bluetooth/throughput/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ CONFIG_BT_L2CAP_TX_BUF_COUNT=10
CONFIG_BT_L2CAP_TX_MTU=498
CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
CONFIG_BT_CONN_TX_MAX=10
CONFIG_BT_BUF_EVT_RX_COUNT=11
CONFIG_BT_BUF_ACL_TX_COUNT=10
CONFIG_BT_BUF_ACL_TX_SIZE=502

Expand Down
1 change: 1 addition & 0 deletions subsys/bluetooth/controller/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ zephyr_library()
zephyr_library_sources(
hci_driver.c
hci_internal.c
hci_internal_wrappers.c
)

zephyr_library_sources_ifdef(
Expand Down
8 changes: 8 additions & 0 deletions subsys/bluetooth/controller/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,5 +550,13 @@ config BT_CTLR_SDC_CIS_SUBEVENT_LENGTH_US
If this parameter is set to zero, the subevent length
is chosen by the controller.

config BT_CTLR_SDC_LE_POWER_CLASS_1
bool "Device supports transmitting at LE Power Class 1 level"
default y if BT_CTLR_TX_PWR_ANTENNA >= 10
help
This should be set if the device supports transmitting above +10dBm.
See Bluetooth Core Specification, Vol 6, Part A, Section 3
Transmitter Characteristics for more information.

endmenu
endif # BT_LL_SOFTDEVICE
Loading
Loading