All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mike Galbraith <umgwanakikbuti-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
	Matt Fleming
	<matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
Cc: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>,
	LKML <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Peter Jones <pjones-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
	Ard Biesheuvel
	<ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
Subject: Re: [tip regression]  efi: Allow drivers to reserve boot services forever == toxic
Date: Fri, 16 Sep 2016 20:26:16 +0200	[thread overview]
Message-ID: <1474050376.3903.17.camel@gmail.com> (raw)
In-Reply-To: <20160916144519.GA3179@leverpostej>

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);

WARNING: multiple messages have this Message-ID (diff)
From: Mike Galbraith <umgwanakikbuti@gmail.com>
To: Mark Rutland <mark.rutland@arm.com>,
	Matt Fleming <matt@codeblueprint.co.uk>
Cc: Ingo Molnar <mingo@elte.hu>, LKML <linux-kernel@vger.kernel.org>,
	linux-efi@vger.kernel.org, Peter Jones <pjones@redhat.com>,
	Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [tip regression]  efi: Allow drivers to reserve boot services forever == toxic
Date: Fri, 16 Sep 2016 20:26:16 +0200	[thread overview]
Message-ID: <1474050376.3903.17.camel@gmail.com> (raw)
In-Reply-To: <20160916144519.GA3179@leverpostej>

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);

  reply	other threads:[~2016-09-16 18:26 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-16  6:05 [tip regression] efi: Allow drivers to reserve boot services forever == toxic Mike Galbraith
2016-09-16  9:31 ` Matt Fleming
     [not found]   ` <20160916093149.GC16797-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-09-16 10:00     ` Mike Galbraith
2016-09-16 10:00       ` Mike Galbraith
     [not found]       ` <1474020059.3881.3.camel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-09-16 14:30         ` Matt Fleming
2016-09-16 14:30           ` Matt Fleming
     [not found]           ` <20160916143007.GF16797-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-09-16 14:45             ` Mark Rutland
2016-09-16 14:45               ` Mark Rutland
2016-09-16 18:26               ` Mike Galbraith [this message]
2016-09-16 18:26                 ` Mike Galbraith
     [not found]                 ` <1474050376.3903.17.camel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-09-19  8:56                   ` Mark Rutland
2016-09-19  8:56                     ` Mark Rutland
2016-09-16 16:34             ` Mike Galbraith
2016-09-16 16:34               ` Mike Galbraith
     [not found]               ` <1474043695.3854.3.camel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-09-17 19:58                 ` Matt Fleming
2016-09-17 19:58                   ` Matt Fleming
     [not found]                   ` <20160917195853.GG16797-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>
2016-09-18  6:09                     ` Mike Galbraith
2016-09-18  6:09                       ` Mike Galbraith
     [not found]                       ` <1474178972.3817.2.camel-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-09-19 11:15                         ` Matt Fleming
2016-09-19 11:15                           ` Matt Fleming

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=1474050376.3903.17.camel@gmail.com \
    --to=umgwanakikbuti-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
    --cc=ard.biesheuvel-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=matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org \
    --cc=mingo-X9Un+BFzKDI@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.