leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi/libstub/x86: Avoid getter function for efi_is64

Browse Source 
We no longer need to take special care when using global variables
in the EFI stub, so switch to a simple symbol reference for efi_is64.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel 2020-04-16 21:15:23 +02:00
parent 980771f616
commit 0a75561489
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/x86/include/asm/efi.h
View File

@ -225,14 +225,19 @@ efi_status_t efi_set_virtual_address_map(unsigned long memory_map_size,
/* arch specific definitions used by the stub code */ /* arch specific definitions used by the stub code */
__attribute_const__ bool efi_is_64bit(void); extern const bool efi_is64;
static inline bool efi_is_64bit(void)
{
if (IS_ENABLED(CONFIG_EFI_MIXED))
return efi_is64;
return IS_ENABLED(CONFIG_X86_64);
}
static inline bool efi_is_native(void) static inline bool efi_is_native(void)
{ {
if (!IS_ENABLED(CONFIG_X86_64)) if (!IS_ENABLED(CONFIG_X86_64))
return true; return true;
if (!IS_ENABLED(CONFIG_EFI_MIXED))
return true;
return efi_is_64bit(); return efi_is_64bit();
} }

8
drivers/firmware/efi/libstub/x86-stub.c
View File

@ -21,16 +21,8 @@
#define MAXMEM_X86_64_4LEVEL (1ull << 46) #define MAXMEM_X86_64_4LEVEL (1ull << 46)
const efi_system_table_t *efi_system_table; const efi_system_table_t *efi_system_table;
extern const bool efi_is64;
extern u32 image_offset; extern u32 image_offset;
__attribute_const__ bool efi_is_64bit(void)
{
if (IS_ENABLED(CONFIG_EFI_MIXED))
return efi_is64;
return IS_ENABLED(CONFIG_X86_64);
}
static efi_status_t static efi_status_t
preserve_pci_rom_image(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom) preserve_pci_rom_image(efi_pci_io_protocol_t *pci, struct pci_setup_rom **__rom)
{ {