Merge branch 'bugfix/fix_cache_access_error_in_wifi_interrupt' into 'master'

fix(wifi): fix cache access error in wifi interrupt with psram enabled

Closes WIFIBUG-1964 and WIFIBUG-1970

See merge request espressif/esp-idf!49645
This commit is contained in:
Jiang Jiang Jian
2026-06-18 18:07:17 +08:00
7 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ void * esp_coex_common_spin_lock_create_wrapper(void)
void *mux = heap_caps_malloc(sizeof(portMUX_TYPE), MALLOC_CAP_8BIT|MALLOC_CAP_INTERNAL);
if (mux) {
memcpy(mux,&tmp,sizeof(portMUX_TYPE));
memcpy(mux, &tmp, sizeof(portMUX_TYPE));
return mux;
}
return NULL;
@@ -39,7 +39,7 @@ bool IRAM_ATTR esp_coex_common_env_is_chip_wrapper(void)
void *esp_coex_common_spin_lock_create_wrapper(void)
{
portMUX_TYPE tmp = portMUX_INITIALIZER_UNLOCKED;
void *mux = malloc(sizeof(portMUX_TYPE));
void *mux = heap_caps_malloc(sizeof(portMUX_TYPE), MALLOC_CAP_8BIT|MALLOC_CAP_INTERNAL);
if (mux) {
memcpy(mux, &tmp, sizeof(portMUX_TYPE));
@@ -40,7 +40,7 @@ bool IRAM_ATTR esp_coex_common_env_is_chip_wrapper(void)
void *esp_coex_common_spin_lock_create_wrapper(void)
{
portMUX_TYPE tmp = portMUX_INITIALIZER_UNLOCKED;
void *mux = malloc(sizeof(portMUX_TYPE));
void *mux = heap_caps_malloc(sizeof(portMUX_TYPE), MALLOC_CAP_8BIT|MALLOC_CAP_INTERNAL);
if (mux) {
memcpy(mux, &tmp, sizeof(portMUX_TYPE));
@@ -40,7 +40,7 @@ bool IRAM_ATTR esp_coex_common_env_is_chip_wrapper(void)
void *esp_coex_common_spin_lock_create_wrapper(void)
{
portMUX_TYPE tmp = portMUX_INITIALIZER_UNLOCKED;
void *mux = malloc(sizeof(portMUX_TYPE));
void *mux = heap_caps_malloc(sizeof(portMUX_TYPE), MALLOC_CAP_8BIT|MALLOC_CAP_INTERNAL);
if (mux) {
memcpy(mux, &tmp, sizeof(portMUX_TYPE));
@@ -40,10 +40,10 @@ bool IRAM_ATTR esp_coex_common_env_is_chip_wrapper(void)
void *esp_coex_common_spin_lock_create_wrapper(void)
{
portMUX_TYPE tmp = portMUX_INITIALIZER_UNLOCKED;
void *mux = malloc(sizeof(portMUX_TYPE));
void *mux = heap_caps_malloc(sizeof(portMUX_TYPE), MALLOC_CAP_8BIT|MALLOC_CAP_INTERNAL);
if (mux) {
memcpy(mux, &tmp, sizeof(portMUX_TYPE));
memcpy(mux,&tmp,sizeof(portMUX_TYPE));
return mux;
}
return NULL;
@@ -26,7 +26,7 @@ pm_check_state = 0x40000cb4;
pm_set_beacon_filter = 0x40000cd8;
//pm_is_in_wifi_slice_threshold = 0x40000cdc;
//pm_keep_alive = 0x40000ce4;
pm_process_tim = 0x40000d14;
//pm_process_tim = 0x40000d14;
//pm_tbtt_process = 0x40000d28;
pm_tx_data_process = 0x40000d44;
pm_twt_process = 0x40000d54;