soc: nordic: nrf54h: disable IRQ before PM config

adamkondraciuk · adamkondraciuk · commit a6dfffa688f6 · 2024-11-12T11:24:40.000+01:00
IRQs must be disabled before starting any procedures to prepare
for low-power states.

Signed-off-by: Adam Kondraciuk &lt;adam.kondraciuk@nordicsemi.no&gt;
diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
@@ -111,12 +111,10 @@ 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;
 	}
 
diff --git a/soc/nordic/nrf54h/power.c b/soc/nordic/nrf54h/power.c
@@ -187,6 +187,7 @@ static void s2ram_enter(void)
 
 void pm_state_set(enum pm_state state, uint8_t substate_id)
 {
+	__disable_irq();
 	if (state == PM_STATE_SUSPEND_TO_IDLE) {
 		s2idle_enter(substate_id);
 		/* Resume here. */
@@ -202,6 +203,7 @@ void pm_state_set(enum pm_state state, uint8_t substate_id)
 	else {
 		k_cpu_idle();
 	}
+	__enable_irq();
 }
 
 void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)

Original file line number	Diff line number	Diff line change
`@@ -111,12 +111,10 @@ int soc_s2ram_suspend(pm_s2ram_system_off_fn_t system_off)`
`111`	`111`	`{`
`112`	`112`	`int ret;`
`113`	`113`
`114`		`- __disable_irq();`
`115`	`114`	`nvic_suspend(&backup_data.nvic_context);`
`116`	`115`	`mpu_suspend(&backup_data.mpu_context);`
`117`	`116`	`ret = arch_pm_s2ram_suspend(system_off);`
`118`	`117`	`if (ret < 0) {`
`119`		`- __enable_irq();`
`120`	`118`	`return ret;`
`121`	`119`	`}`
`122`	`120`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@ static void s2ram_enter(void)`
`187`	`187`
`188`	`188`	`void pm_state_set(enum pm_state state, uint8_t substate_id)`
`189`	`189`	`{`
	`190`	`+ __disable_irq();`
`190`	`191`	`if (state == PM_STATE_SUSPEND_TO_IDLE) {`
`191`	`192`	`s2idle_enter(substate_id);`
`192`	`193`	`/* Resume here. */`
`@@ -202,6 +203,7 @@ void pm_state_set(enum pm_state state, uint8_t substate_id)`
`202`	`203`	`else {`
`203`	`204`	`k_cpu_idle();`
`204`	`205`	`}`
	`206`	`+ __enable_irq();`
`205`	`207`	`}`
`206`	`208`
`207`	`209`	`void pm_state_exit_post_ops(enum pm_state state, uint8_t substate_id)`