diff options
| author | Peng Fan <peng.fan@nxp.com> | 2017-11-28 05:31:28 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-04 18:23:52 +0300 |
| commit | 90351547ceeb76c1337757c51af0fb5a2c30bd02 (patch) | |
| tree | 459dbae28fa78fa410dd18d3bd8e4f12c56fa0fb /arch/arm | |
| parent | 082693f4f02ad7a9de192e73feae34e28856b8e3 (diff) | |
| download | u-boot-90351547ceeb76c1337757c51af0fb5a2c30bd02.tar.xz | |
armv8: mmu: fix page table mapping
To page mapping the lowest 2 bits needs to be 0x3.
If not fix this, the final lowest 3 bits for page mapping is 0x1
which is marked as reserved.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/armv8/cache_v8.c | 5 | ||||
| -rw-r--r-- | arch/arm/include/asm/armv8/mmu.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/cache_v8.c b/arch/arm/cpu/armv8/cache_v8.c index adc7e1746f..6548f3c912 100644 --- a/arch/arm/cpu/armv8/cache_v8.c +++ b/arch/arm/cpu/armv8/cache_v8.c @@ -230,7 +230,10 @@ static void add_map(struct mm_region *map) /* Page fits, create block PTE */ debug("Setting PTE %p to block virt=%llx\n", pte, virt); - *pte = phys | attrs; + if (level == 3) + *pte = phys | attrs | PTE_TYPE_PAGE; + else + *pte = phys | attrs; virt += blocksize; phys += blocksize; size -= blocksize; diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h index 6121aab547..765914c7e2 100644 --- a/arch/arm/include/asm/armv8/mmu.h +++ b/arch/arm/include/asm/armv8/mmu.h @@ -43,6 +43,7 @@ #define PTE_TYPE_MASK (3 << 0) #define PTE_TYPE_FAULT (0 << 0) #define PTE_TYPE_TABLE (3 << 0) +#define PTE_TYPE_PAGE (3 << 0) #define PTE_TYPE_BLOCK (1 << 0) #define PTE_TYPE_VALID (1 << 0) |