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

Commit 9d372c9f authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Catalin Marinas
Browse files

arm64: Add page size to the kernel image header 



This patch adds the page size to the arm64 kernel image header
so that one can infer the PAGESIZE used by the kernel. This will
be helpful to diagnose failures to boot the kernel with page size
not supported by the CPU.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarSuzuki K. Poulose <suzuki.poulose@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 4bf8b96e

Documentation/arm64/booting.txt

+6 −1
Original line number Diff line number Diff line
@@ -104,7 +104,12 @@ Header notes: 
- The flags field (introduced in v3.17) is a little-endian 64-bit field

  composed as follows:

  Bit 0:	Kernel endianness.  1 if BE, 0 if LE.

  Bits 1-63:	Reserved.

  Bit 1-2:	Kernel Page size.

			0 - Unspecified.

			1 - 4K

			2 - 16K

			3 - 64K

  Bits 3-63:	Reserved.



- When image_size is zero, a bootloader should attempt to keep as much

  memory as possible free for use by the kernel immediately after the

arch/arm64/kernel/image.h

+4 −1
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ 
#define __HEAD_FLAG_BE	0

#endif



#define __HEAD_FLAGS	(__HEAD_FLAG_BE << 0)

#define __HEAD_FLAG_PAGE_SIZE ((PAGE_SHIFT - 10) / 2)



#define __HEAD_FLAGS	((__HEAD_FLAG_BE << 0) |	\

			 (__HEAD_FLAG_PAGE_SIZE << 1))



/*

 * These will output as part of the Image header, which should be little-endian