From: takahiro.akashi@linaro.org (AKASHI Takahiro)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v14 07/16] arm64: add image head flag definitions
Date: Fri, 7 Sep 2018 17:00:31 +0900 [thread overview]
Message-ID: <20180907080040.4967-2-takahiro.akashi@linaro.org> (raw)
In-Reply-To: <20180907080040.4967-1-takahiro.akashi@linaro.org>
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(-)
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.
--
2.18.0
next prev parent reply other threads:[~2018-09-07 8:00 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 8:00 [PATCH v14 06/16] of/fdt: add helper functions for handling properties AKASHI Takahiro
2018-09-07 8:00 ` AKASHI Takahiro [this message]
2018-09-07 8:00 ` [PATCH v14 08/16] arm64: cpufeature: add MMFR0 helper functions AKASHI Takahiro
2018-09-07 8:00 ` [PATCH v14 09/16] arm64: enable KEXEC_FILE config AKASHI Takahiro
2018-09-07 8:00 ` [PATCH v14 10/16] arm64: kexec_file: load initrd and device-tree AKASHI Takahiro
2018-09-07 8:00 ` [PATCH v14 11/16] arm64: kexec_file: allow for loading Image-format kernel AKASHI Takahiro
2018-09-07 8:00 ` [PATCH v14 12/16] arm64: kexec_file: add crash dump support AKASHI Takahiro
2018-09-07 8:00 ` [PATCH v14 13/16] arm64: kexec_file: invoke the kernel without purgatory AKASHI Takahiro
2018-09-07 8:00 ` [PATCH v14 14/16] include: pe.h: remove message[] from mz header definition AKASHI Takahiro
2018-09-07 8:00 ` [PATCH v14 15/16] arm64: kexec_file: add kernel signature verification support AKASHI Takahiro
2018-09-07 8:00 ` [PATCH v14 16/16] arm64: kexec_file: add kaslr support AKASHI Takahiro
2018-09-07 19:53 ` [PATCH v14 06/16] of/fdt: add helper functions for handling properties Frank Rowand
2018-09-10 2:38 ` AKASHI Takahiro
2018-09-14 1:42 ` Frank Rowand
2018-09-14 1:26 ` Frank Rowand
2018-09-14 17:19 ` Frank Rowand
2018-09-26 5:57 ` AKASHI Takahiro
2018-09-26 8:10 ` Frank Rowand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180907080040.4967-2-takahiro.akashi@linaro.org \
--to=takahiro.akashi@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).