mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
fix(esp_hw_support): fix core1 branch predictor access ext mem after cache disabled by core0
This commit is contained in:
@@ -484,6 +484,7 @@ esp_err_t sleep_cpu_configure(bool light_sleep_enable)
|
|||||||
#if CONFIG_PM_ESP_SLEEP_POWER_DOWN_CPU
|
#if CONFIG_PM_ESP_SLEEP_POWER_DOWN_CPU
|
||||||
static IRAM_ATTR void smp_core_do_retention(void)
|
static IRAM_ATTR void smp_core_do_retention(void)
|
||||||
{
|
{
|
||||||
|
esp_cpu_branch_prediction_disable();
|
||||||
uint8_t core_id = esp_cpu_get_core_id();
|
uint8_t core_id = esp_cpu_get_core_id();
|
||||||
|
|
||||||
if (core_id == 0) {
|
if (core_id == 0) {
|
||||||
@@ -559,6 +560,7 @@ static IRAM_ATTR void smp_core_do_retention(void)
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
atomic_store(&s_smp_retention_state[core_id], SMP_IDLE);
|
atomic_store(&s_smp_retention_state[core_id], SMP_IDLE);
|
||||||
|
esp_cpu_branch_prediction_enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -386,6 +386,7 @@ esp_err_t sleep_cpu_configure(bool light_sleep_enable)
|
|||||||
#if CONFIG_PM_ESP_SLEEP_POWER_DOWN_CPU
|
#if CONFIG_PM_ESP_SLEEP_POWER_DOWN_CPU
|
||||||
static SPM_IRAM_ATTR void smp_core_do_retention(void)
|
static SPM_IRAM_ATTR void smp_core_do_retention(void)
|
||||||
{
|
{
|
||||||
|
esp_cpu_branch_prediction_disable();
|
||||||
uint8_t core_id = esp_cpu_get_core_id();
|
uint8_t core_id = esp_cpu_get_core_id();
|
||||||
|
|
||||||
if (core_id == 0) {
|
if (core_id == 0) {
|
||||||
@@ -452,6 +453,7 @@ static SPM_IRAM_ATTR void smp_core_do_retention(void)
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
atomic_store(&s_smp_retention_state[core_id], SMP_IDLE);
|
atomic_store(&s_smp_retention_state[core_id], SMP_IDLE);
|
||||||
|
esp_cpu_branch_prediction_enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user