Re: [PATCH 03/11] efi: Refactor efi_memmap_init_early() into arch-neutral code

[Matt Fleming]

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@xxxxxxxxxx>
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>

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.