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

Commit 0c471355 authored by Roger Pau Monne's avatar Roger Pau Monne Committed by Greg Kroah-Hartman
Browse files

xen/pvh: correctly setup the PV EFI interface for dom0 



commit 72813bfbf0276a97c82af038efb5f02dcdd9e310 upstream.

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: default avatarPGNet Dev <pgnet.dev@gmail.com>
Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Jinoh Kang <jinoh.kang.kr@gmail.com>
Cc: stable@vger.kernel.org # 4.19+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3bad628

arch/x86/xen/efi.c

+6 −6
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static enum efi_secureboot_mode xen_efi_get_secureboot(void) 
	return efi_secureboot_mode_unknown;

}



void __init xen_efi_init(void)

void __init xen_efi_init(struct boot_params *boot_params)

{

	efi_system_table_t *efi_systab_xen;
@@ -181,12 +181,12 @@ void __init xen_efi_init(void) 
	if (efi_systab_xen == NULL)

		return;



	strncpy((char *)&boot_params.efi_info.efi_loader_signature, "Xen",

			sizeof(boot_params.efi_info.efi_loader_signature));

	boot_params.efi_info.efi_systab = (__u32)__pa(efi_systab_xen);

	boot_params.efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);

	strncpy((char *)&boot_params->efi_info.efi_loader_signature, "Xen",

			sizeof(boot_params->efi_info.efi_loader_signature));

	boot_params->efi_info.efi_systab = (__u32)__pa(efi_systab_xen);

	boot_params->efi_info.efi_systab_hi = (__u32)(__pa(efi_systab_xen) >> 32);



	boot_params.secure_boot = xen_efi_get_secureboot();

	boot_params->secure_boot = xen_efi_get_secureboot();



	set_bit(EFI_BOOT, &efi.flags);

	set_bit(EFI_PARAVIRT, &efi.flags);

arch/x86/xen/enlighten_pv.c

+1 −1
Original line number Diff line number Diff line
@@ -1409,7 +1409,7 @@ asmlinkage __visible void __init xen_start_kernel(void) 
	/* We need this for printk timestamps */

	xen_setup_runstate_info(0);



	xen_efi_init();

	xen_efi_init(&boot_params);



	/* Start the world */

#ifdef CONFIG_X86_32

arch/x86/xen/enlighten_pvh.c

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <xen/interface/memory.h>

#include <xen/interface/hvm/start_info.h>



#include "xen-ops.h"



/*

 * PVH variables.

 *
@@ -79,6 +81,8 @@ static void __init init_pvh_bootparams(void) 
	pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */



	x86_init.acpi.get_root_pointer = pvh_get_root_pointer;



	xen_efi_init(&pvh_bootparams);

}



/*

arch/x86/xen/xen-ops.h

+2 −2
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ static inline void __init xen_init_vga(const struct dom0_vga_console_info *info, 
void __init xen_init_apic(void);



#ifdef CONFIG_XEN_EFI

extern void xen_efi_init(void);

extern void xen_efi_init(struct boot_params *boot_params);

#else

static inline void __init xen_efi_init(void)

static inline void __init xen_efi_init(struct boot_params *boot_params)

{

}

#endif