[v11,06/15] arm64: add image head flag definitions

Message ID	20180711074203.3019-7-takahiro.akashi@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; From: AKASHI Takahiro <takahiro.akashi@linaro.org> To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com, vgoyal@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de Cc: ard.biesheuvel@linaro.org, james.morse@arm.com, bhsharma@redhat.com, kexec@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, AKASHI Takahiro <takahiro.akashi@linaro.org> Subject: [PATCH v11 06/15] arm64: add image head flag definitions Date: Wed, 11 Jul 2018 16:41:54 +0900 Message-Id: <20180711074203.3019-7-takahiro.akashi@linaro.org> In-Reply-To: <20180711074203.3019-1-takahiro.akashi@linaro.org> References: <20180711074203.3019-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	subject: arm64: kexec: add kexec_file_load() support \| expand [v11,00/15] subject: arm64: kexec: add kexec_file_load() support [v11,01/15] asm-generic: add kexec_file_load system call to unistd.h [v11,02/15] kexec_file: make kexec_image_post_load_cleanup_default() global [v11,03/15] powerpc, kexec_file: factor out memblock-based arch_kexec_walk_mem() [v11,04/15] kexec_file: kexec_walk_memblock() only walks a dedicated region at kdump [v11,05/15] of/fdt: add helper functions for handling properties [v11,06/15] arm64: add image head flag definitions [v11,07/15] arm64: cpufeature: add MMFR0 helper functions [v11,08/15] arm64: enable KEXEC_FILE config [v11,09/15] arm64: kexec_file: load initrd and device-tree [v11,10/15] arm64: kexec_file: allow for loading Image-format kernel [v11,11/15] arm64: kexec_file: add crash dump support [v11,12/15] arm64: kexec_file: invoke the kernel without purgatory [v11,13/15] include: pe.h: remove message[] from mz header definition [v11,14/15] arm64: kexec_file: add kernel signature verification support [v11,15/15] arm64: kexec_file: add kaslr support

Message ID

20180711074203.3019-7-takahiro.akashi@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	linux-kernel-owner@vger.kernel.org designates 209.132.180.67
	as permitted sender) client-ip=209.132.180.67; 
From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: catalin.marinas@arm.com, will.deacon@arm.com, dhowells@redhat.com,
	vgoyal@redhat.com, herbert@gondor.apana.org.au,
	davem@davemloft.net, dyoung@redhat.com, bhe@redhat.com, arnd@arndb.de
Cc: ard.biesheuvel@linaro.org, james.morse@arm.com,
	bhsharma@redhat.com, kexec@lists.infradead.org,
	linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
	AKASHI Takahiro <takahiro.akashi@linaro.org>
Subject: [PATCH v11 06/15] arm64: add image head flag definitions
Date: Wed, 11 Jul 2018 16:41:54 +0900
Message-Id: <20180711074203.3019-7-takahiro.akashi@linaro.org>
In-Reply-To: <20180711074203.3019-1-takahiro.akashi@linaro.org>
References: <20180711074203.3019-1-takahiro.akashi@linaro.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

subject: arm64: kexec: add kexec_file_load() support | expand

Commit Message

AKASHI Takahiro July 11, 2018, 7:41 a.m. UTC

Those image head's flags will be used later by kexec_file loader.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Acked-by: James Morse <james.morse@arm.com>

---
 arch/arm64/include/asm/boot.h | 15 +++++++++++++++
 arch/arm64/kernel/head.S      |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

-- 
2.17.0

diff --git a/arch/arm64/include/asm/boot.h b/arch/arm64/include/asm/boot.h
index 355e552a9175..0bab7eed3012 100644
--- a/arch/arm64/include/asm/boot.h
+++ b/arch/arm64/include/asm/boot.h
@@ -5,6 +5,21 @@ 
 
 #include <asm/sizes.h>
 
+#define ARM64_MAGIC		"ARM\x64"
+
+#define HEAD_FLAG_BE_SHIFT		0
+#define HEAD_FLAG_PAGE_SIZE_SHIFT	1
+#define HEAD_FLAG_BE_MASK		0x1
+#define HEAD_FLAG_PAGE_SIZE_MASK	0x3
+
+#define HEAD_FLAG_BE			1
+#define HEAD_FLAG_PAGE_SIZE_4K		1
+#define HEAD_FLAG_PAGE_SIZE_16K		2
+#define HEAD_FLAG_PAGE_SIZE_64K		3
+
+#define head_flag_field(flags, field) \
+		(((flags) >> field##_SHIFT) & field##_MASK)
+
 /*
  * arm64 requires the DTB to be 8 byte aligned and
  * not exceed 2MB in size.
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index b0853069702f..8cbac6232ed1 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -91,7 +91,7 @@  _head:
 	.quad	0				// reserved
 	.quad	0				// reserved
 	.quad	0				// reserved
-	.ascii	"ARM\x64"			// Magic number
+	.ascii	ARM64_MAGIC			// Magic number
 #ifdef CONFIG_EFI
 	.long	pe_header - _head		// Offset to the PE header.

[v11,06/15] arm64: add image head flag definitions

Commit Message

Patch