From 0007b69397d4fa86de7e7f84673f5c41b1ccd9f3 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Tue, 12 Nov 2024 11:24:40 +0100
Subject: [PATCH] [nrf fromlist] soc: nordic: nrf54h: disable IRQ before PM
 config

IRQs must be disabled before starting any procedures to prepare
for low-power states.

Upstream PR #: 79067

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
---
 soc/nordic/nrf54h/pm_s2ram.c | 4 +---
 soc/nordic/nrf54h/power.c    | 6 +++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/soc/nordic/nrf54h/pm_s2ram.c b/soc/nordic/nrf54h/pm_s2ram.c
index 88529c4bb75..6cd8325ca78 100644
--- a/soc/nordic/nrf54h/pm_s2ram.c
+++ b/soc/nordic/nrf54h/pm_s2ram.c
@@ -111,18 +111,16 @@ 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();
+		/* On resuming or error we return exactly *HERE* */
 		return ret;
 	}
 
 	mpu_resume(&backup_data.mpu_context);
 	nvic_resume(&backup_data.nvic_context);
-	__enable_irq();
 
 	return ret;
 }
diff --git a/soc/nordic/nrf54h/power.c b/soc/nordic/nrf54h/power.c
index 8b73dbaee30..aae0e304b72 100644
--- a/soc/nordic/nrf54h/power.c
+++ b/soc/nordic/nrf54h/power.c
@@ -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* */
+		/* Resume here. */
 		s2ram_exit();
+		__enable_irq();
 	}
 #endif
 	else {