Date: Thu, 20 Oct 2016 13:26:51 +0100
From: Matt Fleming <matt@codeblueprint.co.uk>
To: Alex Thorlton <athorlton@sgi.com>
Cc: linux-kernel@vger.kernel.org, Mike Travis <travis@sgi.com>,
        Russ Anderson <rja@sgi.com>, Dimitri Sivanich <sivanich@sgi.com>,
        Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Masahiro Yamada <yamada.masahiro@socionext.com>, x86@kernel.org,
        Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: Re: [PATCH v2] x86/platform/UV: Fix support for EFI_OLD_MEMMAP after
 BIOS callback updates
Message-ID: <20161020122651.GC19876@codeblueprint.co.uk>
References: <1476928131-170101-1-git-send-email-athorlton@sgi.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1476928131-170101-1-git-send-email-athorlton@sgi.com>
User-Agent: Mutt/1.5.24+41 (02bc14ed1569) (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1703
Lines: 40

On Wed, 19 Oct, at 08:48:51PM, Alex Thorlton wrote:
> Some time ago, we brought our UV BIOS callback code up to speed with the
> new EFI memory mapping scheme, in commit:
> 
>     d1be84a232e3 ("x86/uv: Update uv_bios_call() to use efi_call_virt_pointer()")
> 
> By leveraging some changes that I made to a few of the EFI runtime
> callback mechanisms, in commit:
> 
>     80e75596079f ("efi: Convert efi_call_virt() to efi_call_virt_pointer()")
> 
> This got everything running smoothly on UV, with the new EFI mapping
> code.  However, this left one, small loose end, in that EFI_OLD_MEMMAP
> (a.k.a. efi=old_map) will no longer work on UV, on kernels that include
> the aforementioned changes.
> 
> At the time this was not a major issue (in fact, it still really isn't),
> but there's no reason that EFI_OLD_MEMMAP *shouldn't* work on our
> systems.  This commit adds a check into uv_bios_call, to see if we have
> the EFI_OLD_MEMMAP bit set in efi.flags.  If it is set, we fall back to
> using our old callback method, which uses efi_call directly on the __va
> of our function pointer.
> 
> v2: Invert if-statement and add unlikely() hint.
> 
> Signed-off-by: Alex Thorlton <athorlton@sgi.com>
> Cc: Mike Travis <travis@sgi.com>
> Cc: Russ Anderson <rja@sgi.com>
> Cc: Dimitri Sivanich <sivanich@sgi.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: Matt Fleming <matt@codeblueprint.co.uk>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: x86@kernel.org
> ---
>  arch/x86/platform/uv/bios_uv.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)

Looks fine to me. Applied to 'next'. Thanks!