Re: [tip regression] efi: Allow drivers to reserve boot services forever == toxic

[Mike Galbraith]

On Fri, 2016-09-16 at 15:45 +0100, Mark Rutland wrote:

> > diff --git a/arch/x86/platform/efi/quirks.c
> > b/arch/x86/platform/efi/quirks.c
> > index f14b7a9da24b..e881b4b2ffd6 100644
> > --- a/arch/x86/platform/efi/quirks.c
> > +++ b/arch/x86/platform/efi/quirks.c
> > @@ -201,8 +201,10 @@ void __init efi_arch_mem_reserve(phys_addr_t
> > addr, u64 size)
> >  		return;
> >  	}
> >  
> > +	size = round_up(size, EFI_PAGE_SIZE);
> 
> i.e. have:
> 
> 	size += addr % EFI_PAGE_SIZE;
> 	size = round_up(size, EFI_PAGE_SIZE);
> 	addr = round_down(base, EFI_PAGE_SIZE);
                          ^^^^

s/base/addr did work, was that what you meant to write, or am I lucky? 
--- a/arch/x86/platform/efi/quirks.c
+++ b/arch/x86/platform/efi/quirks.c
@@ -201,8 +201,12 @@ void __init efi_arch_mem_reserve(phys_ad
 		return;
 	}
 
+	size += addr % EFI_PAGE_SIZE;
+	size = round_up(size, EFI_PAGE_SIZE);
+	addr = round_down(addr, EFI_PAGE_SIZE);
+
 	mr.range.start = addr;
-	mr.range.end = addr + size;
+	mr.range.end = addr + size - 1;
 	mr.attribute = md.attribute | EFI_MEMORY_RUNTIME;
 
 	num_entries = efi_memmap_split_count(&md, &mr.range);