From: Leif Lindholm <leif@nuviainc.com>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: xypron.glpk@gmx.de, linux-efi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] efi/libstub: arm: Omit arch specific config table matching array on arm64
Date: Tue, 16 Jun 2020 12:19:14 +0100 [thread overview]
Message-ID: <20200616111914.GD6739@vanye> (raw)
In-Reply-To: <20200616110030.1054015-1-ardb@kernel.org>
On Tue, Jun 16, 2020 at 13:00:30 +0200, Ard Biesheuvel wrote:
> On arm64, the EFI stub is built into the kernel proper, and so the stub
> can refer to its symbols directly. Therefore, the practice of using EFI
> configuration tables to pass information between them is never needed,
> so we can omit any code consuming such tables when building for arm64.
>
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
>
> ---
>
> This will be applied before 'efi/libstub: arm: Print CPU boot mode and MMU
> state at boot' [v3] sent out today
With that, for *both* patches:
Reviewed-by: Leif Lindholm <leif@nuviainc.com>
> drivers/firmware/efi/arm-init.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index c697e70ca7e7..6f4baf70db16 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -62,7 +62,8 @@ static void __init init_screen_info(void)
> {
> struct screen_info *si;
>
> - if (screen_info_table != EFI_INVALID_TABLE_ADDR) {
> + if (IS_ENABLED(CONFIG_ARM) &&
> + screen_info_table != EFI_INVALID_TABLE_ADDR) {
> si = early_memremap_ro(screen_info_table, sizeof(*si));
> if (!si) {
> pr_err("Could not map screen_info config table\n");
> @@ -116,7 +117,8 @@ static int __init uefi_init(u64 efi_system_table)
> goto out;
> }
> retval = efi_config_parse_tables(config_tables, systab->nr_tables,
> - arch_tables);
> + IS_ENABLED(CONFIG_ARM) ? arch_tables
> + : NULL);
>
> early_memunmap(config_tables, table_size);
> out:
> --
> 2.27.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
prev parent reply other threads:[~2020-06-16 11:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-16 11:00 [PATCH] efi/libstub: arm: Omit arch specific config table matching array on arm64 Ard Biesheuvel
2020-06-16 11:19 ` Leif Lindholm [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=20200616111914.GD6739@vanye \
--to=leif@nuviainc.com \
--cc=ardb@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=xypron.glpk@gmx.de \
/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).