[nrf fromlist] arch: Allow to specify memory for S2RAM resume #3275
Conversation
tomchy
force-pushed
the
bugfix/reset/NCSDK-35410_Dedicated_s2ram_stack_ncs
branch
from
1ed3c39 to
3803d86
Compare
tomchy
force-pushed
the
bugfix/reset/NCSDK-35410_Dedicated_s2ram_stack_ncs
branch
from
3803d86 to
5a96446
Compare
maciejpietras
requested review from
ahasztag,
de-nordic and
michalek-no
and removed request for
ahasztag,
de-nordic and
michalek-no
tomchy
force-pushed
the
bugfix/reset/NCSDK-35410_Dedicated_s2ram_stack_ncs
branch
from
5a96446 to
e5d5510
Compare
tomchy
force-pushed
the
bugfix/reset/NCSDK-35410_Dedicated_s2ram_stack_ncs
branch
from
e5d5510 to
40c0962
Compare
tomchy
force-pushed
the
bugfix/reset/NCSDK-35410_Dedicated_s2ram_stack_ncs
branch
from
40c0962 to
7e71a69
Compare
tomchy
force-pushed
the
bugfix/reset/NCSDK-35410_Dedicated_s2ram_stack_ncs
branch
2 times, most recently
from
2912b8e to
9b13ac0
Compare
|
|
||
| /* Trim this RAM block for making room on all run-time common S2RAM cpu context. */ | ||
| &cpuapp_ram0 { | ||
| reg = <0x22000000 (DT_SIZE_K(32)-32)>; |
There was a problem hiding this comment.
temp. block until input from @carlescufi - this places random burdens on VV commit 79bffff:
[nrf noup] boards: Align board DTS with upstream.
This alignment cannot be done through nrf fromlist commit, since it was
introduced in the tree-wide commit:
2d22884f52a01236d404fb2e6910d3683f680af6
Once tried to pull all changes to merge it cleanly, the chain ended up
in the doc/releases/migration-guide-4.3.rst file, which would bring
nearly all of the changes from the Zephyr 4.3 release, making a small PR
with just 4 white characters a Zephyr upmerge PR.
Feel free to drop this commit during the next Zephyr upmerge.
There was a problem hiding this comment.
@tomchy can't you wait until the current upmerge is complete?
There was a problem hiding this comment.
No, we need it for the release that will be tomorrow.
There was a problem hiding this comment.
Keep in mind that it is a separate commit that adds 4 spaces and should be more than trivial to handle during the upmerge (either way - noup commits create conflicts).
There was a problem hiding this comment.
@nordicjm - I don't understand why you block this PR. It is bugfix. Its urgent, needed for preview tag tomorrow. There is ref. to internal ticket even you can check.
There was a problem hiding this comment.
This places the blame of going through noup's on whomever is doing the upmerge, we have over 100 noup commits in sdk-zephyr, it is not nor should it be their responsibility to go through these 100+ commits, read their descriptions, apply possible action and then try to get them to apply. If things are needed then the required commits should be cherry-picked with them, if that takes 1 or 30 commits isn't VV's problem, it's on the person submitting to deal with and bring those in. An exception is being made for this due to urgency, future usage will be blocked and users will be asked to fromlist/fromtree cherry pick the required commits for a commit to be cleanly applied
This reverts commit 08e0cf4. Signed-off-by: Tomasz Chyrowicz <[email protected]>
This alignment cannot be done through nrf fromlist commit, since it was introduced in the tree-wide commit: 2d22884 Once tried to pull all changes to merge it cleanly, the chain ended up in the doc/releases/migration-guide-4.3.rst file, which would bring nearly all of the changes from the Zephyr 4.3 release, making a small PR with just 4 white characters a Zephyr upmerge PR. Feel free to drop this commit during the next Zephyr upmerge. Signed-off-by: Tomasz Chyrowicz <[email protected]>
If the area, dedicated for the interrupt stack is not available, allow to specify a memory region that will be used as the stack for the S2RAM resume logic. Upstream PR #: 95914 Signed-off-by: Tomasz Chyrowicz <[email protected]>
Add the definition of pm_s2ram_stack memory region for nRF54H20. Upstream PR #: 95914 Signed-off-by: Tomasz Chyrowicz <[email protected]>
tomchy
force-pushed
the
bugfix/reset/NCSDK-35410_Dedicated_s2ram_stack_ncs
branch
from
9b13ac0 to
c812077
Compare
carlescufi
dismissed
nordicjm’s stale review
Discussed offline, this will be tracked for the next upmerge
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 08e0cf4)
tomchy
force-pushed
the
bugfix/reset/NCSDK-35410_Dedicated_s2ram_stack_ncs
branch
from
c812077 to
2dc2c8f
Compare
7 participants
If the area, dedicated for the interrupt stack is not available, allow to specify a memory region that will be used as the stack for the S2RAM resume logic.
Upstream PR #: 95914
manifest-pr-skip
ref.: NCSDK-35410