efi: Use more granular check for availability for variable services

The UEFI spec rev 2.8 permits firmware implementations to support only
a subset of EFI runtime services at OS runtime (i.e., after the call to
ExitBootServices()), so let's take this into account in the drivers that
rely specifically on the availability of the EFI variable services.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
index 9ea13e8..d2f6855 100644 (file)
--- a/drivers/firmware/efi/efi-pstore.c
+++ b/drivers/firmware/efi/efi-pstore.c
@@ -356,7 +356,7 @@ static struct pstore_info efi_pstore_info = {
 
 static __init int efivars_pstore_init(void)
 {
-       if (!efi_enabled(EFI_RUNTIME_SERVICES))
+       if (!efi_rt_services_supported(EFI_RT_SUPPORTED_VARIABLE_SERVICES))
                return 0;
 
        if (!efivars_kobject())

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index a352305..abf4c02 100644 (file)
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -328,12 +328,13 @@ static int __init efisubsys_init(void)
                return -ENOMEM;
        }
 
-       error = generic_ops_register();
-       if (error)
-               goto err_put;
-
-       if (efi_enabled(EFI_RUNTIME_SERVICES))
+       if (efi_rt_services_supported(EFI_RT_SUPPORTED_VARIABLE_SERVICES)) {
                efivar_ssdt_load();
+               error = generic_ops_register();
+               if (error)
+                       goto err_put;
+               platform_device_register_simple("efivars", 0, NULL, 0);
+       }
 
        error = sysfs_create_group(efi_kobj, &efi_subsys_attr_group);
        if (error) {
@@ -358,7 +359,8 @@ static int __init efisubsys_init(void)
 err_remove_group:
        sysfs_remove_group(efi_kobj, &efi_subsys_attr_group);
 err_unregister:
-       generic_ops_unregister();
+       if (efi_rt_services_supported(EFI_RT_SUPPORTED_VARIABLE_SERVICES))
+               generic_ops_unregister();
 err_put:
        kobject_put(efi_kobj);
        return error;
@@ -650,20 +652,6 @@ void __init efi_systab_report_header(const efi_table_hdr_t *systab_hdr,
                vendor);
 }
 
-#ifdef CONFIG_EFI_VARS_MODULE
-static int __init efi_load_efivars(void)
-{
-       struct platform_device *pdev;
-
-       if (!efi_enabled(EFI_RUNTIME_SERVICES))
-               return 0;
-
-       pdev = platform_device_register_simple("efivars", 0, NULL, 0);
-       return PTR_ERR_OR_ZERO(pdev);
-}
-device_initcall(efi_load_efivars);
-#endif
-
 static __initdata char memory_type_name[][20] = {
        "Reserved",
        "Loader Code",

diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
index 7576450..d309abc 100644 (file)
--- a/drivers/firmware/efi/efivars.c
+++ b/drivers/firmware/efi/efivars.c
@@ -664,7 +664,7 @@ int efivars_sysfs_init(void)
        struct kobject *parent_kobj = efivars_kobject();
        int error = 0;
 
-       if (!efi_enabled(EFI_RUNTIME_SERVICES))
+       if (!efi_rt_services_supported(EFI_RT_SUPPORTED_VARIABLE_SERVICES))
                return -ENODEV;
 
        /* No efivars has been registered yet */

diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c
index fa4f644..12c66f5 100644 (file)
--- a/fs/efivarfs/super.c
+++ b/fs/efivarfs/super.c
@@ -252,7 +252,7 @@ static struct file_system_type efivarfs_type = {
 
 static __init int efivarfs_init(void)
 {
-       if (!efi_enabled(EFI_RUNTIME_SERVICES))
+       if (!efi_rt_services_supported(EFI_RT_SUPPORTED_VARIABLE_SERVICES))
                return -ENODEV;
 
        if (!efivars_kobject())