Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754261AbcJUFvr (ORCPT ); Fri, 21 Oct 2016 01:51:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33254 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751665AbcJUFvk (ORCPT ); Fri, 21 Oct 2016 01:51:40 -0400 Date: Thu, 20 Oct 2016 22:48:56 -0700 From: tip-bot for Alex Thorlton Message-ID: Cc: travis@sgi.com, peterz@infradead.org, ard.biesheuvel@linaro.org, brgerst@gmail.com, luto@kernel.org, athorlton@sgi.com, yamada.masahiro@socionext.com, tglx@linutronix.de, rja@sgi.com, matt@codeblueprint.co.uk, sivanich@sgi.com, hpa@zytor.com, torvalds@linux-foundation.org, jpoimboe@redhat.com, linux-kernel@vger.kernel.org, bp@alien8.de, dvlasenk@redhat.com, mingo@kernel.org Reply-To: matt@codeblueprint.co.uk, rja@sgi.com, jpoimboe@redhat.com, torvalds@linux-foundation.org, hpa@zytor.com, sivanich@sgi.com, bp@alien8.de, linux-kernel@vger.kernel.org, mingo@kernel.org, dvlasenk@redhat.com, peterz@infradead.org, travis@sgi.com, ard.biesheuvel@linaro.org, luto@kernel.org, brgerst@gmail.com, yamada.masahiro@socionext.com, tglx@linutronix.de, athorlton@sgi.com In-Reply-To: <1476928131-170101-1-git-send-email-athorlton@sgi.com> References: <1476928131-170101-1-git-send-email-athorlton@sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/platform/UV: Fix support for EFI_OLD_MEMMAP after BIOS callback updates Git-Commit-ID: caef78b6cdeddf4ad364f95910bba6b43b8eb9bf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3207 Lines: 76 Commit-ID: caef78b6cdeddf4ad364f95910bba6b43b8eb9bf Gitweb: http://git.kernel.org/tip/caef78b6cdeddf4ad364f95910bba6b43b8eb9bf Author: Alex Thorlton AuthorDate: Wed, 19 Oct 2016 20:48:51 -0500 Committer: Ingo Molnar CommitDate: Thu, 20 Oct 2016 08:47:58 +0200 x86/platform/UV: Fix support for EFI_OLD_MEMMAP after BIOS callback updates 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. Signed-off-by: Alex Thorlton Acked-by: Matt Fleming Cc: # v4.7 and later Cc: Andy Lutomirski Cc: Ard Biesheuvel Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: Dimitri Sivanich Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Masahiro Yamada Cc: Mike Travis Cc: Peter Zijlstra Cc: Russ Anderson Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1476928131-170101-1-git-send-email-athorlton@sgi.com Signed-off-by: Ingo Molnar --- arch/x86/platform/uv/bios_uv.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c index b4d5e95..4a6a5a2 100644 --- a/arch/x86/platform/uv/bios_uv.c +++ b/arch/x86/platform/uv/bios_uv.c @@ -40,7 +40,15 @@ s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5) */ return BIOS_STATUS_UNIMPLEMENTED; - ret = efi_call_virt_pointer(tab, function, (u64)which, a1, a2, a3, a4, a5); + /* + * If EFI_OLD_MEMMAP is set, we need to fall back to using our old EFI + * callback method, which uses efi_call() directly, with the kernel page tables: + */ + if (unlikely(test_bit(EFI_OLD_MEMMAP, &efi.flags))) + ret = efi_call((void *)__va(tab->function), (u64)which, a1, a2, a3, a4, a5); + else + ret = efi_call_virt_pointer(tab, function, (u64)which, a1, a2, a3, a4, a5); + return ret; } EXPORT_SYMBOL_GPL(uv_bios_call);