diff --git a/components/esp_hw_support/CMakeLists.txt b/components/esp_hw_support/CMakeLists.txt
index 710ffb28f83..85a764473fa 100644
--- a/components/esp_hw_support/CMakeLists.txt
+++ b/components/esp_hw_support/CMakeLists.txt
@@ -64,6 +64,7 @@ if(NOT non_os_build)
         list(APPEND srcs "sleep_modem.c"
                          "sleep_modes.c"
                          "sleep_console.c"
+                         "sleep_mspi.c"
                          "sleep_usb.c"
                          "sleep_gpio.c"
                          "sleep_event.c"
diff --git a/components/esp_hw_support/include/esp_private/esp_pmu.h b/components/esp_hw_support/include/esp_private/esp_pmu.h
index 224d5a70f3b..6200249da19 100644
--- a/components/esp_hw_support/include/esp_private/esp_pmu.h
+++ b/components/esp_hw_support/include/esp_private/esp_pmu.h
@@ -348,11 +348,6 @@ void pmu_init(void);
  */
 uint32_t pmu_sleep_get_wakup_retention_cost(void);
 
-/**
- * Workaround for esp32p4 v3 MPSI access failure after power up.
- */
-void pmu_sleep_p4_rev3_workaround(void);
-
 #endif //#if SOC_PMU_SUPPORTED
 
 #ifdef __cplusplus
diff --git a/components/esp_hw_support/include/esp_private/sleep_flash.h b/components/esp_hw_support/include/esp_private/sleep_flash.h
new file mode 100644
index 00000000000..ab8c95e0986
--- /dev/null
+++ b/components/esp_hw_support/include/esp_private/sleep_flash.h
@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+#include <stdint.h>
+#include "sdkconfig.h"
+#include "soc/soc_caps.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if CONFIG_IDF_TARGET_ESP32P4 && (CONFIG_ESP_REV_MIN_FULL == 300)
+/**
+ * Workaround for esp32p4 v3 MPSI access failure after power up.
+ */
+void sleep_flash_p4_rev3_workaround(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/components/esp_hw_support/linker.lf b/components/esp_hw_support/linker.lf
index c37057f2c00..6a0de4b82d6 100644
--- a/components/esp_hw_support/linker.lf
+++ b/components/esp_hw_support/linker.lf
@@ -40,6 +40,7 @@ entries:
         rtc_sleep:rtc_sleep_pu (noflash)
     if SOC_PMU_SUPPORTED = y && SOC_LIGHT_SLEEP_SUPPORTED = y:
         pmu_sleep (noflash)
+        sleep_mspi (noflash)
         if SPIRAM_FLASH_LOAD_TO_PSRAM = y:
             pmu_init (noflash)
             pmu_param (noflash)
diff --git a/components/esp_hw_support/port/esp32p4/pmu_sleep.c b/components/esp_hw_support/port/esp32p4/pmu_sleep.c
index 78c5bcd9697..2465a65cd22 100644
--- a/components/esp_hw_support/port/esp32p4/pmu_sleep.c
+++ b/components/esp_hw_support/port/esp32p4/pmu_sleep.c
@@ -506,21 +506,3 @@ uint32_t pmu_sleep_get_wakup_retention_cost(void)
 {
     return PMU_REGDMA_S2A_WORK_TIME_US;
 }
-
-#if (CONFIG_ESP_REV_MIN_FULL == 300)
-void pmu_sleep_p4_rev3_workaround(void)
-{
-    REG_CLR_BIT(SPI_MEM_C_CACHE_FCTRL_REG, SPI_MEM_C_CLOSE_AXI_INF_EN);
-    REG_SET_BIT(SPI_MEM_C_CACHE_FCTRL_REG, SPI_MEM_C_AXI_REQ_EN);
-    REG_SET_FIELD(HP_SYSTEM_CORE_ERR_RESP_DIS_REG, HP_SYSTEM_CORE_ERR_RESP_DIS, 0x7);
-    REG_WRITE(SPI_MEM_C_MMU_ITEM_INDEX_REG, 0);
-    uint32_t mmu_backup = mmu_ll_read_entry(MMU_LL_FLASH_MMU_ID, 0);
-    mmu_ll_write_entry(MMU_LL_FLASH_MMU_ID, 0, 0, MMU_TARGET_FLASH0);
-    __attribute__((unused)) volatile uint32_t val = 0;
-    val = *(uint32_t *)(0x80000000);
-    val = *(uint32_t *)(0x80000080);
-    mmu_ll_write_entry(MMU_LL_FLASH_MMU_ID, 0, mmu_backup, MMU_TARGET_FLASH0);
-    _mspi_timing_ll_reset_mspi();
-    _mspi_timing_ll_reset_mspi_apb();
-}
-#endif
diff --git a/components/esp_hw_support/sleep_modes.c b/components/esp_hw_support/sleep_modes.c
index 9e8c70d0452..3a7c427badf 100644
--- a/components/esp_hw_support/sleep_modes.c
+++ b/components/esp_hw_support/sleep_modes.c
@@ -79,6 +79,7 @@
 #include "esp_private/sleep_console.h"
 #include "esp_private/sleep_cpu.h"
 #include "esp_private/sleep_modem.h"
+#include "esp_private/sleep_flash.h"
 #include "esp_private/sleep_usb.h"
 #include "esp_private/esp_clk.h"
 #include "esp_private/esp_task_wdt.h"
@@ -966,7 +967,7 @@ static esp_err_t FORCE_IRAM_ATTR esp_sleep_start_safe(uint32_t sleep_flags, uint
             esp_sleep_mmu_retention(false);
 #endif
 #if CONFIG_IDF_TARGET_ESP32P4 && (CONFIG_ESP_REV_MIN_FULL == 300)
-            pmu_sleep_p4_rev3_workaround();
+            sleep_flash_p4_rev3_workaround();
             sleep_retention_do_extra_retention(false);
 #endif
         }
diff --git a/components/esp_hw_support/sleep_mspi.c b/components/esp_hw_support/sleep_mspi.c
new file mode 100644
index 00000000000..9f198262864
--- /dev/null
+++ b/components/esp_hw_support/sleep_mspi.c
@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+#include "sdkconfig.h"
+
+#if CONFIG_IDF_TARGET_ESP32P4 && (CONFIG_ESP_REV_MIN_FULL == 300)
+#include "soc/hp_system_reg.h"
+#include "hal/mmu_ll.h"
+#include "hal/mspi_ll.h"
+
+void sleep_flash_p4_rev3_workaround(void)
+{
+    REG_CLR_BIT(SPI_MEM_C_CACHE_FCTRL_REG, SPI_MEM_C_CLOSE_AXI_INF_EN);
+    REG_SET_BIT(SPI_MEM_C_CACHE_FCTRL_REG, SPI_MEM_C_AXI_REQ_EN);
+    REG_SET_FIELD(HP_SYSTEM_CORE_ERR_RESP_DIS_REG, HP_SYSTEM_CORE_ERR_RESP_DIS, 0x7);
+    REG_WRITE(SPI_MEM_C_MMU_ITEM_INDEX_REG, 0);
+    uint32_t mmu_backup = mmu_ll_read_entry(MMU_LL_FLASH_MMU_ID, 0);
+    mmu_ll_write_entry(MMU_LL_FLASH_MMU_ID, 0, 0, MMU_TARGET_FLASH0);
+    __attribute__((unused)) volatile uint32_t val = 0;
+    val = REG_READ(0x80000000);
+    val = REG_READ(0x80000080);
+    mmu_ll_write_entry(MMU_LL_FLASH_MMU_ID, 0, mmu_backup, MMU_TARGET_FLASH0);
+    _mspi_timing_ll_reset_mspi();
+    _mspi_timing_ll_reset_mspi_apb();
+    REG_SET_FIELD(HP_SYSTEM_CORE_ERR_RESP_DIS_REG, HP_SYSTEM_CORE_ERR_RESP_DIS, 0);
+}
+#endif