Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 926edcc7 authored by Cyril Chemparathy's avatar Cyril Chemparathy Committed by Will Deacon
Browse files

ARM: LPAE: use signed arithmetic for mask definitions 



This patch applies to PAGE_MASK, PMD_MASK, and PGDIR_MASK, where forcing
unsigned long math truncates the mask at the 32-bits.  This clearly does bad
things on PAE systems.

This patch fixes this problem by defining these masks as signed quantities.
We then rely on sign extension to do the right thing.

Signed-off-by: default avatarCyril Chemparathy <cyril@ti.com>
Signed-off-by: default avatarVitaly Andrianov <vitalya@ti.com>
Reviewed-by: default avatarNicolas Pitre <nico@linaro.org>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: default avatarSubash Patel <subash.rp@samsung.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent e4aa937e

arch/arm/include/asm/page.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
/* PAGE_SHIFT determines the page size */

#define PAGE_SHIFT		12

#define PAGE_SIZE		(_AC(1,UL) << PAGE_SHIFT)

#define PAGE_MASK		(~(PAGE_SIZE-1))

#define PAGE_MASK		(~((1 << PAGE_SHIFT) - 1))



#ifndef __ASSEMBLY__

arch/arm/include/asm/pgtable-3level.h

+3 −3
Original line number Diff line number Diff line
@@ -48,16 +48,16 @@ 
#define PMD_SHIFT		21



#define PMD_SIZE		(1UL << PMD_SHIFT)

#define PMD_MASK		(~(PMD_SIZE-1))

#define PMD_MASK		(~((1 << PMD_SHIFT) - 1))

#define PGDIR_SIZE		(1UL << PGDIR_SHIFT)

#define PGDIR_MASK		(~(PGDIR_SIZE-1))

#define PGDIR_MASK		(~((1 << PGDIR_SHIFT) - 1))



/*

 * section address mask and size definitions.

 */

#define SECTION_SHIFT		21

#define SECTION_SIZE		(1UL << SECTION_SHIFT)

#define SECTION_MASK		(~(SECTION_SIZE-1))

#define SECTION_MASK		(~((1 << SECTION_SHIFT) - 1))



#define USER_PTRS_PER_PGD	(PAGE_OFFSET / PGDIR_SIZE)