summaryrefslogtreecommitdiff
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
committerAlex Shi <alex.shi@linaro.org>2016-05-11 15:56:04 +0800
commit6329e5d3b74540578dbbf4550fdc53c52c706c94 (patch)
tree5e6ae592588fe9f6ae01025e0f83e339c781ad8f /arch/arm64/mm/mmu.c
parentcc798dcca00a8b71e5c09a38d3921461f931c85f (diff)
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> (cherry picked from commit 9c4e08a3022b6df90d31ef4007291faabfce5431) Signed-off-by: Alex Shi <alex.shi@linaro.org>
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 61a82d68330d..d2a6194f4bec 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));