xen/efi: Set nonblocking callbacks

BugLink: https://bugs.launchpad.net/bugs/1851876
[ Upstream commit df359f0d09dc029829b66322707a2f558cb720f7 ]

Other parts of the kernel expect these nonblocking EFI callbacks to
exist and crash when running under Xen. Since the implementations of
xen_efi_set_variable() and xen_efi_query_variable_info() do not take any
locks, use them for the nonblocking callbacks too.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/arch/arm/xen/efi.c b/arch/arm/xen/efi.c
index b4d78959cadf08df3cd3f983c162fdbe0dab46e3..bc9a37b3cecd6247c92c98c03221240898241bc8 100644 (file)
--- a/arch/arm/xen/efi.c
+++ b/arch/arm/xen/efi.c
@@ -31,7 +31,9 @@ void __init xen_efi_runtime_setup(void)
        efi.get_variable             = xen_efi_get_variable;
        efi.get_next_variable        = xen_efi_get_next_variable;
        efi.set_variable             = xen_efi_set_variable;
+       efi.set_variable_nonblocking = xen_efi_set_variable;
        efi.query_variable_info      = xen_efi_query_variable_info;
+       efi.query_variable_info_nonblocking = xen_efi_query_variable_info;
        efi.update_capsule           = xen_efi_update_capsule;
        efi.query_capsule_caps       = xen_efi_query_capsule_caps;
        efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;

diff --git a/arch/x86/xen/efi.c b/arch/x86/xen/efi.c
index a18703be9ead90f69f4398be42f69d074d7636c0..4769a069d5bd8c4918d93442b89fa13afb227679 100644 (file)
--- a/arch/x86/xen/efi.c
+++ b/arch/x86/xen/efi.c
@@ -77,7 +77,9 @@ static efi_system_table_t __init *xen_efi_probe(void)
        efi.get_variable             = xen_efi_get_variable;
        efi.get_next_variable        = xen_efi_get_next_variable;
        efi.set_variable             = xen_efi_set_variable;
+       efi.set_variable_nonblocking = xen_efi_set_variable;
        efi.query_variable_info      = xen_efi_query_variable_info;
+       efi.query_variable_info_nonblocking = xen_efi_query_variable_info;
        efi.update_capsule           = xen_efi_update_capsule;
        efi.query_capsule_caps       = xen_efi_query_capsule_caps;
        efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;