Commit 8add9a3a authored by Sudeep Holla's avatar Sudeep Holla Committed by Ard Biesheuvel
Browse files

efi: Simplify arch_efi_call_virt() macro 



Currently, the arch_efi_call_virt() assumes all users of it will have
defined a type 'efi_##f##_t' to make use of it.

Simplify the arch_efi_call_virt() macro by eliminating the explicit
need for efi_##f##_t type for every user of this macro.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
[ardb: apply Sudeep's ARM fix to i686, Loongarch and RISC-V too]
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 1df4d172

arch/arm/include/asm/efi.h

+0 −7
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
#define arch_efi_call_virt_setup()	efi_virtmap_load()

#define arch_efi_call_virt_teardown()	efi_virtmap_unload()



#define arch_efi_call_virt(p, f, args...)				\

({									\

	efi_##f##_t *__f;						\

	__f = p->f;							\

	__f(args);							\

})



#define ARCH_EFI_IRQ_FLAGS_MASK \

	(PSR_J_BIT | PSR_E_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT | \

	 PSR_T_BIT | MODE_MASK)

arch/arm64/include/asm/efi.h

+2 −5
Original line number Diff line number Diff line
@@ -27,12 +27,9 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
	__efi_fpsimd_begin();						\

})



#undef arch_efi_call_virt

#define arch_efi_call_virt(p, f, args...)				\

({									\

	efi_##f##_t *__f;						\

	__f = p->f;							\

	__efi_rt_asm_wrapper(__f, #f, args);				\

})

	__efi_rt_asm_wrapper((p)->f, #f, args)



#define arch_efi_call_virt_teardown()					\

({									\

arch/loongarch/include/asm/efi.h

+2 −14
Original line number Diff line number Diff line
@@ -13,20 +13,8 @@ void efifb_setup_from_dmi(struct screen_info *si, const char *opt); 


#define ARCH_EFI_IRQ_FLAGS_MASK  0x00000004  /* Bit 2: CSR.CRMD.IE */



#define arch_efi_call_virt_setup()               \

({                                               \

})



#define arch_efi_call_virt(p, f, args...)        \

({                                               \

	efi_##f##_t * __f;                       \

	__f = p->f;                              \

	__f(args);                               \

})



#define arch_efi_call_virt_teardown()            \

({                                               \

})

#define arch_efi_call_virt_setup()

#define arch_efi_call_virt_teardown()



#define EFI_ALLOC_ALIGN		SZ_64K

arch/riscv/include/asm/efi.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); 
#define arch_efi_call_virt_setup()      efi_virtmap_load()

#define arch_efi_call_virt_teardown()   efi_virtmap_unload()



#define arch_efi_call_virt(p, f, args...) p->f(args)



#define ARCH_EFI_IRQ_FLAGS_MASK (SR_IE | SR_SPIE)



/* Load initrd anywhere in system RAM */

arch/x86/include/asm/efi.h

+1 −2
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ static inline void efi_fpu_end(void) 
	efi_fpu_end();							\

})



#define arch_efi_call_virt(p, f, args...)	p->f(args)



#else /* !CONFIG_X86_32 */



#define EFI_LOADER_SIGNATURE	"EL64"
@@ -121,6 +119,7 @@ extern asmlinkage u64 __efi_call(void *fp, ...); 
	efi_enter_mm();							\

})



#undef arch_efi_call_virt

#define arch_efi_call_virt(p, f, args...) ({				\

	u64 ret, ibt = ibt_save();					\

	ret = efi_call((void *)p->f, args);				\