Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09515706 authored by Juergen Gross's avatar Juergen Gross Committed by Boris Ostrovsky
Browse files

xen/efi: have a common runtime setup function 



Today the EFI runtime functions are setup in architecture specific
code (x86 and arm), with the functions themselves living in drivers/xen
as they are not architecture dependent.

As the setup is exactly the same for arm and x86 move the setup to
drivers/xen, too. This at once removes the need to make the single
functions global visible.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarJan Beulich <jbeulich@suse.com>
[boris: "Dropped EXPORT_SYMBOL_GPL(xen_efi_runtime_setup)"]
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent ec066de1

arch/arm/include/asm/xen/xen-ops.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _ASM_XEN_OPS_H

#define _ASM_XEN_OPS_H



void xen_efi_runtime_setup(void);



#endif /* _ASM_XEN_OPS_H */

arch/arm/xen/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-y		:= enlighten.o hypercall.o grant-table.o p2m.o mm.o
 
obj-$(CONFIG_XEN_EFI) += efi.o

arch/arm/xen/efi.c

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * Copyright (c) 2015, Linaro Limited, Shannon Zhao

 */



#include <linux/efi.h>

#include <xen/xen-ops.h>

#include <asm/xen/xen-ops.h>



/* Set XEN EFI runtime services function pointers. Other fields of struct efi,

 * e.g. efi.systab, will be set like normal EFI.

 */

void __init xen_efi_runtime_setup(void)

{

	efi.get_time                 = xen_efi_get_time;

	efi.set_time                 = xen_efi_set_time;

	efi.get_wakeup_time          = xen_efi_get_wakeup_time;

	efi.set_wakeup_time          = xen_efi_set_wakeup_time;

	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;

	efi.reset_system             = xen_efi_reset_system;

}

EXPORT_SYMBOL_GPL(xen_efi_runtime_setup);

arch/arm/xen/enlighten.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <xen/xen-ops.h>

#include <asm/xen/hypervisor.h>

#include <asm/xen/hypercall.h>

#include <asm/xen/xen-ops.h>

#include <asm/system_misc.h>

#include <asm/efi.h>

#include <linux/interrupt.h>

arch/arm64/include/asm/xen/xen-ops.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_XEN_OPS_H

#define _ASM_XEN_OPS_H



void xen_efi_runtime_setup(void);



#endif /* _ASM_XEN_OPS_H */