Pull s2ram related commits #25230

nordic-segl · 2025-10-24T10:48:49Z

Pull in PM related commits that:

remove CONFIG_PM_S2RAM_CUSTOM_MARKING (CONFIG_HAS_PM_S2RAM_CUSTOM_MARKING is used instead),
set CONFIG_PM_S2RAM based on DTS,

on relevant SOCs.

Align samples and tests stored at sdk-nrf.

NordicBuilder · 2025-10-24T10:49:35Z

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff
zephyr	nrfconnect/sdk-zephyr@`25f7b90`	nrfconnect/sdk-zephyr@`cb89816` (`main`)	nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

NordicBuilder · 2025-10-24T11:07:03Z

CI Information

^{To view the history of this post, click the 'edited' button above}
Build number: 16

Inputs:

Sources:

sdk-nrf: PR head: 79de629b5931f7cc45934ceb1fb6005f1f17ff89
zephyr: PR head: cb89816c0dd67b9833d78bd55a04ff24a8edcc67

more details

sdk-nrf:

PR head: 79de629b5931f7cc45934ceb1fb6005f1f17ff89
merge base: e14a2eee2ba4caac2489d61cd6310ea7831ce875
target head (main): e14a2eee2ba4caac2489d61cd6310ea7831ce875
Diff

zephyr:

PR head: cb89816c0dd67b9833d78bd55a04ff24a8edcc67
merge base: 25f7b905665e488a00e66ed1335f1b46d87b53ef
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (98)

applications
│  ├── machine_learning
│  │  ├── configuration
│  │  │  ├── nrf54h20dk_nrf54h20_cpuapp
│  │  │  │  │ prj_release_singlecore.conf
│  │  │ sample.yaml
│  ├── nrf_desktop
│  │  ├── configuration
│  │  │  ├── nrf54h20dk_nrf54h20_cpuapp
│  │  │  │  ├── prj.conf
│  │  │  │  ├── prj_dongle.conf
│  │  │  │  ├── prj_release.conf
│  │  │  │  │ prj_release_dongle.conf
doc
│  ├── nrf
│  │  ├── app_dev
│  │  │  ├── device_guides
│  │  │  │  ├── nrf54h
│  │  │  │  │  │ ug_nrf54h20_pm_optimization.rst
samples
│  ├── bluetooth
│  │  ├── fast_pair
│  │  │  ├── locator_tag
│  │  │  │  ├── configuration
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  ├── caf_sensor_manager
│  │  │ sample.yaml
│  ├── zephyr
│  │  ├── boards
│  │  │  ├── nordic
│  │  │  │  ├── spis_wakeup
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── wakeup_trigger
│  │  │  │  │  │  │ prj.conf
tests
│  ├── benchmarks
│  │  ├── current_consumption
│  │  │  ├── beacon_idle
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  ├── lfrc_idle
│  │  │  │  │ prj.conf
│  │  │  ├── nfc_idle
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  ├── twim_suspend
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  ├── sysbuild
│  │  │  │  │  ├── vpr_launcher
│  │  │  │  │  │  │ prj.conf
│  │  │  ├── uart_console
│  │  │  │  │ prj.conf
│  │  │  ├── uarte_suspend
│  │  │  │  │ prj.conf
│  │  ├── multicore
│  │  │  ├── idle
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_adc
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── prj.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_clock_control
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── prj.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_comp
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── prj.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_counter
│  │  │  │  │ prj.conf
│  │  │  ├── idle_exmif
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── prj.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_flpr
│  │  │  │  │ prj_s2ram.conf
│  │  │  ├── idle_gpio
│  │  │  │  │ prj_s2ram.conf
│  │  │  ├── idle_grtc
│  │  │  │  │ vpr_launcher.conf
│  │  │  ├── idle_hpu_temp_meas
│  │  │  │  │ prj.conf
│  │  │  ├── idle_ipc
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── prj.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_outside_of_main
│  │  │  │  │ prj.conf
│  │  │  ├── idle_ppr
│  │  │  │  │ prj_s2ram.conf
│  │  │  ├── idle_pwm_led
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── prj_s2ram.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_pwm_loopback
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── prj_s2ram.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_spim
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── sysbuild
│  │  │  │  │  ├── vpr_launcher
│  │  │  │  │  │  │ prj.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_spim_loopback
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── prj_s2ram.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_stm
│  │  │  │  │ prj_s2ram.conf
│  │  │  ├── idle_twim
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── sysbuild
│  │  │  │  │  ├── vpr_launcher
│  │  │  │  │  │  │ prj.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_uarte
│  │  │  │  ├── coverage.conf
│  │  │  │  ├── disable_s2ram.overlay
│  │  │  │  ├── prj.conf
│  │  │  │  │ testcase.yaml
│  │  │  ├── idle_usb
│  │  │  │  │ prj.conf
│  │  │  ├── idle_wdt
│  │  │  │  │ prj_s2ram.conf
│  │  ├── peripheral_load
│  │  │  │ power_management.conf
│  │  ├── power_consumption
│  │  │  ├── adc
│  │  │  │  │ prj.conf
│  │  │  ├── flash
│  │  │  │  │ prj.conf
│  │  │  ├── gpio
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  ├── i2c
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  │  ├── sysbuild
│  │  │  │  │  ├── vpr_launcher
│  │  │  │  │  │  │ prj.conf
│  │  │  ├── lpcomp
│  │  │  │  │ prj.conf
│  │  │  ├── qdec
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  ├── spi
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  ├── temperature_sensor
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  │  │  ├── timer_waiting
│  │  │  │  │ prj.conf
│  │  │  ├── uart
│  │  │  │  ├── boards
│  │  │  │  │  │ nrf54h20dk_nrf54h20_cpuapp.conf
│  ├── drivers
│  │  ├── flash
│  │  │  ├── multicore_soc_flash
│  │  │  │  ├── prj.conf
│  │  │  │  ├── remote
│  │  │  │  │  │ prj.conf
│  ├── subsys
│  │  ├── ipc
│  │  │  ├── ipc_latency
│  │  │  │  │ testcase.yaml
west.yml
zephyr
│  ├── arch
│  │  ├── arm
│  │  │  ├── core
│  │  │  │  ├── cortex_m
│  │  │  │  │  │ pm_s2ram.c
│  ├── include
│  │  ├── zephyr
│  │  │  ├── arch
│  │  │  │  ├── common
│  │  │  │  │  │ pm_s2ram.h
│  ├── samples
│  │  ├── boards
│  │  │  ├── nordic
│  │  │  │  ├── spis_wakeup
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── wakeup_trigger
│  │  │  │  │  │  │ prj.conf
│  │  │  ├── st
│  │  │  │  ├── power_mgmt
│  │  │  │  │  ├── suspend_to_ram
│  │  │  │  │  │  │ prj.conf
│  ├── soc
│  │  ├── nordic
│  │  │  ├── nrf54h
│  │  │  │  ├── Kconfig
│  │  │  │  │ pm_s2ram.c
│  ├── subsys
│  │  ├── pm
│  │  │  │ Kconfig

Outputs:

Toolchain

Version: df3cc9d822
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:df3cc9d822_e595b21c39

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister
- sdk-nrf test count: 1912
- sdk-zephyr test count: 1289
✅ Integration tests
- ✅ test-sdk-audio
- ✅ desktop52_verification
- ✅ test-fw-nrfconnect-apps
- ✅ test-fw-nrfconnect-chip
- ✅ test-fw-nrfconnect-nfc
- ✅ test-fw-nrfconnect-nrf-iot_thingy91
- ✅ test-fw-nrfconnect-rs
- ✅ test-fw-nrfconnect-fem
- ✅ test-fw-nrfconnect-thread-main
- ✅ test-sdk-find-my
- ✅ test-low-level
- ✅ test-sdk-dfu
- ⚠️ test-fw-nrfconnect-nrf-iot_cloud

Disabled integration tests

- test-fw-nrfconnect-nrf_lrcs_positioning
- test_ble_nrf_config
- test-fw-nrfconnect-ble_mesh
- test-fw-nrfconnect-ble_samples
- test-fw-nrfconnect-nrf-iot_libmodem-nrf
- test-fw-nrfconnect-nrf-iot_lwm2m
- test-fw-nrfconnect-nrf-iot_samples
- test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- test-fw-nrfconnect-nrf_crypto
- test-fw-nrfconnect-ps-main
- test-fw-nrfconnect-rpc
- test-fw-nrfconnect-tfm
- test-sdk-mcuboot
- test-sdk-wifi
- test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

github-actions · 2025-10-24T11:41:23Z

You can find the documentation preview for this PR here.

Preview links for modified nRF Connect SDK documents:

https://ncsdoc.z6.web.core.windows.net/PR-25230/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.html

MarekPieta

Changes applied to our samples/apps looks good

FrancescoSer · 2025-11-03T12:41:33Z

doc/nrf/app_dev/device_guides/nrf54h/ug_nrf54h20_pm_optimization.rst

 =================================

 For the application running on the application core, setting the following Kconfig options is recommended:



Shouldnt this change also be mentioned in the changelog?

@bjarki-andreasen : Could You help me answer this question?

I discussed this offline with @bjarki-andreasen
Documentation is updated in #25218

Changelog and migration guide is still to be done.
@bjarki-andreasen agreed to take care of this.

Is it OK for You @FrancescoSer ?

Changes now part of the nrf54h20 doc updates 4749f5a

User selectable PM_S2RAM_CUSTOM_MARKING was removed. Instead, HAS_PM_S2RAM_CUSTOM_MARKING was defined and it's selected based on soc. Signed-off-by: Sebastian Głąb <[email protected]>

CONFIG_PM_S2RAM gets its value based on presence and state of the "suspend-to-ram" power state in the devicetree. Signed-off-by: Sebastian Głąb <[email protected]>

When coverage is calculated counter variables are added to the build. These counters fail when MCU enters/leaves S2RAM low power state. Fix disabling S2RAM in coverage test configurations. CONFIG_PM_S2RAM is no longer user selectable. PM_S2RAM is enabled when any s2ram power state with status "okay" is present in the devicetree. Therefore, use DTS overlay to set status "disabled" to s2ram node. Signed-off-by: Sebastian Głąb <[email protected]>

Include nrfconnect/sdk-zephyr#3448 Signed-off-by: Sebastian Głąb <[email protected]>

We want to run CI when Nordic specific arch, soc, or board changes are done. Running CI on such changes would have prevented that nrfconnect/sdk-nrf#25230 broke this CI plan. Signed-off-by: Rubin Gerritsen <[email protected]>

nordic-segl requested review from a team, FrancescoSer and adamkondraciuk as code owners October 24, 2025 10:48

NordicBuilder added doc-required PR must not be merged without tech writer approval. manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 24, 2025

NordicBuilder requested review from a team and carlescufi October 24, 2025 10:49

NordicBuilder added manifest-zephyr DNM labels Oct 24, 2025

nordic-segl mentioned this pull request Oct 24, 2025

manifest: sdk-zephyr: [nrf fromlist] samples: boards: nordic: spis_wakeup: Run sample on AP… #24909

Closed

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch from 39bec24 to fbf9073 Compare October 24, 2025 10:56

nordic-piks approved these changes Oct 24, 2025

View reviewed changes

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch from fbf9073 to 9887d54 Compare October 24, 2025 12:12

NordicBuilder requested review from a team October 24, 2025 12:12

bjarki-andreasen approved these changes Oct 24, 2025

View reviewed changes

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch from 9887d54 to 894d5a3 Compare October 27, 2025 06:20

NordicBuilder requested a review from a team October 27, 2025 06:21

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch 2 times, most recently from 5172167 to 8aa101a Compare October 27, 2025 08:07

MarekPieta approved these changes Oct 27, 2025

View reviewed changes

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch from 8aa101a to 585d0e7 Compare October 27, 2025 13:52

NordicBuilder requested a review from a team October 27, 2025 13:52

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch 3 times, most recently from 355a652 to a987038 Compare October 30, 2025 13:30

nordic-segl changed the title ~~Samples boards nordic spis wakeup run on ppr xip~~ Pull s2ram related commits Oct 30, 2025

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch from a987038 to 6b919af Compare November 3, 2025 09:22

FrancescoSer reviewed Nov 3, 2025

View reviewed changes

grochu approved these changes Nov 3, 2025

View reviewed changes

pdunaj approved these changes Nov 3, 2025

View reviewed changes

FrancescoSer approved these changes Nov 4, 2025

View reviewed changes

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch from 6b919af to b583b14 Compare November 4, 2025 11:14

umapraseeda approved these changes Nov 4, 2025

View reviewed changes

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch 2 times, most recently from 6b85fd8 to 0e5ad52 Compare November 5, 2025 09:38

NordicBuilder removed the DNM label Nov 5, 2025

nordic-segl added 4 commits November 5, 2025 10:53

applications: Remove use of PM_S2RAM_CUSTOM_MARKING

cb798e4

User selectable PM_S2RAM_CUSTOM_MARKING was removed. Instead, HAS_PM_S2RAM_CUSTOM_MARKING was defined and it's selected based on soc. Signed-off-by: Sebastian Głąb <[email protected]>

applications: Remove setting CONFIG_PM_S2RAM=y

010728f

CONFIG_PM_S2RAM gets its value based on presence and state of the "suspend-to-ram" power state in the devicetree. Signed-off-by: Sebastian Głąb <[email protected]>

manifest: update sdk-zephyr

79de629

Include nrfconnect/sdk-zephyr#3448 Signed-off-by: Sebastian Głąb <[email protected]>

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch from 0e5ad52 to 79de629 Compare November 5, 2025 09:54

nordicjm merged commit 8ffef07 into nrfconnect:main Nov 5, 2025
20 checks passed

nordic-segl deleted the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch November 5, 2025 12:42

rugeGerritsen mentioned this pull request Nov 5, 2025

[nrf noup] Extend test spec for CI-ble-test nrfconnect/sdk-zephyr#3471

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Pull s2ram related commits #25230

Pull s2ram related commits #25230

Uh oh!

nordic-segl commented Oct 24, 2025 •

edited

Loading

Uh oh!

NordicBuilder commented Oct 24, 2025 •

edited

Loading

Uh oh!

NordicBuilder commented Oct 24, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Oct 24, 2025 •

edited

Loading

Uh oh!

MarekPieta left a comment

Uh oh!

FrancescoSer Nov 3, 2025

Uh oh!

nordic-segl Nov 3, 2025

Uh oh!

nordic-segl Nov 4, 2025

Uh oh!

bjarki-andreasen Nov 4, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

		=================================

		For the application running on the application core, setting the following Kconfig options is recommended:

Pull s2ram related commits #25230

Pull s2ram related commits #25230

Uh oh!

Conversation

nordic-segl commented Oct 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NordicBuilder commented Oct 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NordicBuilder commented Oct 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

Uh oh!

github-actions bot commented Oct 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MarekPieta left a comment

Choose a reason for hiding this comment

Uh oh!

FrancescoSer Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

nordic-segl Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

nordic-segl Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

bjarki-andreasen Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

nordic-segl commented Oct 24, 2025 •

edited

Loading

NordicBuilder commented Oct 24, 2025 •

edited

Loading

NordicBuilder commented Oct 24, 2025 •

edited

Loading

github-actions bot commented Oct 24, 2025 •

edited

Loading