Skip to content

Conversation

@Frodevan
Copy link
Contributor

@Frodevan Frodevan commented Nov 20, 2025

Test pull-request, to test existing PR with the VCS changes on top

SebastianBoe and others added 30 commits October 24, 2025 15:55
…nt device transition"

This reverts commit 5696f6b.

Signed-off-by: Sebastian Bøe <[email protected]>
…ROTECT"

This reverts commit 5d60e58.

Signed-off-by: Sebastian Bøe <[email protected]>
…ARY.PROTECTEDMEM"

This reverts commit 9f2450f.

Signed-off-by: Sebastian Bøe <[email protected]>
…ARY.TRIGGER"

This reverts commit 6c9b26c.

Signed-off-by: Sebastian Bøe <[email protected]>
Add support for UICR.WDTSTART.

UICR.WDTSTART configures the automatic start of a local watchdog timer
before the application core is booted. This provides early system
protection ensuring that the system can recover from early boot
failures.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit af32ebd)
Add support for UICR.SECONDARY.TRIGGER configuration, which enables
automatic booting of secondary firmware based on specific reset reasons.

This introduces Kconfig options for configuring:
- UICR.SECONDARY.TRIGGER.ENABLE - Enable/disable automatic triggers
- UICR.SECONDARY.TRIGGER.RESETREAS - Bitmask of reset reasons that
  trigger secondary firmware boot

Individual Kconfig options are provided for each reset reason:
- APPLICATIONWDT0/1 - Application core watchdog timeouts
- APPLICATIONLOCKUP - Application core CPU lockup
- RADIOCOREWDT0/1 - Radio core watchdog timeouts
- RADIOCORELOCKUP - Radio core CPU lockup

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 9dc2b61)
…ECTEDMEM

Add support for UICR.SECONDARY.PROTECTEDMEM configuration, which enables
configuration of the protected memory region for secondary firmware.

This introduces Kconfig options for configuring:
- GEN_UICR_SECONDARY_PROTECTEDMEM - Enable/disable protected memory
  for secondary firmware
- GEN_UICR_SECONDARY_PROTECTEDMEM_SIZE_BYTES - Size of the protected
  memory region in bytes

The implementation validates that the configured size is divisible by
4096 bytes (4 KiB) as required by the hardware, and converts it to
4 KiB units when writing to UICR.SECONDARY.PROTECTEDMEM.SIZE4KB.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit c3f6b8c)
Add support for UICR.LOCK configuration, which locks the entire UICR
configuration in NVR0 to prevent unauthorized modifications.

This introduces a Kconfig option GEN_UICR_LOCK that enables locking
of the UICR. Once locked, the UICR can only be modified by performing
an ERASEALL operation.

This is a critical security feature for production devices, typically
enabled alongside UICR.APPROTECT, UICR.PROTECTEDMEM, and
UICR.ERASEPROTECT to establish a complete device protection scheme.

When enabled, the gen_uicr.py script sets UICR.LOCK to 0xFFFFFFFF,
which configures the NVR0 page as read-only and enforces integrity
checks on the UICR content.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 1ffdf09)
Add support for UICR.ERASEPROTECT configuration, which blocks ERASEALL
operations to prevent bulk erasure of protected memory.

This introduces a Kconfig option GEN_UICR_ERASEPROTECT that enables
blocking of ERASEALL operations on NVR0, preserving UICR settings even
if an attacker attempts a full-chip erase.

This is a critical security feature for production devices. When enabled
together with UICR.LOCK, it becomes impossible to modify the UICR in
any way, establishing a permanent device protection scheme. Due to this
irreversibility, it should only be enabled during the final stages of
production.

When enabled, the gen_uicr.py script sets UICR.ERASEPROTECT to
0xFFFFFFFF, which prevents the ERASEALL command from affecting the
NVR0 page.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit e20352d)
Add support for UICR.APPROTECT configuration, which controls debugger
and access-port permissions through the TAMPC peripheral.

This introduces three Kconfig options that allow independent control
over access port protection for different processor domains:

- GEN_UICR_APPROTECT_APPLICATION_PROTECTED: Controls debug access to
  the application domain processor
- GEN_UICR_APPROTECT_RADIOCORE_PROTECTED: Controls debug access to
  the radio core processor
- GEN_UICR_APPROTECT_CORESIGHT_PROTECTED: Controls access to the
  CoreSight debug infrastructure

When enabled, each option sets the corresponding UICR.APPROTECT
register to PROTECTED (0xFFFFFFFF), which disables debug access for
that domain. When disabled, the registers remain at their erased value
(UNPROTECTED), allowing full debug access.

This feature is critical for production devices where debug access must
be restricted to prevent unauthorized access to sensitive code and data.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 1438f8a)
…e transition

Add --permit-permanently-transitioning-device-to-deployed safety flag
to gen_uicr.py, required when enabling both UICR.LOCK and
UICR.ERASEPROTECT together. This prevents accidental permanent locking
of devices since this combination makes the configuration irreversible.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 35b89ab)
…DEF's

Add missing gen_uicr UNDEF's.

Signed-off-by: Sebastian Bøe <[email protected]>
(cherry picked from commit 8e59980)
…ode for all ICs

Until now, for historical reasons (see
f42cef9 and
58e0e31), the use of the --erase-mode
command-line switch was reserved for the nRF54L family. But in fact this
can be used (instead of --erase) for any of the Nordic ICs. This patch
extends the usage of this switch regardless of family.

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit 146fd2c)
In order to allow for users to invoke "west flash" without actual
hardware connected but still running the logic and pregeneration of
commands, specifically the json file.

Signed-off-by: Carles Cufi <[email protected]>
(cherry picked from commit 0679c05)
Removing the deprecated kconfigs for nrf54h20 target.

Signed-off-by: alperen sener <[email protected]>
Instantiate NRF_PLATFORM_LUMOS for all nrf lumos product,
Add NRF_SKIP_CLOCK_CONFIG kconfig to be a general kconfig
in nordic soc Kconfig, so that it can be used by other
lumos product.

Signed-off-by: Travis Lam <[email protected]>
(cherry picked from commit 0042c1d)
Factor out UDC_DWC2 dependency.

Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit 0018e8d)
…RF54LM20A SoC

Kconfig option UDC_DWC2_USBHS_VBUS_READY_TIMEOUT depends on services
exclusively available for nRF54H20, but the option can also be used for
nRF54LM20A, where there are no service dependencies, and VREG can be
accessed by the driver directly. Let depend the option on the SOC
series, as the controller can be used by the different CPUs on the SOC.

Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit 4fe2c5b)
…n Kconfig.dwc2

This is a follow up to commit 4fe2c5b.

The UDC_DWC2_USBHS_VBUS_READY_TIMEOUT Kconfig option should be available
also for nRF92 Series SoCs (as it was previously when it depended on
NRFS_HAS_VBUS_DETECTOR_SERVICE), otherwise some builds will fail for
such targets.

Signed-off-by: Andrzej Głąbek <[email protected]>
(cherry picked from commit 6360c7f)
…esets

Do not queue new buffer after bus reset if there is one already queued.
This fixes memory leak on each bus reset if there are no SETUP transfers
received between resets.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit c180420)
Fix the check in dwc2_unset_dedicated_fifo() that wrongly included the
current endpoint when testing for higher FIFOs. This caused false
warnings and early returns.

Use ~BIT_MASK(ep_idx + 1) to only test FIFOs above the current EP.

Signed-off-by: Sylvio Alves <[email protected]>
(cherry picked from commit 7c1193c)
It is possible for usbd_disable() to be called when the core is
hibernated. When done so, the USB stack will attempt to deactivate all
the endpoints. Because the core is hibernated, register reads are
really undefined. This can lead to udc_dwc2_ep_deactivate() not calling
udc_dwc2_ep_disable() which will leave struct udc_ep_config busy flag
set.

When endpoint 0x00 busy flag is left to true, the driver won't allocate
buffer to receive SETUP data which is mandatory in Buffer DMA mode. This
leads to essentially dead device after reconnect, because the device
will not respond to any control transfers.

Solve the issue by modifying backup register value instead of real one
when endpoint is deactivated while core is hibernated.

Signed-off-by: Tomasz Moń <[email protected]>
(cherry picked from commit 35620e2)
…ice is registered

Do not register the device when the class instance has already been
initialised. Fail on initialization if no HID device is registered.

Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit c62575e)
…runtime

Allow to set input or output report polling period at runtime.

Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit bca0ce0)
…d at runtime

Add an example of how to set the polling period at runtime.

Signed-off-by: Johann Fischer <[email protected]>
(cherry picked from commit e295a38)
…HY_UPDATE=n

Fix inter-operability, when BT_PHY_UPDATE=n the feature bits
contained 2M and Coded PHY when Advertising Extensions where
enabled, and Central devices did not progress with any data
packet transfers when PHY_REQ was rejected as unknown PDU.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
(cherry picked from commit 15d3b57)
Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>
nordic-segl and others added 26 commits November 20, 2025 07:35
Enable pwm_gpio_loopback test on
nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 2a0b1d2)
…l15 NS

Enable temp_senor test on nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 8a01e8d)
Enable QDEC test on nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit e761ba1)
Enable adc_api test on nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 4689b29)
…nrf54l15 NS

Enable spi_controller_peripheral test on
nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 399c0a9)
…S formatting

Fix DTS overlay file formatting as requested by
the compliance check.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 3a7afe3)
…est overlays

Overlay files that modify test configuration shall be stored
in the main application directory.
There is no board with f.e. '1mhz' name.

Move test overlays from boards sub-direcotry to the main
application directory.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit c359c44)
…n nrf54l15 NS

Add DTS overlay required to pass the test.
Test filter is meet for nrf54l15 NS platform.
However, test fails due to missing node configuration.

Fix the counter test on nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 89723c1)
Add reqired empty line as indicated by the compliance check.
Add License header.
Add information about GPIO loopbacks used by the test.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 5501999)
…15 NS

Enable i2c_slave test on nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 55f9d2c)
Move DTS overlay files that modify test configuration
from boards sub-directory to the main application directory.
There is no 'i2c_speed_fast' board.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit cfe1ffa)
…rf54l15 NS

Enable wdt_basic_api test on nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 80a00b8)
Tests cases which needs to apply a single overlay file for testing
should not use snippets.

Cleanup the test case by reordering the snippet to be SoC specific and
adjust overlay selection using FILE_SUFFIX.

Signed-off-by: Torsten Rasmussen <[email protected]>
(cherry picked from commit bbfcaa2)
Add overlays required to run the gpio_loopback test on
nrf54l15dk/nrf54l15/cpuapp/ns platform.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 07d4577)
…P+PPR

Extend sample with possibility to use PPR core instead of Radio core.

Signed-off-by: Sebastian Głąb <[email protected]>
(cherry picked from commit 87d15bb)
…le implementation

Add implementation of `sys_clock_disable` function for GRTC timer.

Signed-off-by: Adam Kondraciuk <[email protected]>
(cherry picked from commit dfff593)
…em clock disabled

Extend the system off samples by adding an option to disable
the system clock. When the system clock is disabled additional
power savings can be observed.
After using the `sys_clock_disable()` function, the GRTC is
turned off making system time-related features unavailable.

Signed-off-by: Adam Kondraciuk <[email protected]>
(cherry picked from commit 127ba8d)
… set to NONE

This is a follow-up to commit d1abe40.

Function `qspi_wait_while_writing()` (and also `qspi_rdsr()` that is
called by it) is now always required for `qspi_erase()`, so it can no
longer be under `#if !IS_EQUAL(INST_0_QER, JESD216_DW15_QER_VAL_NONE)`.

Also definition of `dev_config` in `configure_chip()` needs to be moved,
as for QER set to NONE, it is not used and causes a compilation warning.

Add a test case that will ensure the driver can be built successfully
with `quad-enable-requirements = "NONE"`.

Signed-off-by: Andrzej Głąbek <[email protected]>
(cherry picked from commit 68fab5f)
Commit fixes the model rx handler.
Model can receive maximum access payload.
Test should be able fit maximum access payload and
its own header for serial communication.

Upstream PR #: 99576

Signed-off-by: Aleksandr Khromykh <[email protected]>
(cherry picked from commit b3b381b6473384d61bb777f57bcbf6e2577d92a4)
- We want to reuse ext_advs when first stopped and restarted
- This ensures SID is the same
- Fixes CAP/CL/ADV/BV-03-C

Signed-off-by: Alexander Svensen <[email protected]>
(cherry picked from commit 4896194)
…codec

- We want to add the ASE ID to a stream as early as possible
  to make sure the events coming from BTTester to Auto-PTS
  contains the correct information.
- Previously the events that came before stream_configured
  would contain ASE ID 0, regardless of actual value.

Signed-off-by: Alexander Svensen <[email protected]>
(cherry picked from commit c4ab06b)
- Allows the tester to match on either ID or addr
- Previously required that both needed to match, but Auto-PTS is sending
  the wrong address

Signed-off-by: Alexander Svensen <[email protected]>
(cherry picked from commit fa7d9bf)
This particular test-case requires bttester to respond with an OOB
procedure SIRK only error. To enable this response, the BTP command to
set SIRK mode has been extended with a new selection.

Signed-off-by: Frode van der Meeren <[email protected]>
(cherry picked from commit 03bfafe)
- When a bonded device is reconnected, check flags for pending
  notifications for:
 - Lock
 - SIRK
 - Size

Previously only lock was checked

Signed-off-by: Alexander Svensen <[email protected]>
(cherry picked from commit fa8c244)
- Add command for setting the set size
- Add command for setting the SIRK
- Allows the following tests to pass:
 - CSIS/SR/CN/BV-01-C
 - CSIS/SR/CN/BV-02-C
 - CSIS/SR/CN/BV-03-C
 - CSIS/SR/CN/BV-04-C

Signed-off-by: Alexander Svensen <[email protected]>
(cherry picked from commit 52f2686)
Zephyr automatically sets the persisted flag for VCS if the volume is
changed after the service is registered. As some of these PTS tests
require a set volume with the flag cleared, the initial volume needs to
be set before registering VCS.

(cherry picked from commit 48f82d1)

Signed-off-by: Frode van der Meeren <[email protected]>
NordicBuilder added a commit to NordicBuilder/sdk-nrf that referenced this pull request Nov 20, 2025
Automatically created by action-manifest-pr GH action from PR:
nrfconnect/sdk-zephyr#3521

Signed-off-by: Nordic Builder <[email protected]>
@Frodevan Frodevan closed this Nov 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.