From: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
To: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Cc: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
"linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
"linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
<linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Leif Lindholm
<leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Peter Jones <pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
Borislav Petkov <bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org>,
Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>
Subject: Re: [PATCH 03/11] efi: Refactor efi_memmap_init_early() into arch-neutral code
Date: Mon, 4 Jul 2016 13:19:52 +0100 [thread overview]
Message-ID: <20160704121952.GK8415@codeblueprint.co.uk> (raw)
In-Reply-To: <CAKv+Gu_n9eVL6mNtrLQWdCwde9oLfkGYV5CnqLhSPO31Aehpzw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
On Fri, 24 Jun, at 01:44:48PM, Ard Biesheuvel wrote:
>
> This assignment breaks the calculation of mapsize in
> arm_enable_runtime_services(), so you should probably fold the
> following hunk into this patch.
>
> diff --git a/drivers/firmware/efi/arm-runtime.c
> b/drivers/firmware/efi/arm-runtime.c
> index ce1424672d89..1884347a3ef6 100644
> --- a/drivers/firmware/efi/arm-runtime.c
> +++ b/drivers/firmware/efi/arm-runtime.c
> @@ -109,7 +109,7 @@ static int __init arm_enable_runtime_services(void)
>
> pr_info("Remapping and enabling EFI services.\n");
>
> - mapsize = efi.memmap.map_end - efi.memmap.map;
> + mapsize = efi.memmap.desc_size * efi.memmap.nr_map;
>
> if (efi_memmap_init_late(efi.memmap.phys_map, mapsize)) {
> pr_err("Failed to remap EFI memory map\n");
Thanks Ard, I folded this in.
> With that change (or an equivalent one):
>
> Tested-by: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Are those tags for just this patch or the entire series?
FYI, my plan right now is to queue this for v4.9 because it's fairly
invasive and I expect some fallout. If anyone has a problem with that
and knows of a reason it should be queued sooner, please let me know.
WARNING: multiple messages have this Message-ID (diff)
From: Matt Fleming <matt@codeblueprint.co.uk>
To: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Dave Young <dyoung@redhat.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>,
Leif Lindholm <leif.lindholm@linaro.org>,
Peter Jones <pjones@redhat.com>, Borislav Petkov <bp@alien8.de>,
Mark Rutland <mark.rutland@arm.com>
Subject: Re: [PATCH 03/11] efi: Refactor efi_memmap_init_early() into arch-neutral code
Date: Mon, 4 Jul 2016 13:19:52 +0100 [thread overview]
Message-ID: <20160704121952.GK8415@codeblueprint.co.uk> (raw)
In-Reply-To: <CAKv+Gu_n9eVL6mNtrLQWdCwde9oLfkGYV5CnqLhSPO31Aehpzw@mail.gmail.com>
On Fri, 24 Jun, at 01:44:48PM, Ard Biesheuvel wrote:
>
> This assignment breaks the calculation of mapsize in
> arm_enable_runtime_services(), so you should probably fold the
> following hunk into this patch.
>
> diff --git a/drivers/firmware/efi/arm-runtime.c
> b/drivers/firmware/efi/arm-runtime.c
> index ce1424672d89..1884347a3ef6 100644
> --- a/drivers/firmware/efi/arm-runtime.c
> +++ b/drivers/firmware/efi/arm-runtime.c
> @@ -109,7 +109,7 @@ static int __init arm_enable_runtime_services(void)
>
> pr_info("Remapping and enabling EFI services.\n");
>
> - mapsize = efi.memmap.map_end - efi.memmap.map;
> + mapsize = efi.memmap.desc_size * efi.memmap.nr_map;
>
> if (efi_memmap_init_late(efi.memmap.phys_map, mapsize)) {
> pr_err("Failed to remap EFI memory map\n");
Thanks Ard, I folded this in.
> With that change (or an equivalent one):
>
> Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Are those tags for just this patch or the entire series?
FYI, my plan right now is to queue this for v4.9 because it's fairly
invasive and I expect some fallout. If anyone has a problem with that
and knows of a reason it should be queued sooner, please let me know.
next prev parent reply other threads:[~2016-07-04 12:19 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 11:34 [PATCH 00/11] efi: Permanent runtime EFI memmap support Matt Fleming
2016-06-23 11:34 ` [PATCH 01/11] x86/efi: Test for EFI_MEMMAP functionality when iterating EFI memmap Matt Fleming
2016-06-23 11:34 ` [PATCH 02/11] x86/efi: Consolidate region mapping logic Matt Fleming
2016-06-23 14:00 ` Borislav Petkov
2016-06-23 11:34 ` [PATCH 04/11] efi: Add efi_memmap_init_late() for permanent EFI memmap Matt Fleming
2016-06-23 11:34 ` [PATCH 05/11] efi/fake_mem: Refactor main two code chunks into functions Matt Fleming
[not found] ` <1466681690-5850-1-git-send-email-matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-06-23 11:34 ` [PATCH 03/11] efi: Refactor efi_memmap_init_early() into arch-neutral code Matt Fleming
2016-06-23 11:34 ` Matt Fleming
[not found] ` <1466681690-5850-4-git-send-email-matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-06-24 11:44 ` Ard Biesheuvel
2016-06-24 11:44 ` Ard Biesheuvel
[not found] ` <CAKv+Gu_n9eVL6mNtrLQWdCwde9oLfkGYV5CnqLhSPO31Aehpzw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-07-04 12:19 ` Matt Fleming [this message]
2016-07-04 12:19 ` Matt Fleming
[not found] ` <20160704121952.GK8415-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-07-04 22:24 ` Ard Biesheuvel
2016-07-04 22:24 ` Ard Biesheuvel
2016-06-23 11:34 ` [PATCH 06/11] efi: Split out EFI memory map functions into new file Matt Fleming
2016-06-23 11:34 ` Matt Fleming
2016-06-23 11:34 ` [PATCH 07/11] efi: Add efi_memmap_install() for installing new EFI memory maps Matt Fleming
2016-06-23 11:34 ` Matt Fleming
2016-06-23 11:34 ` [PATCH 09/11] efi/runtime-map: Use efi.memmap directly instead of a copy Matt Fleming
2016-06-23 11:34 ` Matt Fleming
2016-06-30 14:34 ` [PATCH 00/11] efi: Permanent runtime EFI memmap support Dave Young
2016-06-30 14:34 ` Dave Young
2016-06-23 11:34 ` [PATCH 08/11] efi: Allow drivers to reserve boot services forever Matt Fleming
2016-06-23 11:34 ` [PATCH 10/11] efi/esrt: Use efi_mem_reserve() and avoid a kmalloc() Matt Fleming
2016-06-23 11:34 ` [PATCH 11/11] x86/efi-bgrt: Use efi_mem_reserve() to avoid copying image data Matt Fleming
[not found] ` <1466681690-5850-12-git-send-email-matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-06-30 14:41 ` Josh Triplett
2016-06-30 14:41 ` Josh Triplett
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=20160704121952.GK8415@codeblueprint.co.uk \
--to=matt-mf/unelci9gs6ibeejttw/xrex20p6io@public.gmane.org \
--cc=ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org \
--cc=dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.