shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

efi: Move facility flags to struct efi

Browse Source 
As we grow support for more EFI architectures they're going to want the
ability to query which EFI features are available on the running system.
Instead of storing this information in an architecture-specific place,
stick it in the global 'struct efi', which is already the central
location for EFI state.

While we're at it, let's change the return value of efi_enabled() to be
bool and replace all references to 'facility' with 'feature', which is
the usual word used to describe the attributes of the running system.

Signed-off-by: Matt Fleming <matt.fleming@intel.com>
(cherry picked from commit 3e90959921)
Signed-off-by: Mark Brown <broonie@linaro.org>

Conflicts:
	arch/x86/include/asm/efi.h
	arch/x86/platform/efi/efi.c
This commit is contained in:
Matt Fleming
2014-01-15 13:21:22 +00:00
committed by Mark Brown
parent 05c80d3d53
commit f5c16b28d4
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size,
#endif /* CONFIG_X86_32 */
extern int add_efi_memmap;
extern unsigned long x86_efi_facility;
extern struct efi_scratch efi_scratch;
extern void efi_set_executable(efi_memory_desc_t *md, bool executable);
extern int efi_memblock_x86_reserve_range(void);
extern void efi_call_phys_prelog(void);

6
arch/x86/kernel/setup.c
View File

@@ -911,11 +911,11 @@ void __init setup_arch(char **cmdline_p)
#ifdef CONFIG_EFI
if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
"EL32", 4)) {
set_bit(EFI_BOOT, &x86_efi_facility);
set_bit(EFI_BOOT, &efi.flags);
} else if (!strncmp((char *)&boot_params.efi_info.efi_loader_signature,
"EL64", 4)) {
set_bit(EFI_BOOT, &x86_efi_facility);
set_bit(EFI_64BIT, &x86_efi_facility);
set_bit(EFI_BOOT, &efi.flags);
set_bit(EFI_64BIT, &efi.flags);
}
if (efi_enabled(EFI_BOOT))

14
arch/x86/platform/efi/efi.c
View File

@@ -65,8 +65,6 @@ struct efi_memory_map memmap;
static struct efi efi_phys __initdata;
static efi_system_table_t efi_systab __initdata;
unsigned long x86_efi_facility;
static __initdata efi_config_table_type_t arch_tables[] = {
#ifdef CONFIG_X86_UV
{UV_SYSTEM_TABLE_GUID, "UVsystab", &efi.uv_systab},
@@ -83,6 +81,8 @@ int efi_enabled(int facility)
}
EXPORT_SYMBOL(efi_enabled);
u64 efi_setup; /* efi setup_data physical address */
static bool __initdata disable_runtime = false;
static int __init setup_noefi(char *arg)
{
@@ -450,7 +450,7 @@ void __init efi_reserve_boot_services(void)
void __init efi_unmap_memmap(void)
{
clear_bit(EFI_MEMMAP, &x86_efi_facility);
clear_bit(EFI_MEMMAP, &efi.flags);
if (memmap.map) {
early_iounmap(memmap.map, memmap.nr_map * memmap.desc_size);
memmap.map = NULL;
@@ -647,7 +647,7 @@ void __init efi_init(void)
if (efi_systab_init(efi_phys.systab))
return;
set_bit(EFI_SYSTEM_TABLES, &x86_efi_facility);
set_bit(EFI_SYSTEM_TABLES, &efi.flags);
/*
* Show what we know for posterity
@@ -668,7 +668,7 @@ void __init efi_init(void)
if (efi_config_init(arch_tables))
return;
set_bit(EFI_CONFIG_TABLES, &x86_efi_facility);
set_bit(EFI_CONFIG_TABLES, &efi.flags);
/*
* Note: We currently don't support runtime services on an EFI
@@ -680,13 +680,13 @@ void __init efi_init(void)
else {
if (disable_runtime || efi_runtime_init())
return;
set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
}
if (efi_memmap_init())
return;
set_bit(EFI_MEMMAP, &x86_efi_facility);
set_bit(EFI_MEMMAP, &efi.flags);
#ifdef CONFIG_X86_32
if (efi_is_native()) {

20
include/linux/efi.h
View File

@@ -581,6 +581,7 @@ extern struct efi {
efi_reset_system_t *reset_system;
efi_set_virtual_address_map_t *set_virtual_address_map;
struct efi_memory_map *memmap;
unsigned long flags;
} efi;
static inline int
@@ -674,17 +675,24 @@ extern int __init efi_setup_pcdp_console(char *);
#ifdef CONFIG_EFI
# ifdef CONFIG_X86
extern int efi_enabled(int facility);
# else
static inline int efi_enabled(int facility)
/*
* Test whether the above EFI_* bits are enabled.
*/
static inline bool efi_enabled(int feature)
{
return 1;
return test_bit(feature, &efi.flags) != 0;
}
# else
static inline bool efi_enabled(int feature)
{
return true;
}
# endif
#else
static inline int efi_enabled(int facility)
static inline bool efi_enabled(int feature)
{
return 0;
return false;
}
#endif