Skip to content

Commit 50bdcf0

Browse files
Amadeusz Sławińskiardbiesheuvel
authored andcommitted
efi/efivars: Set generic ops before loading SSDT
Efivars allows for overriding of SSDT tables, however starting with commit bf67fad ("efi: Use more granular check for availability for variable services") this use case is broken. When loading SSDT generic ops should be set first, however mentioned commit reversed order of operations. Fix this by restoring original order of operations. Fixes: bf67fad ("efi: Use more granular check for availability for variable services") Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com> Link: https://lore.kernel.org/r/20201123172817.124146-1-amadeuszx.slawinski@linux.intel.com Tested-by: Cezary Rojewski <cezary.rojewski@intel.com> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
1 parent c2fe61d commit 50bdcf0

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • drivers/firmware/efi

drivers/firmware/efi/efi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,10 +390,10 @@ static int __init efisubsys_init(void)
390390

391391
if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE |
392392
EFI_RT_SUPPORTED_GET_NEXT_VARIABLE_NAME)) {
393-
efivar_ssdt_load();
394393
error = generic_ops_register();
395394
if (error)
396395
goto err_put;
396+
efivar_ssdt_load();
397397
platform_device_register_simple("efivars", 0, NULL, 0);
398398
}
399399

0 commit comments

Comments
 (0)