Nrfx none revert s2ram procedures #2638
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamkondraciuk
requested review from
kl-cruz,
nika-nordic,
masz-nordic and
mstasiaknordic
nordic-krch
approved these changes
Mar 19, 2025
nordicjm
requested changes
Mar 19, 2025
adamkondraciuk
force-pushed
the
NRFX-NONE-revert-s2ram-procedures
branch
2 times, most recently
from
3c2ddfa to
2b3fd8c
Compare
mstasiaknordic
approved these changes
Mar 20, 2025
adamkondraciuk
force-pushed
the
NRFX-NONE-revert-s2ram-procedures
branch
2 times, most recently
from
d0331fe to
130ac46
Compare
adamkondraciuk
force-pushed
the
NRFX-NONE-revert-s2ram-procedures
branch
from
130ac46 to
ddf9e4e
Compare
What is the change? - Fixes #83660 allowing device to now enter suspend mode even if CONFIG_DEBUG_THREAD_INFO is enabled. Why is this needed? - z_sys_post_kernel was cleared as part of #d778d5c to "allow debuggers to display the correct thread state after the first 3 instructions have run". This is not required while resuming from suspend and it prevents the device from entering suspend so, move it out of resume path. Signed-off-by: Sudan Landge <[email protected]> (cherry picked from commit 743fe63)
What is the change? - APIs `pm_s2ram_mark_set` and `pm_s2ram_mark_check_and_clear`, used to set/check pm_s2ram magic marker, no longer have Arm specific limitations. Why is this needed? - These APIs are generic and should not have arch specific dependency. Signed-off-by: Sudan Landge <[email protected]> (cherry picked from commit 7beff12)
Regular label are exported in the object file and cause gdb to consider them as function start. Local labels on the other hand are not exported. For example, using `disassemble z_arm_pendsv` after this change will disassemble the whole function rather than stop at the first branch. Signed-off-by: Wilfried Chauveau <[email protected]> (cherry picked from commit 5261680)
…rk functions" What is the change? - This reverts commit 474d4c3 Why do we need this change? - This commit was added because Cortex-M didn't have a valid stack to make required functionality work however, the previous commit fixes this and makes interrupt stack available for use. This removes Arm specific limitation from these generic APIs so revert the commit to reflect the same. Signed-off-by: Sudan Landge <[email protected]> (cherry picked from commit b4fb5d3)
…ram marking function" This reverts commit 7806677. Signed-off-by: Adam Kondraciuk <[email protected]>
…ures" The marking procedures can be reverted, since at this stage it is already allowed to use the stack. The MSP is temporairly set to interrupt stack in `reset.S` file before calling s2ram procedures.. Upstream PR #: 87304 Signed-off-by: Adam Kondraciuk <[email protected]> This reverts commit e68d110f7c175f2a9275659d023c9d37d1e4b4f1.
Optimize `pm_s2ram_mark_check_and_clear()` function. Upstream PR #: 87304 Signed-off-by: Adam Kondraciuk <[email protected]>
adamkondraciuk
force-pushed
the
NRFX-NONE-revert-s2ram-procedures
branch
from
ddf9e4e to
9724303
Compare
|
nika-nordic
approved these changes
Apr 1, 2025
kl-cruz
approved these changes
Apr 2, 2025
nordicjm
approved these changes
Apr 2, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Restore pm s2ram procedures to C code form and use temporarily interrupt stack at the early stage.