From: will.deacon@arm•com (Will Deacon)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arm64: efi: make sure vmlinux load address aligned on 2MBytes
Date: Wed, 28 Oct 2015 17:27:36 +0000 [thread overview]
Message-ID: <20151028172735.GL18966@arm.com> (raw)
In-Reply-To: <563101DD.8080508@codeaurora.org>
On Wed, Oct 28, 2015 at 12:11:57PM -0500, Timur Tabi wrote:
> On 10/27/2015 09:06 PM, Ard Biesheuvel wrote:
> >diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c
> >index 816120ece6bc..a60ce249cfc0 100644
> >--- a/arch/arm64/kernel/efi-stub.c
> >+++ b/arch/arm64/kernel/efi-stub.c
> >@@ -42,7 +42,8 @@
> > * Mustang), we can still place the kernel at the address
> > * 'dram_base + TEXT_OFFSET'.
> > */
> >- *image_addr = *reserve_addr = dram_base + TEXT_OFFSET;
> >+ *image_addr = *reserve_addr = round_up(dram_base, SZ_2M) +
> >+ TEXT_OFFSET);
> > nr_pages = round_up(kernel_memsize, EFI_ALLOC_ALIGN) /
> > EFI_PAGE_SIZE;
> > status = efi_call_early(allocate_pages, EFI_ALLOCATE_ADDRESS,
>
> Tested-by: Timur Tabi <timur@codeaurora•org>
> Tested-by: Shanker Donthineni <shankerd@codeaurora•org>
>
> However, I think this formatting is easier to read:
>
> *image_addr = *reserve_addr =
> round_up(dram_base, SZ_2M) + TEXT_OFFSET;
>
> This does make the kernel boot, but we suspect that there may be another
> problem. We need to investigate it, but we have a suspicion that the EFI
> stub is trying to allocate from the Runtime Data block, and the alignment
> adjustment "fixes" the problem by moving the pointer to Conventional Memory.
>
> Anyway, is there any chance we can get this fix into 4.3? I'd hate to have
> 4.3 released knowing that it's broken on our hardware.
If you want something in for 4.3, you'll need to post a new patch in a
separate thread and I'd like to see at least Ard's ack on it.
Will
prev parent reply other threads:[~2015-10-28 17:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 21:24 [PATCH] arm64: efi: make sure vmlinux load address aligned on 2MBytes Timur Tabi
2015-10-28 2:06 ` Ard Biesheuvel
2015-10-28 2:10 ` Timur Tabi
2015-10-28 2:11 ` Ard Biesheuvel
2015-10-28 2:13 ` Timur Tabi
2015-10-28 11:28 ` Mark Rutland
2015-10-28 17:11 ` Timur Tabi
2015-10-28 17:26 ` Mark Rutland
2015-10-28 21:02 ` Timur Tabi
2015-10-27 12:05 ` Mark Rutland
2015-10-28 17:27 ` Will Deacon [this message]
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=20151028172735.GL18966@arm.com \
--to=will.deacon@arm$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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