esp32: Flush D-cache on targets that can execute from normal RAM.

This is necessary to get native code running on the ESP32-P4.

Signed-off-by: Damien George <[email protected]>

Author: dpgeorge

ports/esp32/esp32_common.cmake

@@ -166,6 +166,7 @@ list(APPEND IDF_COMPONENTS
     driver
     esp_adc
     esp_app_format
+    esp_mm
     esp_common
     esp_driver_touch_sens
     esp_eth

ports/esp32/main.c

@@ -34,6 +34,7 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+#include "esp_cache.h"
 #include "esp_system.h"
 #include "nvs_flash.h"
 #include "esp_task.h"
@@ -295,6 +296,20 @@ static void esp_native_code_free_all(void) {
 }
 
 void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
+    #if SOC_CPU_IDRAM_SPLIT_USING_PMP && !CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT
+    // On targets with this configuration all RAM is executable.
+    // So just do the native relocation (if needed) and flush the D-cache.
+
+    if (reloc) {
+        mp_native_relocate(reloc, buf, (uintptr_t)buf);
+    }
+    esp_cache_msync(buf, len, ESP_CACHE_MSYNC_FLAG_UNALIGNED | ESP_CACHE_MSYNC_FLAG_DIR_C2M);
+    return buf;
+
+    #else
+    // On targets with this configuration only certain RAM is executable.
+    // So reallocate executable RAM for the native code and copy it across.
+
     len = (len + 3) & ~3;
     size_t len_node = sizeof(native_code_node_t) + len;
     native_code_node_t *node = heap_caps_malloc(len_node, MALLOC_CAP_EXEC);
@@ -316,4 +331,6 @@ void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
     }
     memcpy(p, buf, len);
     return p;
+
+    #endif
 }

ports/esp32/mpconfigport.h

@@ -289,12 +289,8 @@
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
-#if SOC_CPU_IDRAM_SPLIT_USING_PMP && !CONFIG_ESP_SYSTEM_PMP_IDRAM_SPLIT
-// On targets with this configuration all RAM is executable so no need for a custom commit function.
-#else
 void *esp_native_code_commit(void *, size_t, void *);
 #define MP_PLAT_COMMIT_EXEC(buf, len, reloc) esp_native_code_commit(buf, len, reloc)
-#endif
 #define MP_SSIZE_MAX (0x7fffffff)
 
 #if MICROPY_PY_SOCKET_EVENTS