Commit 819fc126 authored Apr 25, 2016 by Mark Rutland Committed by Ingo Molnar Apr 28, 2016

arm/efi: Move to generic {__,}efi_call_virt()



Now there's a common template for {__,}efi_call_virt(), remove the
duplicate logic from the ARM EFI code.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Colin Ian King <colin.king@canonical.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/1461614832-17633-34-git-send-email-matt@codeblueprint.co.uk


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 489f80f7

arch/arm/include/asm/efi.h

+4 −16

Original line number	Diff line number	Diff line
		@@ -24,26 +24,14 @@ void efi_init(void);
		int efi_create_mapping(struct mm_struct mm, efi_memory_desc_t md);
		int efi_set_mapping_permissions(struct mm_struct mm, efi_memory_desc_t md);

		#define efi_call_virt(f, ...) \
		({ \
		efi_##f##_t *__f; \
		efi_status_t __s; \
		\
		efi_virtmap_load(); \
		__f = efi.systab->runtime->f; \
		__s = __f(__VA_ARGS__); \
		efi_virtmap_unload(); \
		__s; \
		})
		#define arch_efi_call_virt_setup() efi_virtmap_load()
		#define arch_efi_call_virt_teardown() efi_virtmap_unload()

		#define __efi_call_virt(f, ...) \
		#define arch_efi_call_virt(f, args...) \
		({ \
		efi_##f##_t *__f; \
		\
		efi_virtmap_load(); \
		__f = efi.systab->runtime->f; \
		__f(__VA_ARGS__); \
		efi_virtmap_unload(); \
		__f(args); \
		})

		static inline void efi_set_pgd(struct mm_struct *mm)