feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_xip_from_psram_cache_disable_issue_v5.0' into 'release/v5.0'

Browse Source 
system: don't disable cache if Flash .text and .rodata are moved to PSRAM (v5.0)

See merge request espressif/esp-idf!21540
This commit is contained in:
morris
2022-12-12 11:37:27 +08:00
parent 818ba6affb 06e1ff2881
commit 987e6b4e29
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/spi_flash/spi_flash_os_func_app.c
View File

@@ -22,6 +22,7 @@
#include "esp_private/spi_common_internal.h" #include "esp_private/spi_common_internal.h"
#define SPI_FLASH_CACHE_NO_DISABLE (CONFIG_SPI_FLASH_AUTO_SUSPEND || (CONFIG_SPIRAM_FETCH_INSTRUCTIONS && CONFIG_SPIRAM_RODATA))
static const char TAG[] = "spi_flash"; static const char TAG[] = "spi_flash";
/* /*
@@ -60,14 +61,14 @@ static inline bool on_spi1_check_yield(spi1_app_func_arg_t* ctx);
IRAM_ATTR static void cache_enable(void* arg) IRAM_ATTR static void cache_enable(void* arg)
{ {
#ifndef CONFIG_SPI_FLASH_AUTO_SUSPEND #if !SPI_FLASH_CACHE_NO_DISABLE
spi_flash_enable_interrupts_caches_and_other_cpu(); spi_flash_enable_interrupts_caches_and_other_cpu();
#endif #endif
} }
IRAM_ATTR static void cache_disable(void* arg) IRAM_ATTR static void cache_disable(void* arg)
{ {
#ifndef CONFIG_SPI_FLASH_AUTO_SUSPEND #if !SPI_FLASH_CACHE_NO_DISABLE
spi_flash_disable_interrupts_caches_and_other_cpu(); spi_flash_disable_interrupts_caches_and_other_cpu();
#endif #endif
} }