nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

arm64_mmu: Fix TLBI instruction format

Browse source 
The vaddr field in TLBI means: Bits[55:12] of the virtual address to match.
This basically means the page offset of the virtual address, so the input
vaddr must be shifted to the page offset.

Reference TLBI VALE1IS register description from ARMv8-A reference manual.
This commit is contained in:
Ville Juven 2024-08-29 15:15:52 +03:00 committed by Xiang Xiao
parent fbc796cff1
commit 4149e45450
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/arm64/src/common/arm64_mmu.h
View file

@ -186,6 +186,26 @@
#define TTBR_ASID_WIDTH (16)
#define TTBR_ASID_MASK (((1UL << TTBR_ASID_WIDTH) - 1) << TTBR_ASID_SHIFT)
/* TLBI instruction */
#define TLBI_VADDR_SHIFT (0)
#define TLBI_VADDR_INPUT_SHIFT (12) /* From input vaddr to TLBI vaddr field */
#define TLBI_VADDR_WIDTH (43)
#define TLBI_VADDR_MASK (((1UL << TLBI_VADDR_WIDTH) - 1) << TLBI_VADDR_SHIFT)
#define TLBI_ASID_SHIFT (48)
#define TLBI_ASID_WIDTH (16)
#define TLBI_ASID_MASK (((1UL << TLBI_ASID_WIDTH) - 1) << TLBI_ASID_SHIFT)
/* Create an argument suitable for TLBI, with vaddr and asid as inputs */
#define TLBI_ARG(vaddr, asid) \
({ \
uintptr_t __arg; \
__arg = ((vaddr) >> TLBI_VADDR_INPUT_SHIFT) & TLBI_VADDR_MASK; \
__arg |= (uintptr_t)(asid) << TLBI_ASID_SHIFT; \
__arg; \
})
/* Convenience macros to represent the ARMv8-A-specific
* configuration for memory access permission and
* cache-ability attribution.
@ -358,7 +378,7 @@ static inline void mmu_invalidate_tlb_by_vaddr(uintptr_t vaddr)
"dsb ish\n"
"isb"
:
: "r" (vaddr)
: "r" (TLBI_ARG(vaddr, 0))
: "memory"
);
}