Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759411AbcJRMrw (ORCPT ); Tue, 18 Oct 2016 08:47:52 -0400 Received: from relay1.sgi.com ([192.48.180.66]:56222 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755336AbcJRMrk (ORCPT ); Tue, 18 Oct 2016 08:47:40 -0400 From: Alex Thorlton To: linux-kernel@vger.kernel.org Cc: Alex Thorlton , Mike Travis , Russ Anderson , Dimitri Sivanich , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Matt Fleming , Masahiro Yamada , x86@kernel.org Subject: [PATCH] x86/platform/UV: Fix support for EFI_OLD_MEMMAP after BIOS callback updates Date: Tue, 18 Oct 2016 07:47:38 -0500 Message-Id: <1476794858-200667-1-git-send-email-athorlton@sgi.com> X-Mailer: git-send-email 1.8.5.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2328 Lines: 59 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 Cc: Mike Travis Cc: Russ Anderson Cc: Dimitri Sivanich Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Matt Fleming Cc: Masahiro Yamada Cc: x86@kernel.org --- 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..12b6e52 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 (!test_bit(EFI_OLD_MEMMAP, &efi.flags)) + ret = efi_call_virt_pointer(tab, function, (u64)which, a1, a2, a3, a4, a5); + else + ret = efi_call((void *)__va(tab->function), (u64)which, a1, a2, a3, a4, a5); + return ret; } EXPORT_SYMBOL_GPL(uv_bios_call); -- 1.8.5.6