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

Commit c265af51 authored by Suzuki K. Poulose's avatar Suzuki K. Poulose Committed by Catalin Marinas
Browse files

arm64: Calculate size for idmap_pg_dir at compile time 



Now that we can calculate the number of levels required for
mapping a va width, reserve exact number of pages that would
be required to cover the idmap. The idmap should be able to handle
the maximum physical address size supported.

Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarSuzuki K. Poulose <suzuki.poulose@arm.com>
Reviewed-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 686e7838

arch/arm64/include/asm/kernel-pgtable.h

+5 −2
Original line number Diff line number Diff line
@@ -39,16 +39,19 @@ 
 * map to pte level. The swapper also maps the FDT (see __create_page_tables

 * for more information). Note that the number of ID map translation levels

 * could be increased on the fly if system RAM is out of reach for the default

 * VA range, so 3 pages are reserved in all cases.

 * VA range, so pages required to map highest possible PA are reserved in all

 * cases.

 */

#if ARM64_SWAPPER_USES_SECTION_MAPS

#define SWAPPER_PGTABLE_LEVELS	(CONFIG_PGTABLE_LEVELS - 1)

#define IDMAP_PGTABLE_LEVELS	(ARM64_HW_PGTABLE_LEVELS(PHYS_MASK_SHIFT) - 1)

#else

#define SWAPPER_PGTABLE_LEVELS	(CONFIG_PGTABLE_LEVELS)

#define IDMAP_PGTABLE_LEVELS	(ARM64_HW_PGTABLE_LEVELS(PHYS_MASK_SHIFT))

#endif



#define SWAPPER_DIR_SIZE	(SWAPPER_PGTABLE_LEVELS * PAGE_SIZE)

#define IDMAP_DIR_SIZE		(3 * PAGE_SIZE)

#define IDMAP_DIR_SIZE		(IDMAP_PGTABLE_LEVELS * PAGE_SIZE)



/* Initial memory map size */

#if ARM64_SWAPPER_USES_SECTION_MAPS