adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

arch: arm: cortex_m: pm_s2ram: fix system_off rv as rv of s2ram_suspend

Browse source 
The return value of the system_off call is overwritten by the the call to
pm_s2ram_mark_check_and_clear. As arch_pm_s2ram_suspend needs to specify
why system_off failed, we need to make sure the rv of system_off is moved
to a safe register before calling pm_s2ram_mark_check_and_clear and moved
to r0 als rv of arch_pm_s2ram_suspend when the suspend call exits.

Signed-off-by: Hessel van der Molen <hvandermolen@dexels.com>
This commit is contained in:
Hessel van der Molen 2024-10-30 17:33:08 +01:00 committed by Fabio Baltieri
parent e4b2fe4b78
commit 8316f097ce
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/arm/core/cortex_m/pm_s2ram.S
View file

@ -193,6 +193,9 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
* not successful (in r0 the return value).
*/
/* Move return value of system_off to callee-saved register. */
mov r4, r0
/*
* Reset the marking of suspend to RAM, return is ignored.
*/
@ -200,7 +203,9 @@ SECTION_FUNC(TEXT, arch_pm_s2ram_suspend)
bl pm_s2ram_mark_check_and_clear
mov lr, r1
/* Move system_off back to r0 as return value */
/* Move the stored return value of system_off back to r0,
* setting it as return value for this function.
*/
mov r0, r4
POP_GPRS