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@`be5d777`	nrfconnect/sdk-zephyr#3448	nrfconnect/sdk-zephyr#3448/files

⛔ DNM label due to: 1 project with PR revision

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: 10

Inputs:

Sources:

sdk-nrf: PR head: a9870381d41bb30f0d50c53115e33e16dc445d72
zephyr: PR head: f552eebcad306f643722af49c4414bbe3b23c511

more details

sdk-nrf:

PR head: a9870381d41bb30f0d50c53115e33e16dc445d72
merge base: b71a89d025adee93bd8c5dc4c04ebd266eae3e8b
target head (main): b71a89d025adee93bd8c5dc4c04ebd266eae3e8b
Diff

zephyr:

PR head: f552eebcad306f643722af49c4414bbe3b23c511
merge base: be5d7776dbb783b400dd92c6575c8f15f630b483
target head (main): c6dbf158a0b8c45beb78aa76412d99f60cd6467f
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 (111)

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
│  │  │  │  │ prj.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
│  ├── drivers
│  │  ├── wifi
│  │  │  ├── nrf_wifi
│  │  │  │  ├── Kconfig.nrfwifi
│  │  │  │  ├── inc
│  │  │  │  │  │ fmac_main.h
│  │  │  │  ├── off_raw_tx
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ off_raw_tx_api.c
│  │  │  │  ├── src
│  │  │  │  │  ├── debug_shell.c
│  │  │  │  │  ├── fmac_main.c
│  │  │  │  │  ├── fw_load.c
│  │  │  │  │  ├── net_if.c
│  │  │  │  │  ├── wifi_mgmt.c
│  │  │  │  │  ├── wifi_util.c
│  │  │  │  │  ├── wifi_util.h
│  │  │  │  │  │ wpa_supp_if.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
│  │  ├── ipc
│  │  │  ├── ipc_service
│  │  │  │  ├── lib
│  │  │  │  │  │ Kconfig.icmsg
│  │  ├── pm
│  │  │  │ Kconfig
│  │ west.yml

Outputs:

Toolchain

Version: cfa6b06338
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:cfa6b06338_e595b21c39

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

◻️ Toolchain - Skipped: existing toolchain is used
🟡 Build twister
- sdk-nrf test count: 34
- sdk-zephyr test count: 1516
🟠 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-rpc
- 🟠 test-fw-nrfconnect-rs
- 🟠 test-fw-nrfconnect-fem
- 🟠 test-fw-nrfconnect-thread-main
- 🟠 test-sdk-find-my
- 🟠 test-fw-nrfconnect-nrf_lrcs_positioning
- 🟠 test-low-level
- 🟠 test-sdk-dfu
- ⚠️ test-fw-nrfconnect-nrf-iot_cloud
- ⚠️ test-fw-nrfconnect-nrf_lrcs_mosh
- ⚠️ test-fw-nrfconnect-nrf_lrcs_positioning

Disabled integration tests

- 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_serial_lte_modem
- test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- test-fw-nrfconnect-nrf_crypto
- test-fw-nrfconnect-ps-main
- 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

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 <sebastian.glab@nordicsemi.no>

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 <sebastian.glab@nordicsemi.no>

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 <sebastian.glab@nordicsemi.no>

Include nrfconnect/sdk-zephyr#3448 Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>

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 2 times, most recently from d156a2a to 355a652 Compare October 29, 2025 06:55

nordic-segl added 4 commits October 30, 2025 14:29

applications: Remove use of PM_S2RAM_CUSTOM_MARKING

03b916f

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 <sebastian.glab@nordicsemi.no>

applications: Remove setting CONFIG_PM_S2RAM=y

96599a3

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 <sebastian.glab@nordicsemi.no>

manifest: update sdk-zephyr

a987038

Include nrfconnect/sdk-zephyr#3448 Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>

nordic-segl force-pushed the samples-boards-nordic-spis_wakeup-run-on-PPR-XIP branch 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

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

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

Uh oh!

MarekPieta left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Pull s2ram related commits #25230

Are you sure you want to change the base?

Pull s2ram related commits #25230

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

Uh oh!

MarekPieta left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nordic-segl commented Oct 24, 2025 •

edited

Loading

NordicBuilder commented Oct 24, 2025 •

edited

Loading

NordicBuilder commented Oct 24, 2025 •

edited

Loading