From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932629AbcISI5P (ORCPT ); Mon, 19 Sep 2016 04:57:15 -0400 Received: from foss.arm.com ([217.140.101.70]:56364 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756184AbcISI5B (ORCPT ); Mon, 19 Sep 2016 04:57:01 -0400 Date: Mon, 19 Sep 2016 09:56:36 +0100 From: Mark Rutland To: Mike Galbraith Cc: Matt Fleming , Ingo Molnar , LKML , linux-efi@vger.kernel.org, Peter Jones , Ard Biesheuvel Subject: Re: [tip regression] efi: Allow drivers to reserve boot services forever == toxic Message-ID: <20160919085547.GA11118@leverpostej> References: <1474005912.3930.10.camel@gmail.com> <20160916093149.GC16797@codeblueprint.co.uk> <1474020059.3881.3.camel@gmail.com> <20160916143007.GF16797@codeblueprint.co.uk> <20160916144519.GA3179@leverpostej> <1474050376.3903.17.camel@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1474050376.3903.17.camel@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 16, 2016 at 08:26:16PM +0200, Mike Galbraith wrote: > 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? That was what I meant to write, though the two statements aren't necessarily mutually exclusive. ;) I'll have to leave it to you and Matt to figure out what the real solution is -- I'm not familiar with this code and was just pattern-matching. Thanks, Mark.