Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1250687

[PATCHv4 10/12] arm64: Add page size to the kernel image header

From "Suzuki K. Poulose" <suzuki.poulose@arm.com>
Newsgroups linux.kernel
Subject [PATCHv4 10/12] arm64: Add page size to the kernel image header
Date 2015-10-19 15:30 +0200
Message-ID <qliFJ-5Ez-29@gated-at.bofh.it> (permalink)
References <qliFI-5Ez-7@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Ard Biesheuvel <ard.biesheuvel@linaro.org>

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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
---
 Documentation/arm64/booting.txt |    7 ++++++-
 arch/arm64/kernel/image.h       |    5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Documentation/arm64/booting.txt b/Documentation/arm64/booting.txt
index 7d9d3c2..aaf6d77 100644
--- a/Documentation/arm64/booting.txt
+++ b/Documentation/arm64/booting.txt
@@ -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
diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h
index 6eb8fee..bc2abb8 100644
--- a/arch/arm64/kernel/image.h
+++ b/arch/arm64/kernel/image.h
@@ -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
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread


Thread

[UPDATED] [PATCHv4 00/12] arm64: 16K translation granule support "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 03/12] arm64: Introduce helpers for page table levels "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 01/12] arm64: Move swapper pagetable definitions "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 11/12] arm64: Add 16K page size support "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 10/12] arm64: Add page size to the kernel image header "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 08/12] arm64: Kconfig: Fix help text about AArch32 support with 64K pages "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 04/12] arm64: Calculate size for idmap_pg_dir at compile time "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 06/12] arm64: Clean config usages for page size "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 12/12] arm64: 36 bit VA "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  [PATCHv4 09/12] arm64: Check for selected granule support "Suzuki K. Poulose" <suzuki.poulose@arm.com> - 2015-10-19 15:30 +0200
  Re: [UPDATED] [PATCHv4 00/12] arm64: 16K translation granule support Mark Rutland <mark.rutland@arm.com> - 2015-10-19 18:40 +0200
  Re: [UPDATED] [PATCHv4 00/12] arm64: 16K translation granule support Catalin Marinas <catalin.marinas@arm.com> - 2015-10-19 19:40 +0200
    Re: [UPDATED] [PATCHv4 00/12] arm64: 16K translation granule support "Suzuki K. Poulose" <Suzuki.Poulose@arm.com> - 2015-10-19 19:50 +0200

csiph-web