Skip to content

[nrf fromlist] soc: nordic: nrf54h20: disallow using LR in s2ram mark… #2297

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

Closed
wants to merge 1 commit into from
Closed

[nrf fromlist] soc: nordic: nrf54h20: disallow using LR in s2ram mark… #2297

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
9 changes: 6 additions & 3 deletions soc/nordic/nrf54h/pm_s2ram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ void __attribute__((naked)) pm_s2ram_mark_set(void)

bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
{
register uint32_t link_reg __asm__("r14");

__asm__ volatile(
/* Set return value to 0 */
"mov r0, #0\n"
Expand Down Expand Up @@ -159,13 +161,14 @@ bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
"mov r0, #1\n"

"exit:\n"
"bx lr\n"
"bx %[link_reg]\n"
:
: [resetinfo_addr] "r"(NRF_RESETINFO),
[resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
[resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
[restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
[restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
[restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk),
[link_reg] "r"(link_reg)

: "r0", "r1", "r3", "r4", "memory");
: "r0", "r1", "r3", "r4", "cc", "memory");
}
Loading