diff options
| author | Kristina Martsenko <kristina.martsenko@arm.com> | 2018-01-18 20:13:11 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2018-01-19 14:09:40 +0100 |
| commit | e9eaa8052fe71b95f4fea6072fa3e0b2cf0b620f (patch) | |
| tree | eb7f4fca42a6d238cb3b66d744d60d171f042913 /arch | |
| parent | arm64: kpti: Fix the interaction between ASID switching and software PAN (diff) | |
| download | linux-e9eaa8052fe71b95f4fea6072fa3e0b2cf0b620f.tar.xz linux-e9eaa8052fe71b95f4fea6072fa3e0b2cf0b620f.zip | |
arm64: mm: ignore memory above supported physical address size
When booting a kernel without 52-bit PA support (e.g. a kernel with 4k
pages) on a system with 52-bit memory, the kernel will currently try to
use the 52-bit memory and crash. Fix this by ignoring any memory higher
than what the kernel supports.
Fixes: f77d281713d4 ("arm64: enable 52-bit physical address support")
Signed-off-by: Kristina Martsenko <kristina.martsenko@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/mm/init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 672094ed7e07..285745b2ca38 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -366,6 +366,9 @@ void __init arm64_memblock_init(void) /* Handle linux,usable-memory-range property */ fdt_enforce_memory_region(); + /* Remove memory above our supported physical address size */ + memblock_remove(1ULL << PHYS_MASK_SHIFT, ULLONG_MAX); + /* * Ensure that the linear region takes up exactly half of the kernel * virtual address space. This way, we can distinguish a linear address |