diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2019-04-23 16:04:16 +0300 |
|---|---|---|
| committer | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2019-04-25 17:36:25 +0300 |
| commit | 72813bfbf0276a97c82af038efb5f02dcdd9e310 (patch) | |
| tree | b194c741f8f0a7af35f07e254f408f60032f024f /arch/x86/xen/enlighten_pvh.c | |
| parent | c9f804d64bb93c8dbf957df1d7e9de11380e522d (diff) | |
| download | linux-72813bfbf0276a97c82af038efb5f02dcdd9e310.tar.xz | |
xen/pvh: correctly setup the PV EFI interface for dom0
This involves initializing the boot params EFI related fields and the
efi global variable.
Without this fix a PVH dom0 doesn't detect when booted from EFI, and
thus doesn't support accessing any of the EFI related data.
Reported-by: PGNet Dev <pgnet.dev@gmail.com>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: stable@vger.kernel.org # 4.19+
Diffstat (limited to 'arch/x86/xen/enlighten_pvh.c')
| -rw-r--r-- | arch/x86/xen/enlighten_pvh.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index bbffa409e0e8..80a79db72fcf 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -13,6 +13,8 @@ #include <xen/interface/memory.h> +#include "xen-ops.h" + /* * PVH variables. * @@ -21,7 +23,7 @@ */ bool xen_pvh __attribute__((section(".data"))) = 0; -void __init xen_pvh_init(void) +void __init xen_pvh_init(struct boot_params *boot_params) { u32 msr; u64 pfn; @@ -33,6 +35,8 @@ void __init xen_pvh_init(void) msr = cpuid_ebx(xen_cpuid_base() + 2); pfn = __pa(hypercall_page); wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32)); + + xen_efi_init(boot_params); } void __init mem_map_via_hcall(struct boot_params *boot_params_p) |