nrf_802154: rev 642a884302def68f4d89cc33af535a8d1abeb393

This commit updates revision of the nrf_802154 component.

Signed-off-by: Rafal Kuznia <[email protected]>

Author: e-rk

nrf_802154/doc/multiprotocol_switching_tables.rst

@@ -35,17 +35,17 @@ Multiprotocol radio switching time comparison by device family
 +--------------------+---------------------+-----------------+-----------------+------------------+
 | Bluetooth activity |      Direction      | nRF52 mean [µs] | nRF53 mean [µs] | nRF54L mean [µs] |
 +====================+=====================+=================+=================+==================+
-|   advertisement    | 802.15.4→Bluetooth  |       324       |       346       |       268        |
+|   advertisement    | 802.15.4→Bluetooth  |       324       |       336       |       268        |
 +--------------------+---------------------+-----------------+-----------------+------------------+
-|   advertisement    | Bluetooth→802.15.4  |       289       |       335       |       172        |
+|   advertisement    | Bluetooth→802.15.4  |       289       |       330       |       172        |
 +--------------------+---------------------+-----------------+-----------------+------------------+
-|      scanning      | 802.15.4→Bluetooth  |       303       |       315       |       256        |
+|      scanning      | 802.15.4→Bluetooth  |       303       |       313       |       256        |
 +--------------------+---------------------+-----------------+-----------------+------------------+
-|      scanning      | Bluetooth→802.15.4  |       234       |       292       |       150        |
+|      scanning      | Bluetooth→802.15.4  |       234       |       294       |       150        |
 +--------------------+---------------------+-----------------+-----------------+------------------+
-|     connection     | 802.15.4→Bluetooth  |       386       |       388       |       348        |
+|     connection     | 802.15.4→Bluetooth  |       386       |       408       |       348        |
 +--------------------+---------------------+-----------------+-----------------+------------------+
-|     connection     | Bluetooth→802.15.4  |       333       |       398       |       211        |
+|     connection     | Bluetooth→802.15.4  |       333       |       391       |       211        |
 +--------------------+---------------------+-----------------+-----------------+------------------+
 
 Multiprotocol radio switching time measurements by device family
@@ -78,17 +78,17 @@ nRF53 family
 +--------------------+---------------------+---------------------------------+
 | Bluetooth activity |      Direction      | Timings (min | mean | max) [µs] |
 +====================+=====================+=================================+
-|   advertisement    | 802.15.4→Bluetooth  |         320 | 346 | 505         |
+|   advertisement    | 802.15.4→Bluetooth  |         319 | 336 | 395         |
 +--------------------+---------------------+---------------------------------+
-|   advertisement    | Bluetooth→802.15.4  |         324 | 335 | 352         |
+|   advertisement    | Bluetooth→802.15.4  |         314 | 330 | 345         |
 +--------------------+---------------------+---------------------------------+
-|      scanning      | 802.15.4→Bluetooth  |         298 | 315 | 328         |
+|      scanning      | 802.15.4→Bluetooth  |         298 | 313 | 327         |
 +--------------------+---------------------+---------------------------------+
-|      scanning      | Bluetooth→802.15.4  |         290 | 292 | 305         |
+|      scanning      | Bluetooth→802.15.4  |         292 | 294 | 302         |
 +--------------------+---------------------+---------------------------------+
-|     connection     | 802.15.4→Bluetooth  |         375 | 388 | 401         |
+|     connection     | 802.15.4→Bluetooth  |         395 | 408 | 421         |
 +--------------------+---------------------+---------------------------------+
-|     connection     | Bluetooth→802.15.4  |         379 | 398 | 418         |
+|     connection     | Bluetooth→802.15.4  |         373 | 391 | 404         |
 +--------------------+---------------------+---------------------------------+
 
 

nrf_802154/driver/CMakeLists.txt

@@ -56,7 +56,6 @@ target_sources(nrf-802154-driver
     src/nrf_802154_notification_direct.c
     src/nrf_802154_notification_swi.c
     src/nrf_802154_pib.c
-    src/nrf_802154_peripherals_alloc.c
     src/nrf_802154_queue.c
     src/nrf_802154_request_direct.c
     src/nrf_802154_request_swi.c
@@ -70,6 +69,7 @@ target_sources(nrf-802154-driver
     src/nrf_802154_tx_work_buffer.c
     src/nrf_802154_tx_power.c
     src/mac_features/nrf_802154_csma_ca.c
+    src/mac_features/nrf_802154_csma_ca_backoff.c
     src/mac_features/nrf_802154_delayed_trx.c
     src/mac_features/nrf_802154_filter.c
     src/mac_features/nrf_802154_frame_parser.c

nrf_802154/driver/src/mac_features/nrf_802154_csma_ca.c

@@ -56,7 +56,7 @@
 #include "nrf_802154_request.h"
 #include "nrf_802154_tx_power.h"
 #include "nrf_802154_stats.h"
-#include "platform/nrf_802154_random.h"
+#include "nrf_802154_csma_ca_backoff.h"
 #include "rsch/nrf_802154_rsch.h"
 #include "nrf_802154_sl_timer.h"
 #include "nrf_802154_sl_atomics.h"
@@ -136,14 +136,12 @@ static void priority_leverage(void)
                                        NRF_802154_COEX_TX_REQUEST_MODE_CCA_START);
 
     // Leverage priority only after the first backoff in the specified Coex TX request mode
-    if (first_transmit_attempt && coex_requires_boosted_prio)
+    // It should always be possible to update this timeslot's priority here
+    if (first_transmit_attempt && coex_requires_boosted_prio &&
+        !nrf_802154_rsch_delayed_timeslot_priority_update(NRF_802154_RESERVED_CSMACA_ID,
+                                                          RSCH_PRIO_TX))
     {
-        // It should always be possible to update this timeslot's priority here
-        if (!nrf_802154_rsch_delayed_timeslot_priority_update(NRF_802154_RESERVED_CSMACA_ID,
-                                                              RSCH_PRIO_TX))
-        {
-            NRF_802154_ASSERT(false);
-        }
+        NRF_802154_ASSERT(false);
     }
 
     nrf_802154_log_function_exit(NRF_802154_LOG_VERBOSITY_HIGH);
@@ -211,59 +209,14 @@ static void frame_transmit(rsch_dly_ts_id_t dly_ts_id)
     nrf_802154_log_function_exit(NRF_802154_LOG_VERBOSITY_LOW);
 }
 
-/**
- * @brief Calculates number of backoff periods as random value according to IEEE Std. 802.15.4.
- */
-static uint8_t backoff_periods_calc_random(void)
-{
-    return nrf_802154_random_get() % (1U << m_be);
-}
-
-/**
- * @brief Calculates number of backoff periods to wait before the next CCA attempt of CSMA/CA
- *
- * @return Number of backoff periods
- */
-static uint8_t backoff_periods_calc(void)
-{
-    uint8_t result;
-
-#if NRF_802154_TEST_MODES_ENABLED
-
-    switch (nrf_802154_pib_test_mode_csmaca_backoff_get())
-    {
-        case NRF_802154_TEST_MODE_CSMACA_BACKOFF_RANDOM:
-            result = backoff_periods_calc_random();
-            break;
-
-        case NRF_802154_TEST_MODE_CSMACA_BACKOFF_ALWAYS_MAX:
-            result = (1U << m_be) - 1U;
-            break;
-
-        case NRF_802154_TEST_MODE_CSMACA_BACKOFF_ALWAYS_MIN:
-            result = 0U;
-            break;
-
-        default:
-            result = backoff_periods_calc_random();
-            NRF_802154_ASSERT(false);
-            break;
-    }
-#else
-    result = backoff_periods_calc_random();
-#endif
-
-    return result;
-}
-
 /**
  * @brief Delay CCA procedure for random (2^BE - 1) unit backoff periods.
  */
 static void random_backoff_start(void)
 {
     nrf_802154_log_function_enter(NRF_802154_LOG_VERBOSITY_HIGH);
 
-    uint64_t backoff_us = backoff_periods_calc() * UNIT_BACKOFF_PERIOD;
+    uint64_t backoff_us = nrf_802154_csma_ca_backoff_periods_get(m_be) * UNIT_BACKOFF_PERIOD;
 
     rsch_dly_ts_param_t backoff_ts_param =
     {
@@ -492,4 +445,21 @@ static void csma_ca_tx_done(uint8_t                                   * p_frame,
     nrf_802154_log_function_exit(NRF_802154_LOG_VERBOSITY_LOW);
 }
 
+#ifdef TEST
+void nrf_802154_csma_ca_module_reset(void)
+{
+    m_state      = CSMA_CA_STATE_IDLE;
+    m_nb         = 0;
+    m_be         = 0;
+    m_frame      = (nrf_802154_frame_t){0};
+    m_data_props = (nrf_802154_transmitted_frame_props_t){0};
+    m_tx_channel = 0;
+#if NRF_802154_TX_TIMESTAMP_PROVIDER_ENABLED
+    m_tx_timestamp_encode = false;
+#endif
+    m_state = CSMA_CA_STATE_IDLE;
+}
+
+#endif // TEST
+
 #endif // NRF_802154_CSMA_CA_ENABLED

nrf_802154/driver/src/mac_features/nrf_802154_csma_ca_backoff.c

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2025, Nordic Semiconductor ASA
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * 3. Neither the name of Nordic Semiconductor ASA nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "nrf_802154_config.h"
+
+#if NRF_802154_CSMA_CA_ENABLED
+#include "nrf_802154_compiler.h"
+#include "platform/nrf_802154_random.h"
+#if NRF_802154_TEST_MODES_ENABLED
+#include "nrf_802154_pib.h"
+#endif
+#include "nrf_802154_csma_ca_backoff.h"
+
+static inline uint8_t backoff_periods_get_random(uint8_t be)
+{
+    return (uint8_t)(nrf_802154_random_get() % (1U << be));
+}
+
+uint8_t nrf_802154_csma_ca_backoff_periods_get(uint8_t be)
+{
+    uint8_t result;
+
+#if NRF_802154_TEST_MODES_ENABLED
+
+    switch (nrf_802154_pib_test_mode_csmaca_backoff_get())
+    {
+        case NRF_802154_TEST_MODE_CSMACA_BACKOFF_ALWAYS_MAX:
+            result = (1U << be) - 1U;
+            break;
+
+        case NRF_802154_TEST_MODE_CSMACA_BACKOFF_ALWAYS_MIN:
+            result = 0U;
+            break;
+
+        case NRF_802154_TEST_MODE_CSMACA_BACKOFF_RANDOM:
+            SWITCH_CASE_FALLTHROUGH;
+
+        default:
+            result = backoff_periods_get_random(be);
+            break;
+    }
+#else
+    result = backoff_periods_get_random(be);
+#endif
+
+    return result;
+}
+
+#endif // NRF_802154_CSMA_CA_ENABLED

nrf_802154/driver/src/nrf_802154_peripherals_alloc.c renamed to nrf_802154/driver/src/mac_features/nrf_802154_csma_ca_backoff.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Nordic Semiconductor ASA
+ * Copyright (c) 2025, Nordic Semiconductor ASA
  * All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
@@ -32,46 +32,37 @@
  *
  */
 
-/**
- * @file
- *   This file supplies bitmasks specifying which of the peripherals are used
- *   by the 802.15.4 driver.
- *
- * Bitmasks currently provided applies to:
- *   - PPI or DPPI channels (g_nrf_802154_used_nrf_ppi_channels)
- *   - PPI or DPPI channel groups (g_nrf_802154_used_nrf_ppi_groups)
- */
-
-#include "nrf_802154_peripherals.h"
+#ifndef NRF_802154_CSMA_CA_BACKOFF_H__
+#define NRF_802154_CSMA_CA_BACKOFF_H__
 
+#include <stdbool.h>
 #include <stdint.h>
 
-#if NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL
-/* Obtaining the MPSL_RESERVED_.. macros */
-#include "mpsl.h"
-#endif
-
-#if defined(PPI_PRESENT)
-#define NRF_802154_PPI_CH_USED_MSK NRF_802154_PPI_CHANNELS_USED_MASK
-#define NRF_802154_PPI_GR_USED_MSK NRF_802154_PPI_GROUPS_USED_MASK
-#elif defined(DPPI_PRESENT)
-#define NRF_802154_PPI_CH_USED_MSK NRF_802154_DPPI_CHANNELS_USED_MASK
-#define NRF_802154_PPI_GR_USED_MSK NRF_802154_DPPI_GROUPS_USED_MASK
-#else
-#error Unsupported chip family
-#endif
-
-const uint32_t g_nrf_802154_used_nrf_ppi_channels = NRF_802154_PPI_CH_USED_MSK;
-const uint32_t g_nrf_802154_used_nrf_ppi_groups = NRF_802154_PPI_GR_USED_MSK;
-
-#if NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL
+/**
+ * @defgroup nrf_802154_csma_ca_backoff 802.15.4 driver CSMA-CA support
+ * @{
+ * @ingroup nrf_802154_csma_ca
+ * @brief CSMA-CA procedure.
+ */
 
-#if ((NRF_802154_PPI_CH_USED_MSK & MPSL_RESERVED_PPI_CHANNELS) != 0UL)
-#error PPI channels for 802.15.4 driver overlap with MPSL channels
-#endif
+/** @brief Gets the number of backoff periods to wait before the next CCA attempt of CSMA/CA.
+ *
+ * When test modes are not enabled, the number of backoff periods is a random value in the range
+ * from 0 to (2^BE - 1), where BE is the current backoff exponent, as defined in IEEE Std. 802.15.4.
+ *
+ * When test modes are enabled the returned value depends on the value returned by
+ * @c nrf_802154_pib_test_mode_csmaca_backoff_get .
+ *
+ * @note Consecutive calls to this function may return different values.
+ *
+ * @param[in] be Backoff Exponent. Allowed range 0...8.
+ *
+ * @return Number of backoff periods to wait before the next CCA attempt
+ */
+uint8_t nrf_802154_csma_ca_backoff_periods_get(uint8_t be);
 
-#if ((NRF_802154_PPI_GR_USED_MSK & MPSL_RESERVED_PPI_GROUPS) != 0UL)
-#error PPI groups for 802.15.4 driver overlap with MPSL groups
-#endif
+/**
+ *@}
+ **/
 
-#endif // NRF_802154_VERIFY_PERIPHS_ALLOC_AGAINST_MPSL
+#endif // NRF_802154_CSMA_CA_BACKOFF_H__

nrf_802154/driver/src/mac_features/nrf_802154_filter.c

@@ -393,12 +393,9 @@ static nrf_802154_rx_error_t dst_addr_check(const nrf_802154_frame_t * p_frame_d
     const uint8_t * p_dst_addr  = nrf_802154_frame_dst_addr_get(p_frame_data);
     uint8_t         frame_type  = nrf_802154_frame_type_get(p_frame_data);
 
-    if (p_dst_panid != NULL)
+    if (p_dst_panid != NULL && !dst_pan_id_check(p_dst_panid, frame_type))
     {
-        if (!dst_pan_id_check(p_dst_panid, frame_type))
-        {
-            return NRF_802154_RX_ERROR_INVALID_DEST_ADDR;
-        }
+        return NRF_802154_RX_ERROR_INVALID_DEST_ADDR;
     }
 
     uint8_t dst_addr_size =