Skip to content

Conversation

@adamkondraciuk
Copy link
Contributor

No description provided.

rugeGerritsen and others added 9 commits October 28, 2025 13:04
This commit adds support using pm_s2ram for 54H when the
MPU is disabled. This is the case for the out of tree
sample `sdk-nrf/samples/nrf54h/empty_app_core`.

Without this commit the linker will fail to link
`z_arm_mpu_init` and `z_arm_configure_static_mpu_regions`.

Signed-off-by: Rubin Gerritsen <[email protected]>
…e_s"

This reverts commit 079a5d6.

Signed-off-by: Adam Kondraciuk <[email protected]>
This reduced the amount of duplicate code and unifies the code
with other platforms.

MPU retention was originally added in
ee9d239.

Signed-off-by: Rubin Gerritsen <[email protected]>
This reduced the amount of duplicate code and unifies the code
with other platforms.

With this change fewer registers are stored and restored.
See also comment in scb.h for scb_context stating that
only essential registers are stored and restored.

No longer stored:
- ICSR
- SCR
- CFSR
- HFSR
- DFSR
- MMFAR
- BFAR
- AFSR

No longer used:
- SHPR[3..12]. This backup register was declared in the wrong way.
  In core_cm33.h and core_cm4.h this is declared as an array of
  12 uint8_t's. That is 3 uint32_t's.

Orignal SCB retention was added in
2055f7d.

Signed-off-by: Rubin Gerritsen <[email protected]>
This reduced the amount of duplicate code and unifies the code
with other platforms.

With this change the caller and callee status registers are
stored separately. Also, a different set of status registers
are stored:
 - FPSCR instead of FPDSCR. FPDSCR contains the default values
   to be assigned to FPSCR when a new floating-point context
   is created. It therefore seems more correct to store the
   FPSCR.
 - FPCCR and FPCAR are no longer stored.

FPU retention was originally added in:
8a5365c.

Signed-off-by: Rubin Gerritsen <[email protected]>
This commit fixes a change introduced in #97025
where too many definitions where removed.

Fixes issue #98382

Signed-off-by: Rubin Gerritsen <[email protected]>
Added support for hardening decision on resume from
S2RAM by MCUboot bootloader.
Application sets additional variable to MCUBOOT_S2RAM_RESUME_MAGIC
which allows the bootloader to doublecheck.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
(cherry picked from commit d4bb1c6)
nrf_squash! [nrf noup] soc/nordic/nf54h/pm_s2ram: S2RAM resume hardening

Extended mcuboot_resume_s suture by slot_info field intended to
be used by MCUboot for recognize proper boot slot in direct-xp
mode.

Signed-off-by: Andrzej Puzdrowski <[email protected]>
@adamkondraciuk adamkondraciuk force-pushed the 54h-pm-s2ram-use-arm-funcs branch from 4ceb55a to 9617a44 Compare October 28, 2025 12:21
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.

3 participants