[nrf fromtree] soc: nordic: common: vpr: Implement erratas in cpu idle

Use custom cpu_idle implementation for all VPRs and implement
workarounds for erratas which impact sleeping

Signed-off-by: Krzysztof Chruściński <krzysztof.chruscinski@nordicsemi.no>
(cherry picked from commit b84d6f9)

Author: nordic-krch

soc/nordic/common/vpr/Kconfig

@@ -11,8 +11,8 @@ config RISCV_CORE_NORDIC_VPR
 	select RISCV_HAS_CLIC
 	select RISCV_SOC_CONTEXT_SAVE
 	select HAS_FLASH_LOAD_OFFSET
-	select ARCH_HAS_CUSTOM_CPU_IDLE if !SOC_SERIES_NRF54L
-	select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE if !SOC_SERIES_NRF54L
+	select ARCH_HAS_CUSTOM_CPU_IDLE
+	select ARCH_HAS_CUSTOM_CPU_ATOMIC_IDLE
 	select INCLUDE_RESET_VECTOR
 	imply XIP
 	help

soc/nordic/common/vpr/soc_idle.c

@@ -6,6 +6,19 @@
 #include <zephyr/irq.h>
 #include <zephyr/sys/barrier.h>
 #include <zephyr/tracing/tracing.h>
+#include <nrfx.h>
+
+/* Optionally apply errata workaround for waking up from hibernation */
+static ALWAYS_INLINE void hibernate_dummy_write(void)
+{
+	if (!IS_ENABLED(CONFIG_NORDIC_VPR_HIBERNATE)) {
+		return;
+	}
+
+	if (NRF_ERRATA_DYNAMIC_CHECK(54H, 111) || NRF_ERRATA_DYNAMIC_CHECK(54L, 18)) {
+		*(volatile int *)0x5004C804 = 1;
+	}
+}
 
 /*
  * Due to a HW issue, VPR requires MSTATUS.MIE to be enabled when entering sleep.
@@ -16,23 +29,46 @@ void arch_cpu_idle(void)
 #if defined(CONFIG_TRACING)
 	sys_trace_idle();
 #endif
-	barrier_dsync_fence_full();
-	irq_unlock(MSTATUS_IEN);
+
+	if (NRF_ERRATA_DYNAMIC_CHECK(54H, 93)) {
+		barrier_dsync_fence_full();
+		irq_unlock(MSTATUS_IEN);
+	}
+
 	__asm__ volatile("wfi");
+	hibernate_dummy_write();
+	if (!NRF_ERRATA_DYNAMIC_CHECK(54H, 93)) {
+#if defined(CONFIG_TRACING)
+		/* Makes sense only if sleeping with interrupts locked. */
+		sys_trace_idle_exit();
+#endif
+		irq_unlock(MSTATUS_IEN);
+	}
 }
 
 void arch_cpu_atomic_idle(unsigned int key)
 {
 #if defined(CONFIG_TRACING)
 	sys_trace_idle();
 #endif
-	barrier_dsync_fence_full();
-	irq_unlock(MSTATUS_IEN);
+	if (NRF_ERRATA_DYNAMIC_CHECK(54H, 93)) {
+		barrier_dsync_fence_full();
+		irq_unlock(MSTATUS_IEN);
+	}
 	__asm__ volatile("wfi");
+	hibernate_dummy_write();
 
-	/* Disable interrupts if needed. */
-	__asm__ volatile ("csrc mstatus, %0"
+	if (NRF_ERRATA_DYNAMIC_CHECK(54H, 93)) {
+		/* Disable interrupts if needed. */
+		__asm__ volatile ("csrc mstatus, %0"
 			  :
 			  : "r" (~key & MSTATUS_IEN)
 			  : "memory");
+	} else {
+#if defined(CONFIG_TRACING)
+		/* Makes sense only if sleeping with interrupts locked. */
+		sys_trace_idle_exit();
+#endif
+		irq_unlock(key);
+	}
 }