Commit de8c5520 authored by Arvind Sankar's avatar Arvind Sankar Committed by Ard Biesheuvel
Browse files

efi/libstub: Fix mixed mode boot issue after macro refactor 



Commit

  22090f84 ("efi/libstub: unify EFI call wrappers for non-x86")

refactored the macros that are used to provide wrappers for mixed-mode
calls on x86, allowing us to boot a 64-bit kernel on 32-bit firmware.

Unfortunately, this broke mixed mode boot due to the fact that
efi_is_native() is not a macro on x86.

All of these macros should go together, so rather than testing each one
to see if it is defined, condition the generic macro definitions on a
new ARCH_HAS_EFISTUB_WRAPPERS, and remove the wrapper definitions on x86
as well if CONFIG_EFI_MIXED is not enabled.

Fixes: 22090f84 ("efi/libstub: unify EFI call wrappers for non-x86")
Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200504150248.62482-1-nivedita@alum.mit.edu


Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 055042be

arch/x86/include/asm/efi.h

+15 −4
Original line number Diff line number Diff line
@@ -225,13 +225,15 @@ efi_status_t efi_set_virtual_address_map(unsigned long memory_map_size, 


/* arch specific definitions used by the stub code */



extern const bool efi_is64;

#ifdef CONFIG_EFI_MIXED



#define ARCH_HAS_EFISTUB_WRAPPERS



static inline bool efi_is_64bit(void)

{

	if (IS_ENABLED(CONFIG_EFI_MIXED))

	extern const bool efi_is64;



	return efi_is64;

	return IS_ENABLED(CONFIG_X86_64);

}



static inline bool efi_is_native(void)
@@ -356,6 +358,15 @@ static inline u32 efi64_convert_status(efi_status_t status) 
						   runtime),		\

				    func, __VA_ARGS__))



#else /* CONFIG_EFI_MIXED */



static inline bool efi_is_64bit(void)

{

	return IS_ENABLED(CONFIG_X86_64);

}



#endif /* CONFIG_EFI_MIXED */



extern bool efi_reboot_required(void);

extern bool efi_is_table_address(unsigned long phys_addr);

drivers/firmware/efi/libstub/efistub.h

+4 −10
Original line number Diff line number Diff line
@@ -33,20 +33,14 @@ extern bool efi_novamap; 


extern const efi_system_table_t *efi_system_table;



#ifndef efi_bs_call

#ifndef ARCH_HAS_EFISTUB_WRAPPERS



#define efi_is_native()		(true)

#define efi_bs_call(func, ...)	efi_system_table->boottime->func(__VA_ARGS__)

#endif

#ifndef efi_rt_call

#define efi_rt_call(func, ...)	efi_system_table->runtime->func(__VA_ARGS__)

#endif

#ifndef efi_is_native

#define efi_is_native()		(true)

#endif

#ifndef efi_table_attr

#define efi_table_attr(inst, attr)	(inst->attr)

#endif

#ifndef efi_call_proto

#define efi_call_proto(inst, func, ...) inst->func(inst, ##__VA_ARGS__)



#endif



#define efi_info(msg)		do {			\

CRA Git | Maintained and supported by SUSTech CRA and CCSE