Skip to content

arch: arm: pm_s2ram: fix compatibility with ARMv6-M again #88263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2025
Merged

arch: arm: pm_s2ram: fix compatibility with ARMv6-M again #88263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions arch/arm/core/cortex_m/pm_s2ram.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,17 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_resume)
push {r0, lr}
bl pm_s2ram_mark_check_and_clear
cmp r0, #0x1
pop {r0, lr}
beq .L_resume
bx lr
pop {r0, pc}

.L_resume:
/*
* Restore the CPU context
* Switch to the stack used to execute "arch_pm_s2ram_suspend"
* and restore CPU context backed up by that function, then
* return to the call site of "arch_pm_s2ram_suspend".
*
* Note: the "push {r0, lr}" performed earlier doesn't
* need to be balanced out since we are switching stacks.
*/
ldr r0, =_cpu_context

Expand Down