diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
index 9f9c3bfbcf9..ca6f4ae0ce4 100644
--- a/components/esp_rom/CMakeLists.txt
+++ b/components/esp_rom/CMakeLists.txt
@@ -51,6 +51,14 @@ if(CONFIG_SECURE_ENABLE_TEE AND CONFIG_IDF_TARGET_ESP32C5 AND NOT ESP_TEE_BUILD)
     list(APPEND sources "patches/esp_rom_cache_esp32c5.c")
 endif()
 
+if(CONFIG_ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_MAP)
+    list(APPEND sources "patches/esp_rom_cache_writeback_esp32p4_esp32s31.c")
+endif()
+
+if(CONFIG_ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_NO_MAP)
+    list(APPEND sources "patches/esp_rom_cache_writeback_esp32c5_esp32c61_esp32h4.c")
+endif()
+
 idf_component_register(SRCS ${sources}
                        INCLUDE_DIRS ${include_dirs}
                        PRIV_REQUIRES ${private_required_comp}
diff --git a/components/esp_rom/esp32c5/Kconfig.soc_caps.in b/components/esp_rom/esp32c5/Kconfig.soc_caps.in
index 898d1f69675..11685088ea0 100644
--- a/components/esp_rom/esp32c5/Kconfig.soc_caps.in
+++ b/components/esp_rom/esp32c5/Kconfig.soc_caps.in
@@ -122,3 +122,7 @@ config ESP_ROM_SUPPORT_SECURE_BOOT_FAST_WAKEUP
 config ESP_ROM_BOOTLOADER_OFFSET_FLASH
     hex
     default 0x2000
+
+config ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_NO_MAP
+    bool
+    default y
diff --git a/components/esp_rom/esp32c5/esp_rom_caps.h b/components/esp_rom/esp32c5/esp_rom_caps.h
index d2ca6f3410f..465ead85a0c 100644
--- a/components/esp_rom/esp32c5/esp_rom_caps.h
+++ b/components/esp_rom/esp32c5/esp_rom_caps.h
@@ -36,3 +36,4 @@
 #define ESP_ROM_DELAY_US_PATCH              (1) // ROM ets_delay_us needs patch for U-mode operation
 #define ESP_ROM_SUPPORT_SECURE_BOOT_FAST_WAKEUP (1) // ROM supports the secure boot fast wakeup feature
 #define ESP_ROM_BOOTLOADER_OFFSET_FLASH     (0x2000) // Bootloader offset in flash determined by the ROM bootloader
+#define ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_NO_MAP (1) // ROM cache writeback related needs patch to avoid sync loss, no map parameter
diff --git a/components/esp_rom/esp32c5/ld/esp32c5.rom.ld b/components/esp_rom/esp32c5/ld/esp32c5.rom.ld
index 0a970952198..bba9f0a735c 100644
--- a/components/esp_rom/esp32c5/ld/esp32c5.rom.ld
+++ b/components/esp_rom/esp32c5/ld/esp32c5.rom.ld
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -192,12 +192,12 @@ Cache_Sync_Items = 0x40000648;
 Cache_Op_Addr = 0x4000064c;
 Cache_Invalidate_Addr = 0x40000650;
 Cache_Clean_Addr = 0x40000654;
-Cache_WriteBack_Addr = 0x40000658;
-Cache_WriteBack_Invalidate_Addr = 0x4000065c;
+PROVIDE( Cache_WriteBack_Addr = 0x40000658 );
+PROVIDE( Cache_WriteBack_Invalidate_Addr = 0x4000065c );
 Cache_Invalidate_All = 0x40000660;
 Cache_Clean_All = 0x40000664;
-Cache_WriteBack_All = 0x40000668;
-Cache_WriteBack_Invalidate_All = 0x4000066c;
+PROVIDE( Cache_WriteBack_All = 0x40000668 );
+PROVIDE( Cache_WriteBack_Invalidate_All = 0x4000066c );
 Cache_Mask_All = 0x40000670;
 Cache_UnMask_Dram0 = 0x40000674;
 Cache_Suspend_Autoload = 0x40000678;
diff --git a/components/esp_rom/esp32c61/Kconfig.soc_caps.in b/components/esp_rom/esp32c61/Kconfig.soc_caps.in
index 3e95c8b37e9..5bfd86f1bf1 100644
--- a/components/esp_rom/esp32c61/Kconfig.soc_caps.in
+++ b/components/esp_rom/esp32c61/Kconfig.soc_caps.in
@@ -114,3 +114,7 @@ config ESP_ROM_DELAY_US_PATCH
 config ESP_ROM_BOOTLOADER_OFFSET_FLASH
     hex
     default 0x0
+
+config ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_NO_MAP
+    bool
+    default y
diff --git a/components/esp_rom/esp32c61/esp_rom_caps.h b/components/esp_rom/esp32c61/esp_rom_caps.h
index a910027a102..6949dbcfaf0 100644
--- a/components/esp_rom/esp32c61/esp_rom_caps.h
+++ b/components/esp_rom/esp32c61/esp_rom_caps.h
@@ -34,3 +34,4 @@
 #define ESP_ROM_HAS_SUBOPTIMAL_NEWLIB_ON_MISALIGNED_MEMORY  (1) // ROM mem/str functions are not optimized well for misaligned memory access.
 #define ESP_ROM_DELAY_US_PATCH              (1) // ROM ets_delay_us needs patch for U-mode operation
 #define ESP_ROM_BOOTLOADER_OFFSET_FLASH     (0x0) // Bootloader offset in flash determined by the ROM bootloader
+#define ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_NO_MAP (1) // ROM cache writeback related needs patch to avoid sync loss, no map parameter
diff --git a/components/esp_rom/esp32c61/include/esp32c61/rom/cache.h b/components/esp_rom/esp32c61/include/esp32c61/rom/cache.h
index 1e0f1baa0e9..2ba42350934 100644
--- a/components/esp_rom/esp32c61/include/esp32c61/rom/cache.h
+++ b/components/esp_rom/esp32c61/include/esp32c61/rom/cache.h
@@ -49,6 +49,8 @@ typedef enum {
     CACHE_SYNC_WRITEBACK_INVALIDATE = BIT(3),
 } cache_sync_t;
 
+#define CACHE_MAP_FLASH_CACHE BIT(4)
+
 typedef enum {
     CACHE_SIZE_HALF = 0,                /*!< 8KB for icache and dcache */
     CACHE_SIZE_FULL = 1,                /*!< 16KB for icache and dcache */
diff --git a/components/esp_rom/esp32c61/ld/esp32c61.rom.ld b/components/esp_rom/esp32c61/ld/esp32c61.rom.ld
index f0cde7e9106..5f72d41933d 100644
--- a/components/esp_rom/esp32c61/ld/esp32c61.rom.ld
+++ b/components/esp_rom/esp32c61/ld/esp32c61.rom.ld
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -188,12 +188,12 @@ Cache_Sync_Items = 0x4000062c;
 Cache_Op_Addr = 0x40000630;
 Cache_Invalidate_Addr = 0x40000634;
 Cache_Clean_Addr = 0x40000638;
-Cache_WriteBack_Addr = 0x4000063c;
-Cache_WriteBack_Invalidate_Addr = 0x40000640;
+PROVIDE( Cache_WriteBack_Addr = 0x4000063c );
+PROVIDE( Cache_WriteBack_Invalidate_Addr = 0x40000640 );
 Cache_Invalidate_All = 0x40000644;
 Cache_Clean_All = 0x40000648;
-Cache_WriteBack_All = 0x4000064c;
-Cache_WriteBack_Invalidate_All = 0x40000650;
+PROVIDE( Cache_WriteBack_All = 0x4000064c );
+PROVIDE( Cache_WriteBack_Invalidate_All = 0x40000650 );
 Cache_Mask_All = 0x40000654;
 Cache_UnMask_Dram0 = 0x40000658;
 Cache_Suspend_Autoload = 0x4000065c;
diff --git a/components/esp_rom/esp32h4/Kconfig.soc_caps.in b/components/esp_rom/esp32h4/Kconfig.soc_caps.in
index a69ac9ac3cf..9f22685b9a4 100644
--- a/components/esp_rom/esp32h4/Kconfig.soc_caps.in
+++ b/components/esp_rom/esp32h4/Kconfig.soc_caps.in
@@ -74,3 +74,7 @@ config ESP_ROM_RAM_APP_NEEDS_MMU_INIT
 config ESP_ROM_BOOTLOADER_OFFSET_FLASH
     hex
     default 0x2000
+
+config ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_NO_MAP
+    bool
+    default y
diff --git a/components/esp_rom/esp32h4/esp_rom_caps.h b/components/esp_rom/esp32h4/esp_rom_caps.h
index 0487f845fc8..6b1f02bcde4 100644
--- a/components/esp_rom/esp32h4/esp_rom_caps.h
+++ b/components/esp_rom/esp32h4/esp_rom_caps.h
@@ -24,3 +24,4 @@
 #define ESP_ROM_WDT_INIT_PATCH              (1) // ROM version does not configure the clock
 #define ESP_ROM_RAM_APP_NEEDS_MMU_INIT      (1) // ROM doesn't init cache MMU when it's a RAM APP, needs MMU hal to init
 #define ESP_ROM_BOOTLOADER_OFFSET_FLASH     (0x2000) // Bootloader offset in flash determined by the ROM bootloader
+#define ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_NO_MAP (1) // ROM cache writeback related needs patch to avoid sync loss, no map parameter
diff --git a/components/esp_rom/esp32h4/ld/esp32h4.rom.ld b/components/esp_rom/esp32h4/ld/esp32h4.rom.ld
index bd8486d5d2b..44b02fa5e3d 100644
--- a/components/esp_rom/esp32h4/ld/esp32h4.rom.ld
+++ b/components/esp_rom/esp32h4/ld/esp32h4.rom.ld
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -182,12 +182,12 @@ Cache_Sync_Items = 0x400005b8;
 Cache_Op_Addr = 0x400005bc;
 Cache_Invalidate_Addr = 0x400005c0;
 Cache_Clean_Addr = 0x400005c4;
-Cache_WriteBack_Addr = 0x400005c8;
-Cache_WriteBack_Invalidate_Addr = 0x400005cc;
+PROVIDE( Cache_WriteBack_Addr = 0x400005c8 );
+PROVIDE( Cache_WriteBack_Invalidate_Addr = 0x400005cc );
 Cache_Invalidate_All = 0x400005d0;
 Cache_Clean_All = 0x400005d4;
-Cache_WriteBack_All = 0x400005d8;
-Cache_WriteBack_Invalidate_All = 0x400005dc;
+PROVIDE( Cache_WriteBack_All = 0x400005d8 );
+PROVIDE( Cache_WriteBack_Invalidate_All = 0x400005dc );
 Cache_Mask_All = 0x400005e0;
 Cache_UnMask_Dram0 = 0x400005e4;
 Cache_Suspend_Autoload = 0x400005e8;
diff --git a/components/esp_rom/esp32p4/Kconfig.soc_caps.in b/components/esp_rom/esp32p4/Kconfig.soc_caps.in
index a50a11ba7f3..6fff9a2faff 100644
--- a/components/esp_rom/esp32p4/Kconfig.soc_caps.in
+++ b/components/esp_rom/esp32p4/Kconfig.soc_caps.in
@@ -90,3 +90,7 @@ config ESP_ROM_HAS_SUBOPTIMAL_NEWLIB_ON_MISALIGNED_MEMORY
 config ESP_ROM_BOOTLOADER_OFFSET_FLASH
     hex
     default 0x2000
+
+config ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_MAP
+    bool
+    default y
diff --git a/components/esp_rom/esp32p4/esp_rom_caps.h b/components/esp_rom/esp32p4/esp_rom_caps.h
index b8017acd0d2..886e497993a 100644
--- a/components/esp_rom/esp32p4/esp_rom_caps.h
+++ b/components/esp_rom/esp32p4/esp_rom_caps.h
@@ -28,3 +28,4 @@
 #define ESP_ROM_HAS_OUTPUT_PUTC_FUNC        (1) // ROM has esp_rom_output_putc (or ets_write_char_uart)
 #define ESP_ROM_HAS_SUBOPTIMAL_NEWLIB_ON_MISALIGNED_MEMORY  (1) // ROM mem/str functions are not optimized well for misaligned memory access.
 #define ESP_ROM_BOOTLOADER_OFFSET_FLASH     (0x2000) // Bootloader offset in flash determined by the ROM bootloader
+#define ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_MAP (1) // ROM cache writeback related needs patch to avoid sync loss, need map parameter
diff --git a/components/esp_rom/esp32p4/include/esp32p4/rom/cache.h b/components/esp_rom/esp32p4/include/esp32p4/rom/cache.h
index 0c5ba82533b..8fbc22de785 100644
--- a/components/esp_rom/esp32p4/include/esp32p4/rom/cache.h
+++ b/components/esp_rom/esp32p4/include/esp32p4/rom/cache.h
@@ -233,6 +233,7 @@ typedef enum {
 #define CACHE_MAP_L1_ICACHE_MASK (CACHE_MAP_L1_ICACHE_0 | CACHE_MAP_L1_ICACHE_1)
 #define CACHE_MAP_L1_CACHE_MASK  (CACHE_MAP_L1_ICACHE_MASK | CACHE_MAP_L1_DCACHE)
 #define CACHE_MAP_MASK           (CACHE_MAP_L1_ICACHE_MASK | CACHE_MAP_L1_DCACHE | CACHE_MAP_L2_CACHE)
+#define CACHE_MAP_DCACHE_MASK    (CACHE_MAP_L1_DCACHE | CACHE_MAP_L2_CACHE)
 
 struct cache_internal_stub_table {
     uint32_t (*l1_icache_line_size)(void);
diff --git a/components/esp_rom/esp32p4/ld/esp32p4.rom.eco0_4.ld b/components/esp_rom/esp32p4/ld/esp32p4.rom.eco0_4.ld
index 428f076109b..fb11cb9265c 100644
--- a/components/esp_rom/esp32p4/ld/esp32p4.rom.eco0_4.ld
+++ b/components/esp_rom/esp32p4/ld/esp32p4.rom.eco0_4.ld
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -187,17 +187,17 @@ Cache_Invalidate_Addr = 0x4fc003e4;
 Cache_Invalidate_Addr_Gid = 0x4fc003e8;
 Cache_Clean_Addr = 0x4fc003ec;
 Cache_Clean_Addr_Gid = 0x4fc003f0;
-Cache_WriteBack_Addr = 0x4fc003f4;
+PROVIDE (Cache_WriteBack_Addr = 0x4fc003f4 );
 Cache_WriteBack_Addr_Gid = 0x4fc003f8;
-Cache_WriteBack_Invalidate_Addr = 0x4fc003fc;
+PROVIDE( Cache_WriteBack_Invalidate_Addr = 0x4fc003fc );
 Cache_WriteBack_Invalidate_Addr_Gid = 0x4fc00400;
 Cache_Invalidate_All = 0x4fc00404;
 Cache_Invalidate_All_Gid = 0x4fc00408;
 Cache_Clean_All = 0x4fc0040c;
 Cache_Clean_All_Gid = 0x4fc00410;
-Cache_WriteBack_All = 0x4fc00414;
+PROVIDE( Cache_WriteBack_All = 0x4fc00414 );
 Cache_WriteBack_All_Gid = 0x4fc00418;
-Cache_WriteBack_Invalidate_All = 0x4fc0041c;
+PROVIDE( Cache_WriteBack_Invalidate_All = 0x4fc0041c );
 Cache_WriteBack_Invalidate_All_Gid = 0x4fc00420;
 Cache_Mask_All = 0x4fc00424;
 Cache_Suspend_L1_CORE0_ICache_Autoload = 0x4fc00428;
diff --git a/components/esp_rom/esp32p4/ld/esp32p4.rom.ld b/components/esp_rom/esp32p4/ld/esp32p4.rom.ld
index eb227ead1d7..65f0d1eb20e 100644
--- a/components/esp_rom/esp32p4/ld/esp32p4.rom.ld
+++ b/components/esp_rom/esp32p4/ld/esp32p4.rom.ld
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -187,17 +187,17 @@ Cache_Invalidate_Addr = 0x4fc003e4;
 Cache_Invalidate_Addr_Gid = 0x4fc003e8;
 Cache_Clean_Addr = 0x4fc003ec;
 Cache_Clean_Addr_Gid = 0x4fc003f0;
-Cache_WriteBack_Addr = 0x4fc003f4;
+PROVIDE( Cache_WriteBack_Addr = 0x4fc003f4 );
 Cache_WriteBack_Addr_Gid = 0x4fc003f8;
-Cache_WriteBack_Invalidate_Addr = 0x4fc003fc;
+PROVIDE( Cache_WriteBack_Invalidate_Addr = 0x4fc003fc );
 Cache_WriteBack_Invalidate_Addr_Gid = 0x4fc00400;
 Cache_Invalidate_All = 0x4fc00404;
 Cache_Invalidate_All_Gid = 0x4fc00408;
 Cache_Clean_All = 0x4fc0040c;
 Cache_Clean_All_Gid = 0x4fc00410;
-Cache_WriteBack_All = 0x4fc00414;
+PROVIDE( Cache_WriteBack_All = 0x4fc00414 );
 Cache_WriteBack_All_Gid = 0x4fc00418;
-Cache_WriteBack_Invalidate_All = 0x4fc0041c;
+PROVIDE( Cache_WriteBack_Invalidate_All = 0x4fc0041c );
 Cache_WriteBack_Invalidate_All_Gid = 0x4fc00420;
 Cache_Mask_All = 0x4fc00424;
 Cache_Suspend_L1_CORE0_ICache_Autoload = 0x4fc00428;
diff --git a/components/esp_rom/esp32s31/Kconfig.soc_caps.in b/components/esp_rom/esp32s31/Kconfig.soc_caps.in
index 1954ab04782..83db14746f3 100644
--- a/components/esp_rom/esp32s31/Kconfig.soc_caps.in
+++ b/components/esp_rom/esp32s31/Kconfig.soc_caps.in
@@ -94,3 +94,7 @@ config ESP_ROM_PRINTS_LOCKUP_STATUS
 config ESP_ROM_BOOTLOADER_OFFSET_FLASH
     hex
     default 0x2000
+
+config ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_MAP
+    bool
+    default y
diff --git a/components/esp_rom/esp32s31/esp_rom_caps.h b/components/esp_rom/esp32s31/esp_rom_caps.h
index e82e4614b11..b4499994a0e 100644
--- a/components/esp_rom/esp32s31/esp_rom_caps.h
+++ b/components/esp_rom/esp32s31/esp_rom_caps.h
@@ -30,3 +30,4 @@
 #define ESP_ROM_HAS_OUTPUT_PUTC_FUNC        (1) // ROM has esp_rom_output_putc (or ets_write_char_uart)
 #define ESP_ROM_PRINTS_LOCKUP_STATUS        (1) // ROM bootloader already prints CPU lockup diagnostic status
 #define ESP_ROM_BOOTLOADER_OFFSET_FLASH     (0x2000) // Bootloader offset in flash determined by the ROM bootloader
+#define ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_MAP (1) // ROM cache writeback related needs patch to avoid sync loss, need map parameter
diff --git a/components/esp_rom/esp32s31/include/esp32s31/rom/cache.h b/components/esp_rom/esp32s31/include/esp32s31/rom/cache.h
index e116547d880..167fa745270 100644
--- a/components/esp_rom/esp32s31/include/esp32s31/rom/cache.h
+++ b/components/esp_rom/esp32s31/include/esp32s31/rom/cache.h
@@ -163,6 +163,7 @@ typedef enum {
 
 #define CACHE_MAP_L1_ICACHE_MASK (CACHE_MAP_L1_ICACHE_0 | CACHE_MAP_L1_ICACHE_1)
 #define CACHE_MAP_MASK           (CACHE_MAP_L1_ICACHE_MASK | CACHE_MAP_L1_DCACHE)
+#define CACHE_MAP_DCACHE_MASK    (CACHE_MAP_L1_DCACHE)
 
 struct cache_internal_stub_table {
     uint32_t (*l1_icache_line_size)(void);
diff --git a/components/esp_rom/esp32s31/ld/esp32s31.rom.ld b/components/esp_rom/esp32s31/ld/esp32s31.rom.ld
index 702a4181658..bcb1c01162d 100644
--- a/components/esp_rom/esp32s31/ld/esp32s31.rom.ld
+++ b/components/esp_rom/esp32s31/ld/esp32s31.rom.ld
@@ -213,12 +213,12 @@ ROM_Boot_Cache_Init = 0x2f8005e0;
 Cache_Sync_Addr = 0x2f8005e4;
 Cache_Invalidate_Addr = 0x2f8005e8;
 Cache_Clean_Addr = 0x2f8005ec;
-Cache_WriteBack_Addr = 0x2f8005f0;
-Cache_WriteBack_Invalidate_Addr = 0x2f8005f4;
+PROVIDE( Cache_WriteBack_Addr = 0x2f8005f0 );
+PROVIDE( Cache_WriteBack_Invalidate_Addr = 0x2f8005f4 );
 Cache_Invalidate_All = 0x2f8005f8;
 Cache_Clean_All = 0x2f8005fc;
-Cache_WriteBack_All = 0x2f800600;
-Cache_WriteBack_Invalidate_All = 0x2f800604;
+PROVIDE( Cache_WriteBack_All = 0x2f800600 );
+PROVIDE( Cache_WriteBack_Invalidate_All = 0x2f800604 );
 Cache_Mask_All = 0x2f800608;
 Cache_Suspend_L1_CORE0_ICache_Autoload = 0x2f80060c;
 Cache_Resume_L1_CORE0_ICache_Autoload = 0x2f800610;
diff --git a/components/esp_rom/linker.lf b/components/esp_rom/linker.lf
index 73e9fa199b5..502d58bb743 100644
--- a/components/esp_rom/linker.lf
+++ b/components/esp_rom/linker.lf
@@ -9,3 +9,7 @@ entries:
         esp_rom_cache_esp32s2_esp32s3 (noflash)
     if ESP_ROM_HAS_CACHE_WRITEBACK_BUG = y:
         esp_rom_cache_writeback_esp32s3 (noflash)
+    if ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_MAP = y:
+        esp_rom_cache_writeback_esp32p4_esp32s31 (noflash)
+    if ESP_ROM_CACHE_WRITEBACK_NEEDS_SYNC_TWICE_NO_MAP = y:
+        esp_rom_cache_writeback_esp32c5_esp32c61_esp32h4 (noflash)
diff --git a/components/esp_rom/patches/esp_rom_cache_writeback_esp32c5_esp32c61_esp32h4.c b/components/esp_rom/patches/esp_rom_cache_writeback_esp32c5_esp32c61_esp32h4.c
new file mode 100644
index 00000000000..7c87535edb3
--- /dev/null
+++ b/components/esp_rom/patches/esp_rom_cache_writeback_esp32c5_esp32c61_esp32h4.c
@@ -0,0 +1,78 @@
+/*
+ * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+#include "soc/cache_reg.h"
+#include "rom/cache.h"
+
+// esp32c5, esp32c61 and esp32h4 do not need msp parameters in apis.
+int Cache_WriteBack_Addr(uint32_t addr, uint32_t size)
+{
+    uint32_t plus;
+    uint32_t cache_line_size = MIN_CACHE_LINE_SIZE;
+
+    plus = addr & (cache_line_size - 1);
+    addr -= plus;
+    size += plus;
+    size = (size + cache_line_size - 1) & ~(cache_line_size - 1);
+
+    REG_WRITE(CACHE_SYNC_MAP_REG, CACHE_MAP_FLASH_CACHE);
+    REG_WRITE(CACHE_SYNC_ADDR_REG, addr);
+    REG_WRITE(CACHE_SYNC_SIZE_REG, size);
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    return 0;
+}
+
+void Cache_WriteBack_All(void)
+{
+    REG_WRITE(CACHE_SYNC_MAP_REG, CACHE_MAP_FLASH_CACHE);
+    REG_WRITE(CACHE_SYNC_ADDR_REG, 0);
+    REG_WRITE(CACHE_SYNC_SIZE_REG, 0);
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+}
+
+int Cache_WriteBack_Invalidate_Addr(uint32_t addr, uint32_t size)
+{
+    uint32_t plus;
+    uint32_t cache_line_size = MIN_CACHE_LINE_SIZE;
+
+    plus = addr & (cache_line_size - 1);
+    addr -= plus;
+    size += plus;
+    size = (size + cache_line_size - 1) & ~(cache_line_size - 1);
+
+    REG_WRITE(CACHE_SYNC_MAP_REG, CACHE_MAP_FLASH_CACHE);
+    REG_WRITE(CACHE_SYNC_ADDR_REG, addr);
+    REG_WRITE(CACHE_SYNC_SIZE_REG, size);
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_INVALIDATE_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_INVALIDATE_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    return 0;
+}
+
+void Cache_WriteBack_Invalidate_All(void)
+{
+    REG_WRITE(CACHE_SYNC_MAP_REG, CACHE_MAP_FLASH_CACHE);
+    REG_WRITE(CACHE_SYNC_ADDR_REG, 0);
+    REG_WRITE(CACHE_SYNC_SIZE_REG, 0);
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_INVALIDATE_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_INVALIDATE_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+}
diff --git a/components/esp_rom/patches/esp_rom_cache_writeback_esp32p4_esp32s31.c b/components/esp_rom/patches/esp_rom_cache_writeback_esp32p4_esp32s31.c
new file mode 100644
index 00000000000..702ad6da01f
--- /dev/null
+++ b/components/esp_rom/patches/esp_rom_cache_writeback_esp32p4_esp32s31.c
@@ -0,0 +1,141 @@
+/*
+ * SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <stdint.h>
+#include "soc/cache_reg.h"
+#include "rom/cache.h"
+#include "esp_attr.h"
+#include "esp_rom_sys.h"
+
+// esp32p4 and esp32s31 need msp parameters in apis.
+int Cache_WriteBack_Addr(uint32_t map, uint32_t addr, uint32_t size)
+{
+    uint32_t plus;
+    uint32_t cache_line_size = 0;
+    /* writeback readonly cache is invalid */
+    if (map & CACHE_MAP_L1_ICACHE_MASK) {
+        return ESP_ROM_ERR_INVALID_ARG;
+    }
+
+    if ((map & CACHE_MAP_DCACHE_MASK) == 0) {
+        return ESP_ROM_ERR_INVALID_ARG;
+    }
+#if CONFIG_IDF_TARGET_ESP32P4
+    /* esp32p4 will check l2 cache */
+    if (map & CACHE_MAP_L1_DCACHE) {
+        cache_line_size = rom_cache_internal_table_ptr->l1_dcache_line_size();
+    }
+    if (map & CACHE_MAP_L2_CACHE) {
+        cache_line_size = (cache_line_size > rom_cache_internal_table_ptr->l2_cache_line_size()) ?
+            cache_line_size : rom_cache_internal_table_ptr->l2_cache_line_size();
+    }
+#else
+    cache_line_size = rom_cache_internal_table_ptr->l1_dcache_line_size();
+#endif
+
+    plus = addr & (cache_line_size - 1);
+    addr -= plus;
+    size += plus;
+    size = (size + cache_line_size - 1) & ~(cache_line_size - 1);
+    REG_WRITE(CACHE_SYNC_MAP_REG, map);
+    REG_WRITE(CACHE_SYNC_ADDR_REG, addr);
+    REG_WRITE(CACHE_SYNC_SIZE_REG, size);
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    return 0;
+}
+
+int Cache_WriteBack_All(uint32_t map)
+{
+    /* writeback readonly cache is invalid */
+    if (map & CACHE_MAP_L1_ICACHE_MASK) {
+        return ESP_ROM_ERR_INVALID_ARG;
+    }
+
+    if ((map & CACHE_MAP_DCACHE_MASK) == 0) {
+        return ESP_ROM_ERR_INVALID_ARG;
+    }
+
+    REG_WRITE(CACHE_SYNC_MAP_REG, map);
+    REG_WRITE(CACHE_SYNC_ADDR_REG, 0);
+    REG_WRITE(CACHE_SYNC_SIZE_REG, 0);
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    return 0;
+}
+
+int Cache_WriteBack_Invalidate_Addr(uint32_t map, uint32_t addr, uint32_t size)
+{
+    uint32_t plus;
+    uint32_t cache_line_size = 0;
+    /* writeback readonly cache is invalid */
+    if (map & CACHE_MAP_L1_ICACHE_MASK) {
+        return ESP_ROM_ERR_INVALID_ARG;
+    }
+
+    if ((map & CACHE_MAP_DCACHE_MASK) == 0) {
+        return ESP_ROM_ERR_INVALID_ARG;
+    }
+#if CONFIG_IDF_TARGET_ESP32P4
+    /* esp32p4 will check l2 cache */
+    if (map & CACHE_MAP_L1_DCACHE) {
+        cache_line_size = rom_cache_internal_table_ptr->l1_dcache_line_size();
+    }
+    if (map & CACHE_MAP_L2_CACHE) {
+        cache_line_size = (cache_line_size > rom_cache_internal_table_ptr->l2_cache_line_size()) ?
+            cache_line_size : rom_cache_internal_table_ptr->l2_cache_line_size();
+    }
+#else
+    cache_line_size = rom_cache_internal_table_ptr->l1_dcache_line_size();
+#endif
+
+    plus = addr & (cache_line_size - 1);
+    addr -= plus;
+    size += plus;
+    size = (size + cache_line_size - 1) & ~(cache_line_size - 1);
+
+    REG_WRITE(CACHE_SYNC_MAP_REG, map);
+    REG_WRITE(CACHE_SYNC_ADDR_REG, addr);
+    REG_WRITE(CACHE_SYNC_SIZE_REG, size);
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_INVALIDATE_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_INVALIDATE_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    return 0;
+}
+
+int Cache_WriteBack_Invalidate_All(uint32_t map)
+{
+    /* writeback readonly cache is invalid */
+    if (map & CACHE_MAP_L1_ICACHE_MASK) {
+        return ESP_ROM_ERR_INVALID_ARG;
+    }
+
+    if ((map & CACHE_MAP_DCACHE_MASK) == 0) {
+        return ESP_ROM_ERR_INVALID_ARG;
+    }
+
+    REG_WRITE(CACHE_SYNC_MAP_REG, map);
+    REG_WRITE(CACHE_SYNC_ADDR_REG, 0);
+    REG_WRITE(CACHE_SYNC_SIZE_REG, 0);
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_INVALIDATE_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    REG_WRITE(CACHE_SYNC_CTRL_REG, CACHE_WRITEBACK_INVALIDATE_ENA);
+    while (!REG_GET_BIT(CACHE_SYNC_CTRL_REG, CACHE_SYNC_DONE));
+
+    return 0;
+}