aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/mm/mmu.c
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2015-11-23 13:26:20 +0000
committerWill Deacon <will.deacon@arm.com>2015-12-01 09:47:03 +0000
commit9c4e08a3022b6df90d31ef4007291faabfce5431 (patch)
tree2db2d24ea259598910e21d0eecb261ff0a2bc519 /arch/arm64/mm/mmu.c
parentarm64: mm: detect bad __create_mapping uses (diff)
downloadlinux-dev-9c4e08a3022b6df90d31ef4007291faabfce5431.tar.xz
linux-dev-9c4e08a3022b6df90d31ef4007291faabfce5431.zip
arm64: mm: allow sections for unaligned bases
Callees of __create_mapping may decide to create section mappings if sufficient low bits of the physical and virtual addresses they were passed are zero. While __create_mapping rounds the virtual base address down, it does not similarly round the physical base address down, and hence non-zero bits in the physical address can prevent use of a section mapping, even where a whole next-level table would be used instead. Round down the physical base address in __create_mapping to enable all callees to always create section mappings when such a mapping is possible. Cc: Laura Abbott <labbott@fedoraproject.org> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Reviewed-by: Steve Capper <steve.capper@linaro.org> Signed-off-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/mm/mmu.c')
-rw-r--r--arch/arm64/mm/mmu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 6e4b4351ce9e..bb42ac116a25 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -258,6 +258,7 @@ static void __create_mapping(struct mm_struct *mm, pgd_t *pgd,
if (WARN_ON((phys ^ virt) & ~PAGE_MASK))
return;
+ phys &= PAGE_MASK;
addr = virt & PAGE_MASK;
length = PAGE_ALIGN(size + (virt & ~PAGE_MASK));