On 08/15/14 at 04:09pm, Will Deacon wrote:
> On Thu, Aug 14, 2014 at 10:15:30AM +0100, Dave Young wrote:
> > In case efi runtime disabled via noefi kernel cmdline arm64_enter_virtual_mode
> > should error out.
> >
> > At the same time move early_memunmap(memmap.map, mapsize) to the beginning of
> > the function or it will leak early mem.
> >
> > Signed-off-by: Dave Young <dyoung@xxxxxxxxxx>
> > ---
> > arch/arm64/kernel/efi.c | 9 +++++++--
> > 1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
> > index 6ed0362..309fab1 100644
> > --- a/arch/arm64/kernel/efi.c
> > +++ b/arch/arm64/kernel/efi.c
> > @@ -392,11 +392,16 @@ static int __init arm64_enter_virtual_mode(void)
> > return -1;
> > }
> >
> > + mapsize = memmap.map_end - memmap.map;
> > + if (efi_runtime_disabled()) {
> > + early_memunmap(memmap.map, mapsize);
>
> Should this early_memunmap really be conditional? With this change, we no
> longer unmap it before setting up the permanent mapping below.
Ooops, I tested the right version but sent a wrong version for this arm64 patch.
Thanks for catch.
>
> Will
>
> > + pr_info("EFI runtime services will be disabled.\n");
> > + return -1;
> > + }
> > +
> > pr_info("Remapping and enabling EFI services.\n");
> >
> > /* replace early memmap mapping with permanent mapping */
> > - mapsize = memmap.map_end - memmap.map;
> > - early_memunmap(memmap.map, mapsize);
> > memmap.map = (__force void *)ioremap_cache((phys_addr_t)memmap.phys_map,
> > mapsize);
> > memmap.map_end = memmap.map + mapsize;
> > --
> > 1.8.3.1
> >
> >
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
