• Alex Thorlton's avatar
    x86/platform/UV: Fix support for EFI_OLD_MEMMAP after BIOS callback updates · caef78b6
    Alex Thorlton authored
    Some time ago, we brought our UV BIOS callback code up to speed with the
    new EFI memory mapping scheme, in commit:
    
        d1be84a2 ("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:
    
        80e75596 ("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.
    Signed-off-by: default avatarAlex Thorlton <athorlton@sgi.com>
    Acked-by: default avatarMatt Fleming <matt@codeblueprint.co.uk>
    Cc: <stable@vger.kernel.org> # v4.7 and later
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: Dimitri Sivanich <sivanich@sgi.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
    Cc: Mike Travis <travis@sgi.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Russ Anderson <rja@sgi.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: linux-efi@vger.kernel.org
    Link: http://lkml.kernel.org/r/1476928131-170101-1-git-send-email-athorlton@sgi.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
    caef78b6
bios_uv.c 5.61 KB