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: Juergen Gross <jgross@suse.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> [boris: "Dropped EXPORT_SYMBOL_GPL(xen_efi_runtime_setup)"] Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
This commit is contained in:
Juergen Gross
Boris Ostrovsky
Родитель
ec066de1a5
Коммит
0951570685
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef _ASM_XEN_OPS_H
|
||||
#define _ASM_XEN_OPS_H
|
||||
|
||||
void xen_efi_runtime_setup(void);
|
||||
|
||||
#endif /* _ASM_XEN_OPS_H */
|
||||
|
|
@ -1,3 +1,2 @@
|
|||
# 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
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
// 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);
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1,7 +0,0 @@
|
|||
/* 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 */
|
||||
|
|
@ -1,4 +1,3 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
xen-arm-y += $(addprefix ../../arm/xen/, enlighten.o grant-table.o p2m.o mm.o)
|
||||
obj-y := xen-arm.o hypercall.o
|
||||
obj-$(CONFIG_XEN_EFI) += $(addprefix ../../arm/xen/, efi.o)
|
||||
|
|
|
|||
|
|
@ -57,21 +57,7 @@ static efi_system_table_t __init *xen_efi_probe(void)
|
|||
return NULL;
|
||||
|
||||
/* Here we know that Xen runs on EFI platform. */
|
||||
|
||||
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;
|
||||
xen_efi_runtime_setup();
|
||||
|
||||
efi_systab_xen.tables = info->cfg.addr;
|
||||
efi_systab_xen.nr_tables = info->cfg.nent;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
|
||||
#define efi_data(op) (op.u.efi_runtime_call)
|
||||
|
||||
efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
|
||||
static efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(get_time);
|
||||
|
||||
|
|
@ -61,9 +61,8 @@ efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_get_time);
|
||||
|
||||
efi_status_t xen_efi_set_time(efi_time_t *tm)
|
||||
static efi_status_t xen_efi_set_time(efi_time_t *tm)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(set_time);
|
||||
|
||||
|
|
@ -75,10 +74,10 @@ efi_status_t xen_efi_set_time(efi_time_t *tm)
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_set_time);
|
||||
|
||||
efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled, efi_bool_t *pending,
|
||||
efi_time_t *tm)
|
||||
static efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled,
|
||||
efi_bool_t *pending,
|
||||
efi_time_t *tm)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(get_wakeup_time);
|
||||
|
||||
|
|
@ -98,9 +97,8 @@ efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled, efi_bool_t *pending,
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_get_wakeup_time);
|
||||
|
||||
efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
|
||||
static efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(set_wakeup_time);
|
||||
|
||||
|
|
@ -117,11 +115,10 @@ efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_set_wakeup_time);
|
||||
|
||||
efi_status_t xen_efi_get_variable(efi_char16_t *name, efi_guid_t *vendor,
|
||||
u32 *attr, unsigned long *data_size,
|
||||
void *data)
|
||||
static efi_status_t xen_efi_get_variable(efi_char16_t *name, efi_guid_t *vendor,
|
||||
u32 *attr, unsigned long *data_size,
|
||||
void *data)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(get_variable);
|
||||
|
||||
|
|
@ -141,11 +138,10 @@ efi_status_t xen_efi_get_variable(efi_char16_t *name, efi_guid_t *vendor,
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_get_variable);
|
||||
|
||||
efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
|
||||
efi_char16_t *name,
|
||||
efi_guid_t *vendor)
|
||||
static efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
|
||||
efi_char16_t *name,
|
||||
efi_guid_t *vendor)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(get_next_variable_name);
|
||||
|
||||
|
|
@ -165,11 +161,10 @@ efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_get_next_variable);
|
||||
|
||||
efi_status_t xen_efi_set_variable(efi_char16_t *name, efi_guid_t *vendor,
|
||||
u32 attr, unsigned long data_size,
|
||||
void *data)
|
||||
static efi_status_t xen_efi_set_variable(efi_char16_t *name, efi_guid_t *vendor,
|
||||
u32 attr, unsigned long data_size,
|
||||
void *data)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(set_variable);
|
||||
|
||||
|
|
@ -186,11 +181,10 @@ efi_status_t xen_efi_set_variable(efi_char16_t *name, efi_guid_t *vendor,
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_set_variable);
|
||||
|
||||
efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,
|
||||
u64 *remaining_space,
|
||||
u64 *max_variable_size)
|
||||
static efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,
|
||||
u64 *remaining_space,
|
||||
u64 *max_variable_size)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(query_variable_info);
|
||||
|
||||
|
|
@ -208,9 +202,8 @@ efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_query_variable_info);
|
||||
|
||||
efi_status_t xen_efi_get_next_high_mono_count(u32 *count)
|
||||
static efi_status_t xen_efi_get_next_high_mono_count(u32 *count)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(get_next_high_monotonic_count);
|
||||
|
||||
|
|
@ -221,10 +214,9 @@ efi_status_t xen_efi_get_next_high_mono_count(u32 *count)
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_get_next_high_mono_count);
|
||||
|
||||
efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
|
||||
unsigned long count, unsigned long sg_list)
|
||||
static efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
|
||||
unsigned long count, unsigned long sg_list)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(update_capsule);
|
||||
|
||||
|
|
@ -241,11 +233,9 @@ efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_update_capsule);
|
||||
|
||||
efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
|
||||
unsigned long count, u64 *max_size,
|
||||
int *reset_type)
|
||||
static efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
|
||||
unsigned long count, u64 *max_size, int *reset_type)
|
||||
{
|
||||
struct xen_platform_op op = INIT_EFI_OP(query_capsule_capabilities);
|
||||
|
||||
|
|
@ -264,10 +254,9 @@ efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
|
|||
|
||||
return efi_data(op).status;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_query_capsule_caps);
|
||||
|
||||
void xen_efi_reset_system(int reset_type, efi_status_t status,
|
||||
unsigned long data_size, efi_char16_t *data)
|
||||
static void xen_efi_reset_system(int reset_type, efi_status_t status,
|
||||
unsigned long data_size, efi_char16_t *data)
|
||||
{
|
||||
switch (reset_type) {
|
||||
case EFI_RESET_COLD:
|
||||
|
|
@ -281,4 +270,25 @@ void xen_efi_reset_system(int reset_type, efi_status_t status,
|
|||
BUG();
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(xen_efi_reset_system);
|
||||
|
||||
/*
|
||||
* 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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -212,30 +212,7 @@ int xen_xlate_map_ballooned_pages(xen_pfn_t **pfns, void **vaddr,
|
|||
|
||||
bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
|
||||
|
||||
efi_status_t xen_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc);
|
||||
efi_status_t xen_efi_set_time(efi_time_t *tm);
|
||||
efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled, efi_bool_t *pending,
|
||||
efi_time_t *tm);
|
||||
efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm);
|
||||
efi_status_t xen_efi_get_variable(efi_char16_t *name, efi_guid_t *vendor,
|
||||
u32 *attr, unsigned long *data_size,
|
||||
void *data);
|
||||
efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
|
||||
efi_char16_t *name, efi_guid_t *vendor);
|
||||
efi_status_t xen_efi_set_variable(efi_char16_t *name, efi_guid_t *vendor,
|
||||
u32 attr, unsigned long data_size,
|
||||
void *data);
|
||||
efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,
|
||||
u64 *remaining_space,
|
||||
u64 *max_variable_size);
|
||||
efi_status_t xen_efi_get_next_high_mono_count(u32 *count);
|
||||
efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
|
||||
unsigned long count, unsigned long sg_list);
|
||||
efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
|
||||
unsigned long count, u64 *max_size,
|
||||
int *reset_type);
|
||||
void xen_efi_reset_system(int reset_type, efi_status_t status,
|
||||
unsigned long data_size, efi_char16_t *data);
|
||||
void xen_efi_runtime_setup(void);
|
||||
|
||||
|
||||
#ifdef CONFIG_PREEMPT
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче