softdevice_controller: rev 6ba8c6b2317f30c7f72c2b80808f2793f9294d77

CHANGELOG.rst contains the list of changes. Signed-off-by: Lang Xie <[email protected]>
nrfconnect · Nov 1, 2024 · caa929c · caa929c
1 parent eaf9b85
commit caa929c
Show file tree

Hide file tree

Showing 35 changed files with 76 additions and 43 deletions.
diff --git a/softdevice_controller/CHANGELOG.rst b/softdevice_controller/CHANGELOG.rst
@@ -40,6 +40,11 @@ Added
     * LE CS Test
     * LE CS Test End
 
+* The defines :c:macro:`SDC_PPI_CHANNELS_USED_MASK`, :c:macro:`SDC_DPPI_CHANNELS_USED_MASK`, :c:macro:`SDC_DPPIC10_CHANNELS_USED_MASK`, :c:macro:`SDC_DPPIC00_CHANNELS_USED_MASK`, :c:macro:`SDC_DPPIC020_CHANNELS_USED_MASK`, and :c:macro:`SDC_DPPIC030_CHANNELS_USED_MASK`.
+  These represent the PPI resources used in the SoftDevice Controller.
+* The defines :c:macro:`SDC_PPIB00_CHANNELS_USED_MASK`, :c:macro:`SDC_PPIB10_CHANNELS_USED_MASK`, :c:macro:`SDC_PPIB020_CHANNELS_USED_MASK`, and :c:macro:`SDC_PPIB030_CHANNELS_USED_MASK`.
+  These represent the PPIB resources used in the SoftDevice Controller.
+
 Changes
 =======
 
@@ -66,6 +71,8 @@ Changes
 * Generating the Number of Completed Packets event is now prioritized above all other events.
   The event is generated irrespective of the state of the Controller to Host data flow control. (DRGN-23284)
 * When a link disconnects, the controller will now raise one or more Number Of Completed Packets events for data packets not ACKed by the peer device. (DRGN-23302)
+* Isochronous roles may now produce HCI ISO data with SDUs containing the ``0b01`` packet status flag which indicates "possibly invalid data".
+  This is the case if the peer sends invalid data. (DRGN-23420)
 
 Bug fixes
 =========
@@ -111,6 +118,13 @@ Bug fixes
 * Fixed an issue where received unframed Isochronous SDUs were not reported to be a SDU interval apart.
   This could happen when the ISO interval is greater than the SDU interval and multiple SDUs can be received in a single ISO interval. (DRGN-23586)
 * Fixed an issue where the sleep clock accuracy communicated to the peer was too inaccurate if MPSL was initialized with a low frequency clock accuracy better than 20ppm. (DRGN-23693)
+* Fixed a rare issue in the controller that could lead to a bus fault. (DRGN-22036)
+
+  This could only happen when all of the following conditions were met:
+
+    * The host was too slow at pulling HCI events.
+    * One or more HCI events had been masked in the controller.
+    * The controller was raising ACL or ISO data to the host.
 
 nRF Connect SDK v2.7.0
 **********************

diff --git a/softdevice_controller/doc/softdevice_controller.rst b/softdevice_controller/doc/softdevice_controller.rst
@@ -41,22 +41,23 @@ For the nRF53 Series:
 * ``CCM``
 * ``AAR``
 * ``NVMC``
-* ``DPPI`` channels from ``0`` to ``12``
+* ``DPPI`` channels from ``3`` to ``12``
 
 For the nRF54H Series:
 
 * ``CCM030``
 * ``AAR030``
-* ``DPPIC020`` channels from ``0`` to ``11``
-* ``PPIB020`` channels from ``0`` to ``3``
+* ``DPPIC020`` channels from ``1`` to ``11``
+* ``DPPIC030`` channels ``1`` and ``3``
 * ``PPIB030`` channels from ``0`` to ``3``
 
 For the nRF54L Series:
 
 * ``CCM00``
 * ``AAR00``
 * ``RRAMC``
-* ``DPPIC10`` channels from ``0`` to ``11``
+* ``DPPIC10`` channels from ``1`` to ``11``
+* ``DPPIC00`` channels ``1`` and ``3``
 * ``PPIB00`` channels from ``0`` to ``3``
 * ``PPIB10`` channels from ``0`` to ``3``
 

diff --git a/softdevice_controller/include/sdc_soc.h b/softdevice_controller/include/sdc_soc.h
@@ -30,6 +30,24 @@ extern "C" {
 #include <stdbool.h>
 #include "nrf_errno.h"
 
+#if defined(NRF52_SERIES)
+  /* PPI channels 17 - 31, for the nRF52 Series */
+  #define SDC_PPI_CHANNELS_USED_MASK      (0xfffe0000)
+#elif defined(NRF53_SERIES)
+  /* PPI channels 3 - 12, for the nRF53 Series */
+  #define SDC_DPPI_CHANNELS_USED_MASK     (0x00001ff8)
+#elif defined(NRF54L_SERIES)
+  #define SDC_DPPIC10_CHANNELS_USED_MASK  (0x00000ffe)
+  #define SDC_DPPIC00_CHANNELS_USED_MASK  (0x0000000a)
+  #define SDC_PPIB00_CHANNELS_USED_MASK   (0x0000000f)
+  #define SDC_PPIB10_CHANNELS_USED_MASK   (0x0000000f)
+#elif defined(NRF54H) || defined(GRTC_PRESENT)
+  #define SDC_DPPIC020_CHANNELS_USED_MASK (0x00000ffe)
+  #define SDC_DPPIC030_CHANNELS_USED_MASK (0x0000000a)
+  #define SDC_PPIB020_CHANNELS_USED_MASK  (0x0000000f)
+  #define SDC_PPIB030_CHANNELS_USED_MASK  (0x0000000f)
+#endif
+
 /**
  * @brief Functions used by the SoftDevice Controller to obtain random numbers.
  *

diff --git a/softdevice_controller/lib/nrf52/hard-float/libsoftdevice_controller_central.a b/softdevice_controller/lib/nrf52/hard-float/libsoftdevice_controller_central.a
diff --git a/softdevice_controller/lib/nrf52/hard-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf52/hard-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf52/hard-float/libsoftdevice_controller_peripheral.a b/softdevice_controller/lib/nrf52/hard-float/libsoftdevice_controller_peripheral.a
diff --git a/softdevice_controller/lib/nrf52/hard-float/manifest.yaml b/softdevice_controller/lib/nrf52/hard-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x103A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x1042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:22:10Z'
+timestamp: '2024-11-01T12:27:19Z'
diff --git a/softdevice_controller/lib/nrf52/soft-float/libsoftdevice_controller_central.a b/softdevice_controller/lib/nrf52/soft-float/libsoftdevice_controller_central.a
diff --git a/softdevice_controller/lib/nrf52/soft-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf52/soft-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf52/soft-float/libsoftdevice_controller_peripheral.a b/softdevice_controller/lib/nrf52/soft-float/libsoftdevice_controller_peripheral.a
diff --git a/softdevice_controller/lib/nrf52/soft-float/manifest.yaml b/softdevice_controller/lib/nrf52/soft-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x103A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x1042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:22:10Z'
+timestamp: '2024-11-01T12:27:19Z'
diff --git a/softdevice_controller/lib/nrf52/softfp-float/libsoftdevice_controller_central.a b/softdevice_controller/lib/nrf52/softfp-float/libsoftdevice_controller_central.a
diff --git a/softdevice_controller/lib/nrf52/softfp-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf52/softfp-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf52/softfp-float/libsoftdevice_controller_peripheral.a b/softdevice_controller/lib/nrf52/softfp-float/libsoftdevice_controller_peripheral.a
diff --git a/softdevice_controller/lib/nrf52/softfp-float/manifest.yaml b/softdevice_controller/lib/nrf52/softfp-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x103A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x1042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:22:10Z'
+timestamp: '2024-11-01T12:27:19Z'
diff --git a/softdevice_controller/lib/nrf53/soft-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf53/soft-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf53/soft-float/manifest.yaml b/softdevice_controller/lib/nrf53/soft-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x203A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x2042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:23:29Z'
+timestamp: '2024-11-01T12:28:21Z'
diff --git a/softdevice_controller/lib/nrf54h/hard-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54h/hard-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54h/hard-float/manifest.yaml b/softdevice_controller/lib/nrf54h/hard-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x403A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x4042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:24:20Z'
+timestamp: '2024-11-01T12:29:20Z'
diff --git a/softdevice_controller/lib/nrf54h/soft-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54h/soft-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54h/soft-float/manifest.yaml b/softdevice_controller/lib/nrf54h/soft-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x403A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x4042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:24:20Z'
+timestamp: '2024-11-01T12:29:20Z'
diff --git a/softdevice_controller/lib/nrf54h/softfp-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54h/softfp-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54h/softfp-float/manifest.yaml b/softdevice_controller/lib/nrf54h/softfp-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x403A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x4042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:24:20Z'
+timestamp: '2024-11-01T12:29:20Z'
diff --git a/softdevice_controller/lib/nrf54l/hard-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54l/hard-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54l/hard-float/manifest.yaml b/softdevice_controller/lib/nrf54l/hard-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x303A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x3042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:25:38Z'
+timestamp: '2024-11-01T12:31:02Z'
diff --git a/softdevice_controller/lib/nrf54l/soft-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54l/soft-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54l/soft-float/manifest.yaml b/softdevice_controller/lib/nrf54l/soft-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x303A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x3042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:25:38Z'
+timestamp: '2024-11-01T12:31:02Z'
diff --git a/softdevice_controller/lib/nrf54l/softfp-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54l/softfp-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54l/softfp-float/manifest.yaml b/softdevice_controller/lib/nrf54l/softfp-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x303A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x3042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:25:38Z'
+timestamp: '2024-11-01T12:31:02Z'
diff --git a/softdevice_controller/lib/nrf54l_ns/hard-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54l_ns/hard-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54l_ns/hard-float/manifest.yaml b/softdevice_controller/lib/nrf54l_ns/hard-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x303A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x3042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:26:56Z'
+timestamp: '2024-11-01T12:32:17Z'
diff --git a/softdevice_controller/lib/nrf54l_ns/soft-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54l_ns/soft-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54l_ns/soft-float/manifest.yaml b/softdevice_controller/lib/nrf54l_ns/soft-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x303A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x3042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:26:56Z'
+timestamp: '2024-11-01T12:32:17Z'
diff --git a/softdevice_controller/lib/nrf54l_ns/softfp-float/libsoftdevice_controller_multirole.a b/softdevice_controller/lib/nrf54l_ns/softfp-float/libsoftdevice_controller_multirole.a
diff --git a/softdevice_controller/lib/nrf54l_ns/softfp-float/manifest.yaml b/softdevice_controller/lib/nrf54l_ns/softfp-float/manifest.yaml
@@ -1,5 +1,5 @@
 description: SoftDevice Controller
-git_revision: e0058308f89f3e728c341cda19092679d8e8285c
-ll_subversion_number: '0x303A'
+git_revision: 6ba8c6b2317f30c7f72c2b80808f2793f9294d77
+ll_subversion_number: '0x3042'
 ll_version_number: '0x0E'
-timestamp: '2024-10-24T10:26:56Z'
+timestamp: '2024-11-01T12:32:17Z'