alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-20 00:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cache): fixed cache hal ctx not initialised in app issue

Browse Source
This commit is contained in:
Armando
2024-12-16 11:53:33 +08:00
parent eb79d784e0
commit 218947014c
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_system/port/cpu_start.c
View File

@@ -45,7 +45,6 @@
#include "soc/assist_debug_reg.h" #include "soc/assist_debug_reg.h"
#include "soc/system_reg.h" #include "soc/system_reg.h"
#include "esp32s3/rom/opi_flash.h" #include "esp32s3/rom/opi_flash.h"
#include "hal/cache_hal.h"
#elif CONFIG_IDF_TARGET_ESP32C3 #elif CONFIG_IDF_TARGET_ESP32C3
#include "esp32c3/rtc.h" #include "esp32c3/rtc.h"
#include "esp32c3/rom/cache.h" #include "esp32c3/rom/cache.h"
@@ -83,6 +82,7 @@
#include "esp_private/sleep_gpio.h" #include "esp_private/sleep_gpio.h"
#include "hal/wdt_hal.h" #include "hal/wdt_hal.h"
#include "soc/rtc.h" #include "soc/rtc.h"
#include "hal/cache_hal.h"
#include "hal/cache_ll.h" #include "hal/cache_ll.h"
#include "hal/efuse_ll.h" #include "hal/efuse_ll.h"
#include "soc/periph_defs.h" #include "soc/periph_defs.h"
@@ -374,6 +374,11 @@ void IRAM_ATTR call_start_cpu0(void)
#endif #endif
#endif // !CONFIG_APP_BUILD_TYPE_PURE_RAM_APP #endif // !CONFIG_APP_BUILD_TYPE_PURE_RAM_APP
#if !CONFIG_APP_BUILD_TYPE_PURE_RAM_APP
//cache hal ctx needs to be initialised
cache_hal_init();
#endif
// When the APP is loaded into ram for execution, some hardware initialization behaviors // When the APP is loaded into ram for execution, some hardware initialization behaviors
// in the bootloader are still necessary // in the bootloader are still necessary
#if CONFIG_APP_BUILD_TYPE_RAM #if CONFIG_APP_BUILD_TYPE_RAM

7
components/hal/esp32/cache_hal_esp32.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -8,6 +8,11 @@
static uint32_t s_cache_status[2]; static uint32_t s_cache_status[2];
void cache_hal_init(void)
{
//for compatibility
}
void cache_hal_suspend(cache_type_t type) void cache_hal_suspend(cache_type_t type)
{ {
s_cache_status[0] = cache_ll_l1_get_enabled_bus(0); s_cache_status[0] = cache_ll_l1_get_enabled_bus(0);