From: tbaicar@codeaurora•org (Baicar, Tyler)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 2/2] arm64/efi: esrt: add missing call to efi_esrt_init()
Date: Tue, 16 Feb 2016 13:25:55 -0700 [thread overview]
Message-ID: <56C385D3.3090308@codeaurora.org> (raw)
In-Reply-To: <1455535953-5056-3-git-send-email-ard.biesheuvel@linaro.org>
On 2/15/2016 4:32 AM, Ard Biesheuvel wrote:
> ESRT support is built by default for all architectures that define
> CONFIG_EFI. However, this support was not wired up yet for ARM/arm64,
> since efi_esrt_init() was never called. So add the missing call.
>
> Since efi_esrt_init() uses efi_mem_desc_lookup(), which in turn relies
> on efi.memmap having been assigned and populated completetely, add the
> missing assignments of efi.memmap and efi.memmap->nr_map.
>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro•org>
> ---
> drivers/firmware/efi/arm-init.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index 9e15d571b53c..5c5e799bdb50 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -197,10 +197,13 @@ void __init efi_init(void)
> memmap.map_end = memmap.map + params.mmap_size;
> memmap.desc_size = params.desc_size;
> memmap.desc_version = params.desc_ver;
> + memmap.nr_map = params.mmap_size / params.desc_size;
> + efi.memmap = &memmap;
>
> if (uefi_init() < 0)
> return;
>
> + efi_esrt_init();
This call to efi_esrt_init() is failing because efi.flags does not have
EFI_MEMMAP set. This flag gets set at the end of reserve_regions(). I
tested moving the set_bit() call from reserve_regions() to just before
efi_esrt_init() and also tested moving efi_esrt_init() to just after
reserve_regions(). Both of these options worked.
> reserve_regions();
> early_memunmap(memmap.map, params.mmap_size);
> memblock_mark_nomap(params.mmap & PAGE_MASK,
Thanks,
Tyler
--
Qualcomm Innovation Center, Inc.
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2016-02-16 20:25 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-15 11:32 [PATCH v2 0/2] efi: ARM/arm64: wire up ESRT table Ard Biesheuvel
2016-02-15 11:32 ` [PATCH v2 1/2] efi: esrt: use memremap not ioremap to access ESRT table in memory Ard Biesheuvel
2016-02-15 15:45 ` Peter Jones
2016-02-16 19:19 ` Baicar, Tyler
2016-02-18 10:44 ` Matt Fleming
2016-02-18 12:16 ` Ard Biesheuvel
2016-02-18 13:28 ` Matt Fleming
2016-02-18 13:29 ` Ard Biesheuvel
2016-02-18 13:43 ` Matt Fleming
2016-02-18 13:44 ` Ard Biesheuvel
2016-02-18 14:15 ` Matt Fleming
2016-02-18 14:21 ` Ard Biesheuvel
2016-02-18 14:38 ` Matt Fleming
2016-02-19 9:27 ` Dave Young
2016-02-18 19:16 ` Peter Jones
2016-02-26 14:41 ` Matt Fleming
2016-03-01 23:30 ` Matt Fleming
2016-03-01 23:31 ` Matt Fleming
2016-03-02 1:16 ` Dave Young
2016-03-02 10:23 ` Matt Fleming
2016-03-04 6:25 ` Dave Young
2016-05-18 8:36 ` Ard Biesheuvel
2016-05-18 8:53 ` Matt Fleming
2016-06-16 13:47 ` Ard Biesheuvel
2016-06-20 11:49 ` Matt Fleming
2016-02-15 11:32 ` [PATCH v2 2/2] arm64/efi: esrt: add missing call to efi_esrt_init() Ard Biesheuvel
2016-02-15 15:46 ` Peter Jones
2016-02-16 20:25 ` Baicar, Tyler [this message]
2016-02-17 8:32 ` Ard Biesheuvel
2016-05-17 20:36 ` Christopher Covington
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=56C385D3.3090308@codeaurora.org \
--to=tbaicar@codeaurora$(echo .)org \
--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