Skip to content

[Backport v3.7.99-ncs1-branch] soc: nordic: nrf54h: disable IRQ before PM config #2270

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 2 commits into from
Nov 14, 2024
Merged

[Backport v3.7.99-ncs1-branch] soc: nordic: nrf54h: disable IRQ before PM config #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c52655
[nrf fromlist] arch: arm: cortex_m: pm_s2ram: fix system_off rv as rv…
HesselM Oct 30, 2024
676d980
[nrf fromlist] soc: nordic: nrf54h: disable IRQ before PM config
adamkondraciuk Nov 12, 2024
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
7 changes: 6 additions & 1 deletion 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 @@ -85,14 +85,19 @@ 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.
*/
mov r1, lr
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 {r4-r12, lr}
Expand Down
3 changes: 0 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 @@ -111,18 +111,15 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
{
int ret;

__disable_irq();
nvic_suspend(&backup_data.nvic_context);
mpu_suspend(&backup_data.mpu_context);
ret = arch_pm_s2ram_suspend(system_off);
if (ret < 0) {
__enable_irq();
return ret;
}

mpu_resume(&backup_data.mpu_context);
nvic_resume(&backup_data.nvic_context);
__enable_irq();

return ret;
}
Expand Down
4 changes: 4 additions & 0 deletions soc/nordic/nrf54h/power.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,19 @@ static void s2ram_enter(void)
void pm_state_set(enum pm_state state, uint8_t substate_id)
{
if (state == PM_STATE_SUSPEND_TO_IDLE) {
__disable_irq();
s2idle_enter(substate_id);
/* Resume here. */
s2idle_exit(substate_id);
__enable_irq();
}
#if defined(CONFIG_PM_S2RAM)
else if (state == PM_STATE_SUSPEND_TO_RAM) {
__disable_irq();
s2ram_enter();
/* On resuming or error we return exactly *HERE* */
s2ram_exit();
__enable_irq();
}
#endif
else {
Expand Down
Loading