Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change/change_to_only_do_v2p_once_when_startup_v5.5' into 'release/v5.5'

Browse Source 
mmu: no longer disable cache when converting virtual addr to physical addr and vice versa (v5.5)

See merge request espressif/esp-idf!45476
This commit is contained in:
morris
2026-03-02 11:29:49 +08:00
parent ae27433132 58c57da9f8
commit 272e620c62
5 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_mm/esp_mmu_map.c
+8 -15
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -777,13 +777,11 @@ esp_err_t IRAM_ATTR esp_mmu_map_dump_mapped_blocks_private(void)
/*---------------------------------------------------------------
Helper APIs for conversion between vaddr and paddr
---------------------------------------------------------------*/
static bool NOINLINE_ATTR IRAM_ATTR s_vaddr_to_paddr(uint32_t vaddr, esp_paddr_t *out_paddr, mmu_target_t *out_target)
static bool s_vaddr_to_paddr(uint32_t vaddr, esp_paddr_t *out_paddr, mmu_target_t *out_target)
{
uint32_t mmu_id = 0;
/**
* Disable Cache, after this function, involved code and data should be placed in internal RAM.
*/
s_stop_cache();
_lock_acquire(&s_mmu_ctx.mutex);
#if SOC_MMU_PER_EXT_MEM_TARGET
mmu_id = mmu_hal_get_id_from_vaddr(vaddr);
@@ -795,8 +793,7 @@ static bool NOINLINE_ATTR IRAM_ATTR s_vaddr_to_paddr(uint32_t vaddr, esp_paddr_t
}
#endif
//enable Cache, after this function, internal RAM access is no longer mandatory
s_start_cache();
_lock_release(&s_mmu_ctx.mutex);
return is_mapped;
}
@@ -818,12 +815,9 @@ esp_err_t esp_mmu_vaddr_to_paddr(void *vaddr, esp_paddr_t *out_paddr, mmu_target
return ESP_OK;
}
static bool NOINLINE_ATTR IRAM_ATTR s_paddr_to_vaddr(esp_paddr_t paddr, mmu_target_t target, mmu_vaddr_t type, uint32_t *out_vaddr)
static bool s_paddr_to_vaddr(esp_paddr_t paddr, mmu_target_t target, mmu_vaddr_t type, uint32_t *out_vaddr)
{
/**
* Disable Cache, after this function, involved code and data should be placed in internal RAM.
*/
s_stop_cache();
_lock_acquire(&s_mmu_ctx.mutex);
uint32_t mmu_id = 0;
#if SOC_MMU_PER_EXT_MEM_TARGET
@@ -831,8 +825,7 @@ static bool NOINLINE_ATTR IRAM_ATTR s_paddr_to_vaddr(esp_paddr_t paddr, mmu_targ
#endif
bool found = mmu_hal_paddr_to_vaddr(mmu_id, paddr, target, type, out_vaddr);
//enable Cache, after this function, internal RAM access is no longer mandatory
s_start_cache();
_lock_release(&s_mmu_ctx.mutex);
return found;
}