Skip to content

Commit 7607c65

Browse files
nordic-krchrlubos
authored andcommitted
[nrf fromlist] soc: nordic: nrf54h: Fix s2ram
Cache was not enabled when s2ram did not completed which lead to system malfunction. Always power up cache when returning from s2ram function. Upstream PR #: 88709 Signed-off-by: Krzysztof Chruściński <[email protected]>
1 parent 37e7692 commit 7607c65

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

soc/nordic/nrf54h/pm_s2ram.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)
167167
nvic_suspend(&backup_data.nvic_context);
168168
mpu_suspend(&backup_data.mpu_context);
169169
ret = arch_pm_s2ram_suspend(system_off);
170+
/* Cache is powered down so power up is needed even if s2ram failed. */
171+
nrf_power_up_cache();
170172
if (ret < 0) {
171173
return ret;
172174
}
173175

174-
nrf_power_up_cache();
175-
176176
mpu_resume(&backup_data.mpu_context);
177177
nvic_resume(&backup_data.nvic_context);
178178
scb_resume(&backup_data.scb_context);

0 commit comments

Comments
 (0)