Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753255AbcD1Kox (ORCPT ); Thu, 28 Apr 2016 06:44:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:48298 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750876AbcD1Kou (ORCPT ); Thu, 28 Apr 2016 06:44:50 -0400 Date: Thu, 28 Apr 2016 03:42:56 -0700 From: tip-bot for Mark Rutland Message-ID: Cc: will.deacon@arm.com, linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, matt@codeblueprint.co.uk, ard.biesheuvel@linaro.org, tglx@linutronix.de, catalin.marinas@arm.com, leif.lindholm@linaro.org, peterz@infradead.org, bp@alien8.de, mark.rutland@arm.com, hpa@zytor.com, mingo@kernel.org Reply-To: leif.lindholm@linaro.org, catalin.marinas@arm.com, tglx@linutronix.de, bp@alien8.de, mark.rutland@arm.com, peterz@infradead.org, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, will.deacon@arm.com, linux@arm.linux.org.uk, matt@codeblueprint.co.uk, ard.biesheuvel@linaro.org In-Reply-To: <1461614832-17633-33-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-33-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] arm64/efi: Move to generic {__,}efi_call_virt() Git-Commit-ID: 489f80f72f7528d2a1b10346657a1a1a42533cea 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: 2352 Lines: 70 Commit-ID: 489f80f72f7528d2a1b10346657a1a1a42533cea Gitweb: http://git.kernel.org/tip/489f80f72f7528d2a1b10346657a1a1a42533cea Author: Mark Rutland AuthorDate: Mon, 25 Apr 2016 21:07:04 +0100 Committer: Ingo Molnar CommitDate: Thu, 28 Apr 2016 11:34:07 +0200 arm64/efi: Move to generic {__,}efi_call_virt() Now there's a common template for {__,}efi_call_virt(), remove the duplicate logic from the arm64 EFI code. Signed-off-by: Mark Rutland Signed-off-by: Matt Fleming Reviewed-by: Ard Biesheuvel Acked-by: Will Deacon Cc: Borislav Petkov Cc: Catalin Marinas Cc: Leif Lindholm Cc: Peter Zijlstra Cc: Russell King Cc: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-33-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- arch/arm64/include/asm/efi.h | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 79dc8c2..cfd4ae2 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -16,28 +16,21 @@ int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); #define efi_set_mapping_permissions efi_create_mapping -#define efi_call_virt(f, ...) \ +#define arch_efi_call_virt_setup() \ ({ \ - efi_##f##_t *__f; \ - efi_status_t __s; \ - \ kernel_neon_begin(); \ efi_virtmap_load(); \ - __f = efi.systab->runtime->f; \ - __s = __f(__VA_ARGS__); \ - efi_virtmap_unload(); \ - kernel_neon_end(); \ - __s; \ }) -#define __efi_call_virt(f, ...) \ +#define arch_efi_call_virt(f, args...) \ ({ \ efi_##f##_t *__f; \ - \ - kernel_neon_begin(); \ - efi_virtmap_load(); \ __f = efi.systab->runtime->f; \ - __f(__VA_ARGS__); \ + __f(args); \ +}) + +#define arch_efi_call_virt_teardown() \ +({ \ efi_virtmap_unload(); \ kernel_neon_end(); \ })