[PATCH] efi: x86: make "efi facility" use slightly more generic

[PATCH] efi: x86: make "efi facility" use slightly more generic

[Leif Lindholm]

Currently, efi_enabled() is defined to be a dummy macro always returning
1 unless CONFIG_X86. Change this logic to use a
CONFIG_ARCH_USES_EFI_FACILITY to enable use by other architectures.

Signed-off-by: Leif Lindholm <leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 arch/x86/Kconfig             |    1 +
 drivers/firmware/efi/Kconfig |    3 +++
 include/linux/efi.h          |    2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 50e1eab..8c0520d 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1582,6 +1582,7 @@ config EFI
 	bool "EFI runtime service support"
 	depends on ACPI
 	select UCS2_STRING
+	select ARCH_USES_EFI_FACILITY
 	---help---
 	  This enables the kernel to use EFI runtime services that are
 	  available (such as the EFI variable services).
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 6aecbc8..1053c8f 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -40,3 +40,6 @@ endmenu
 
 config UEFI_CPER
 	bool
+
+config ARCH_USES_EFI_FACILITY
+	bool
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 11ce678..b74c8a5 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -655,7 +655,7 @@ extern int __init efi_setup_pcdp_console(char *);
 #define EFI_64BIT		5	/* Is the firmware 64-bit? */
 
 #ifdef CONFIG_EFI
-# ifdef CONFIG_X86
+# ifdef CONFIG_ARCH_USES_EFI_FACILITY
 extern int efi_enabled(int facility);
 # else
 static inline int efi_enabled(int facility)
-- 
1.7.10.4

Re: [PATCH] efi: x86: make "efi facility" use slightly more generic

[Matt Fleming]

On Tue, 14 Jan, at 05:41:25PM, Leif Lindholm wrote:
> Currently, efi_enabled() is defined to be a dummy macro always returning
> 1 unless CONFIG_X86. Change this logic to use a
> CONFIG_ARCH_USES_EFI_FACILITY to enable use by other architectures.
> 
> Signed-off-by: Leif Lindholm <leif.lindholm-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  arch/x86/Kconfig             |    1 +
>  drivers/firmware/efi/Kconfig |    3 +++
>  include/linux/efi.h          |    2 +-
>  3 files changed, 5 insertions(+), 1 deletion(-)

I'm not sure this is the way to go. I'd much prefer to treat introducing
CONFIG_* symbols like this a last resort only.

Let me post some patches to show you what I had in mind.

-- 
Matt Fleming, Intel Open Source Technology Center