From c3cf102fec43ba09ddf8e86d2bffc905e719cfdb Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Wed, 5 Feb 2025 14:42:48 +0100 Subject: [PATCH 1/3] bluetooth: Enable C2H ACL data fc to avoid potential deadlocks This commit enables C2H ACL data flow control by default to avoid potential deadlocks. See NCSDK-30959 for details. Known issues are updated in a separate PR. Signed-off-by: Pavel Vasilyev --- subsys/bluetooth/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/subsys/bluetooth/Kconfig b/subsys/bluetooth/Kconfig index 818ae1271221..2a55e796ec0b 100644 --- a/subsys/bluetooth/Kconfig +++ b/subsys/bluetooth/Kconfig @@ -45,6 +45,14 @@ config BT_LONG_WQ_STACK_SIZE default 1800 if (BT_ECC || BT_GATT_CACHING) default 1024 +if BT_CONN + +config BT_HCI_ACL_FLOW_CONTROL + # Enabling this option by default for now to avoid potential deadlocks. See NCSDK-30959. + default y + +endif # BT_CONN + rsource "controller/Kconfig" rsource "host_extensions/Kconfig" From 6af8b57c4028e6048882fb73e1442d989be54309 Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Mon, 17 Feb 2025 16:06:34 +0100 Subject: [PATCH 2/3] docs: release-notes: Fix fixed section in Bluetooth LE Fix 'fixed' section in Bluetooth LE. This commit adds a note that C2H ACL FC is now enabled by default. Signed-off-by: Pavel Vasilyev --- .../releases/release-notes-changelog.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index dd3296ebf7d0..f8a87cd114b3 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -130,8 +130,10 @@ Amazon Sidewalk Bluetooth® LE ------------- -* Fixed an issue where a flash operation executed on the system workqueue might result in ``-ETIMEDOUT``, if there is an active Bluetooth LE connection. -* Fixed an issue where Bluetooth applications built with the ``nordic-bt-rpc`` snippet (in the :ref:`ble_rpc` configuration) did not work on the nRF54H20 devices due to incorrect memory mapping. + * Fixed: + + * An issue where a flash operation executed on the system workqueue might result in ``-ETIMEDOUT``, if there is an active Bluetooth LE connection. + * An issue where Bluetooth applications built with the ``nordic-bt-rpc`` snippet (in the :ref:`ble_rpc` configuration) did not work on the nRF54H20 devices due to incorrect memory mapping. Bluetooth Mesh -------------- From 1067af7ecb5285f7d560ecf273d262fb1e71cd64 Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Tue, 18 Feb 2025 09:34:19 +0100 Subject: [PATCH 3/3] docs: release-notes: Add note about enabled C2H ACL FC by default This commit adds a note that C2H ACL FC is now enabled by default. Signed-off-by: Pavel Vasilyev --- .../releases_and_maturity/releases/release-notes-changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index f8a87cd114b3..7c0aa9630ca3 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -135,6 +135,8 @@ Bluetooth® LE * An issue where a flash operation executed on the system workqueue might result in ``-ETIMEDOUT``, if there is an active Bluetooth LE connection. * An issue where Bluetooth applications built with the ``nordic-bt-rpc`` snippet (in the :ref:`ble_rpc` configuration) did not work on the nRF54H20 devices due to incorrect memory mapping. + * Updated the :kconfig:option:`CONFIG_BT_HCI_ACL_FLOW_CONTROL` Kconfig option to be enabled by default to mitigate the risk of potential deadlocks in the Bluetooth Host. + Bluetooth Mesh --------------