tmp

Author: nordic-krch

soc/nordic/nrf54h/power.c

@@ -20,6 +20,21 @@ extern sys_snode_t soc_node;
 
 static void nrf_power_down_cache(void)
 {
+	if (IS_ENABLED(CONFIG_DCACHE)) {
+		/* Flush, disable and power down DCACHE */
+		sys_cache_data_flush_all();
+		sys_cache_data_disable();
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+				RAMBLOCK_CONTROL_BIT_DCACHE, false);
+	}
+	if (IS_ENABLED(CONFIG_ICACHE)) {
+		/* Disable and power down ICACHE */
+		sys_cache_instr_disable();
+		nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+				RAMBLOCK_CONTROL_BIT_ICACHE, false);
+	}
+
+#if 0
 	static const uint32_t msk =
 		(IS_ENABLED(CONFIG_DCACHE) ? BIT(RAMBLOCK_CONTROL_BIT_DCACHE) : 0) |
 		(IS_ENABLED(CONFIG_ICACHE) ? BIT(RAMBLOCK_CONTROL_BIT_ICACHE) : 0);
@@ -34,27 +49,34 @@ static void nrf_power_down_cache(void)
 	sys_cache_data_disable();
 	sys_cache_instr_disable();
 	nrf_memconf_ramblock_control_mask_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID, msk, false);
+#endif
 }
 
 void nrf_power_up_cache(void)
 {
+#if 0
 	static const uint32_t msk =
 		(IS_ENABLED(CONFIG_DCACHE) ? BIT(RAMBLOCK_CONTROL_BIT_DCACHE) : 0) |
 		(IS_ENABLED(CONFIG_ICACHE) ? BIT(RAMBLOCK_CONTROL_BIT_ICACHE) : 0);
 
 	if (msk == 0) {
 		return;
 	}
+#endif
 
-	nrf_memconf_ramblock_control_mask_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID, msk, true);
+	nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+				RAMBLOCK_CONTROL_BIT_ICACHE, true);
 	sys_cache_instr_enable();
+
+	nrf_memconf_ramblock_control_enable_set(NRF_MEMCONF, RAMBLOCK_POWER_ID,
+				RAMBLOCK_CONTROL_BIT_DCACHE, true);
 	sys_cache_data_enable();
 }
 
 static void common_suspend(void)
 {
-	soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
 	nrf_power_down_cache();
+	soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_DOMAIN_0);
 }
 
 static void common_resume(void)