lkml.org 
[lkml]   [2016]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v2] x86/platform/UV: Fix support for EFI_OLD_MEMMAP after BIOS callback updates
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!

\
 
 \ /
  Last update: 2016-10-20 14:28    [W:0.065 / U:1.652 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site