Commit-ID: 489f80f72f7528d2a1b10346657a1a1a42533cea
Gitweb: http://git.kernel.org/tip/489f80f72f7528d2a1b10346657a1a1a42533cea
Author: Mark Rutland <mark.rutl...@arm.com>
AuthorDate: Mon, 25 Apr 2016 21:07:04 +0100
Committer: Ingo Molnar <mi...@kernel.org>
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 <mark.rutl...@arm.com>
Signed-off-by: Matt Fleming <m...@codeblueprint.co.uk>
Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
Acked-by: Will Deacon <will.dea...@arm.com>
Cc: Borislav Petkov <b...@alien8.de>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Cc: Leif Lindholm <leif.lindh...@linaro.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Russell King <li...@arm.linux.org.uk>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-...@vger.kernel.org
Link:
http://lkml.kernel.org/r/1461614832-17633-33-git-send-email-m...@codeblueprint.co.uk
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
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(); \
})
