efi: Move facility flags to struct efi

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>
This commit is contained in:
Matt Fleming
2014-01-15 13:21:22 +00:00
parent 6d0abeca32
commit 3e90959921
4 changed files with 22 additions and 26 deletions

View File

@@ -573,6 +573,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
@@ -660,17 +661,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