Skip to content

Commit e709cbe

Browse files
dcpleungcfriedt
authored andcommitted
xtensa: mmu: fix __arch_mem_map assert message
The assert error messages when l2_page_table_map() fails are not correct. It returns false when it cannot allocate new L2 table, and it is not able the address having already mapped. So correct the error message. Signed-off-by: Daniel Leung <daniel.leung@intel.com>
1 parent 1f07b5b commit e709cbe

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/xtensa/core/ptables.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,12 @@ static inline void __arch_mem_map(void *va, uintptr_t pa, uint32_t xtensa_flags,
448448

449449
ret = l2_page_table_map(xtensa_kernel_ptables, (void *)vaddr, paddr,
450450
flags, is_user);
451-
__ASSERT(ret, "Virtual address (%p) already mapped", va);
451+
__ASSERT(ret, "Cannot map virtual address (%p)", va);
452452

453453
if (IS_ENABLED(CONFIG_XTENSA_MMU_DOUBLE_MAP) && ret) {
454454
ret = l2_page_table_map(xtensa_kernel_ptables, (void *)vaddr_uc, paddr_uc,
455455
flags_uc, is_user);
456-
__ASSERT(ret, "Virtual address (%p) already mapped", vaddr_uc);
456+
__ASSERT(ret, "Cannot map virtual address (%p)", vaddr_uc);
457457
}
458458

459459
#ifndef CONFIG_USERSPACE
@@ -470,14 +470,14 @@ static inline void __arch_mem_map(void *va, uintptr_t pa, uint32_t xtensa_flags,
470470

471471
ret = l2_page_table_map(domain->ptables, (void *)vaddr, paddr,
472472
flags, is_user);
473-
__ASSERT(ret, "Virtual address (%p) already mapped for domain %p",
473+
__ASSERT(ret, "Cannot map virtual address (%p) for domain %p",
474474
vaddr, domain);
475475

476476
if (IS_ENABLED(CONFIG_XTENSA_MMU_DOUBLE_MAP) && ret) {
477477
ret = l2_page_table_map(domain->ptables,
478478
(void *)vaddr_uc, paddr_uc,
479479
flags_uc, is_user);
480-
__ASSERT(ret, "Virtual address (%p) already mapped for domain %p",
480+
__ASSERT(ret, "Cannot map virtual address (%p) for domain %p",
481481
vaddr_uc, domain);
482482
}
483483
}

0 commit comments

Comments
 (0)