From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/10] arm64/efi: adapt to relaxed kernel Image placement requirements
Date: Mon, 11 May 2015 09:13:08 +0200 [thread overview]
Message-ID: <1431328388-3051-11-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1431328388-3051-1-git-send-email-ard.biesheuvel@linaro.org>
This adapts the EFI stub kernel placement to the new relaxed
requirements, by placing the kernel Image at the highest available
2 MB offset in physical memory.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm64/kernel/efi-stub.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c
index f5374065ad53..60ae3324e26e 100644
--- a/arch/arm64/kernel/efi-stub.c
+++ b/arch/arm64/kernel/efi-stub.c
@@ -10,6 +10,7 @@
*
*/
#include <linux/efi.h>
+#include <asm/boot.h>
#include <asm/efi.h>
#include <asm/sections.h>
@@ -28,8 +29,8 @@ efi_status_t __init handle_kernel_image(efi_system_table_t *sys_table,
kernel_size = _edata - _text;
if (*image_addr != (dram_base + TEXT_OFFSET)) {
kernel_memsize = kernel_size + (_end - _edata);
- status = efi_low_alloc(sys_table, kernel_memsize + TEXT_OFFSET,
- SZ_2M, reserve_addr);
+ status = efi_high_alloc(sys_table, kernel_memsize + TEXT_OFFSET,
+ MIN_KIMG_ALIGN, reserve_addr, ULONG_MAX);
if (status != EFI_SUCCESS) {
pr_efi_err(sys_table, "Failed to relocate kernel\n");
return status;
--
1.9.1
next prev parent reply other threads:[~2015-05-11 7:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 7:12 [PATCH 00/10] arm64: relax Image placement rules Ard Biesheuvel
2015-05-11 7:12 ` [PATCH 01/10] arm64/efi: use dynamically allocated space for EFI pgd Ard Biesheuvel
2015-05-11 7:13 ` [PATCH 02/10] arm64: reduce ID map to a single page Ard Biesheuvel
2015-05-11 7:13 ` [PATCH 03/10] arm64: drop sleep_idmap_phys and clean up cpu_resume() Ard Biesheuvel
2015-05-11 7:13 ` [PATCH 04/10] arm64: use more granular reservations for static page table allocations Ard Biesheuvel
2015-05-11 7:13 ` [PATCH 05/10] arm64: split off early mapping code from early_fixmap_init() Ard Biesheuvel
2015-05-11 7:13 ` [PATCH 06/10] arm64: mm: explicitly bootstrap the linear mapping Ard Biesheuvel
2015-05-11 7:13 ` [PATCH 07/10] arm64: move kernel mapping out of linear region Ard Biesheuvel
2015-05-11 7:13 ` [PATCH 08/10] arm64: map linear region as non-executable Ard Biesheuvel
2015-05-11 7:13 ` [PATCH 09/10] arm64: allow kernel Image to be loaded anywhere in physical memory Ard Biesheuvel
2015-05-11 7:13 ` Ard Biesheuvel [this message]
2015-05-22 5:43 ` [PATCH] fixup! " AKASHI Takahiro
2015-05-22 6:34 ` Ard Biesheuvel
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=1431328388-3051-11-git-send-email-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@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).