bartoszek/zephyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xtensa: mmu: fix incorrect caching attrs on double mapping

Browse Source 
Inside map_memory() with double mapping enabled, we should not
be mapping the memory with the incoming attributes as-is since
the incoming address may be on un-cached region but with
caching attribute. So we need to sanitize the attributes
according to the incoming address.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2025-01-10 15:24:37 -08:00 committed by Benjamin Cabé
parent 4b5ceb9dd0
commit c925b0ecd5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/xtensa/core/ptables.c
View File

@ -250,18 +250,25 @@ static void map_memory_range(const uint32_t start, const uint32_t end,
static void map_memory(const uint32_t start, const uint32_t end,
const uint32_t attrs)
{
map_memory_range(start, end, attrs);
#ifdef CONFIG_XTENSA_MMU_DOUBLE_MAP
uint32_t uc_attrs = attrs & ~XTENSA_MMU_PTE_ATTR_CACHED_MASK;
uint32_t c_attrs = attrs | XTENSA_MMU_CACHED_WB;
if (sys_cache_is_ptr_uncached((void *)start)) {
map_memory_range(start, end, uc_attrs);
map_memory_range(POINTER_TO_UINT(sys_cache_cached_ptr_get((void *)start)),
POINTER_TO_UINT(sys_cache_cached_ptr_get((void *)end)),
attrs | XTENSA_MMU_CACHED_WB);
POINTER_TO_UINT(sys_cache_cached_ptr_get((void *)end)), c_attrs);
} else if (sys_cache_is_ptr_cached((void *)start)) {
map_memory_range(start, end, c_attrs);
map_memory_range(POINTER_TO_UINT(sys_cache_uncached_ptr_get((void *)start)),
POINTER_TO_UINT(sys_cache_uncached_ptr_get((void *)end)), attrs);
}
POINTER_TO_UINT(sys_cache_uncached_ptr_get((void *)end)), uc_attrs);
} else
#endif
{
map_memory_range(start, end, attrs);
}
}
static void xtensa_init_page_tables(void)