Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1431082

[PATCH 6/7] x86/efi: Update efi_thunk to use the the arch_efi_call_virt* macros

Show all headers | View raw

From: Alex Thorlton <athorlton@sgi.com>

Currently, the efi_thunk macro has some semi-duplicated code in it that
can be replaced with the arch_efi_call_virt_setup/teardown macros. This
commit simply replaces the duplicated code with those macros.

Signed-off-by: Alex Thorlton <athorlton@sgi.com>
Suggested-by: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Russ Anderson <rja@sgi.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Roy Franz <roy.franz@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-efi@vger.kernel.org
Cc: x86@kernel.org
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>
---
 arch/x86/platform/efi/efi_64.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index 6e7242be1c87..4cc2b9688dc2 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -469,18 +469,13 @@ extern efi_status_t efi64_thunk(u32, ...);
 	unsigned long flags;						\
 	u32 func;							\
 									\
-	efi_sync_low_kernel_mappings();					\
 	local_irq_save(flags);						\
-									\
-	efi_scratch.prev_cr3 = read_cr3();				\
-	write_cr3((unsigned long)efi_scratch.efi_pgt);			\
-	__flush_tlb_all();						\
+	arch_efi_call_virt_setup();					\
 									\
 	func = runtime_service32(f);					\
-	__s = efi64_thunk(func, __VA_ARGS__);			\
+	__s = efi64_thunk(func, __VA_ARGS__);				\
 									\
-	write_cr3(efi_scratch.prev_cr3);				\
-	__flush_tlb_all();						\
+	arch_efi_call_virt_teardown();					\
 	local_irq_restore(flags);					\
 									\
 	__s;								\
-- 
2.7.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 0/7] EFI changes for v4.8 Matt Fleming <matt@codeblueprint.co.uk> - 2016-06-25 09:30 +0200
  [PATCH 6/7] x86/efi: Update efi_thunk to use the the arch_efi_call_virt* macros Matt Fleming <matt@codeblueprint.co.uk> - 2016-06-25 09:30 +0200
    [tip:efi/core] x86/efi: Update efi_thunk() to use the the  arch_efi_call_virt*() macros tip-bot for Alex Thorlton <tipbot@zytor.com> - 2016-06-27 15:10 +0200
  [PATCH 1/7] efibc: Report more information in the error messages Matt Fleming <matt@codeblueprint.co.uk> - 2016-06-25 09:30 +0200
    [tip:efi/core] efibc: Report more information in the error messages "tip-bot for Compostella, Jeremy" <tipbot@zytor.com> - 2016-06-27 15:10 +0200
  [PATCH 4/7] efi: Convert efi_call_virt to efi_call_virt_pointer Matt Fleming <matt@codeblueprint.co.uk> - 2016-06-25 09:30 +0200
    Re: [PATCH 4/7] efi: Convert efi_call_virt to efi_call_virt_pointer Ingo Molnar <mingo@kernel.org> - 2016-06-27 13:10 +0200
      Re: [PATCH 4/7] efi: Convert efi_call_virt to efi_call_virt_pointer Mark Rutland <mark.rutland@arm.com> - 2016-06-27 13:30 +0200
      Re: [PATCH 4/7] efi: Convert efi_call_virt to efi_call_virt_pointer Matt Fleming <matt@codeblueprint.co.uk> - 2016-07-04 15:20 +0200
    [tip:efi/core] efi: Convert efi_call_virt() to  efi_call_virt_pointer() tip-bot for Alex Thorlton <tipbot@zytor.com> - 2016-06-27 15:10 +0200

csiph-web