From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> This reverts commit 83d123e27623713dd69eed2569eacf5f1b3c9033 which is commit e8fbc0d9cab6c1ee6403f42c0991b0c1d5dbc092 upstream. It causes boot failures of domU guests, and should be reverted. Cc: Jason Andryuk <jason.andryuk@xxxxxxx> Cc: Ard Biesheuvel <ardb@xxxxxxxxxx> Cc: Juergen Gross <jgross@xxxxxxxx> Cc: Sasha Levin <sashal@xxxxxxxxxx> Reported-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx> Link: https://lore.kernel.org/r/Z1l6XbHP6BTTZSwr@mail-itl Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/x86/platform/pvh/head.S | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) --- a/arch/x86/platform/pvh/head.S +++ b/arch/x86/platform/pvh/head.S @@ -107,14 +107,7 @@ SYM_CODE_START_LOCAL(pvh_start_xen) movq %rbp, %rbx subq $_pa(pvh_start_xen), %rbx movq %rbx, phys_base(%rip) - - /* Call xen_prepare_pvh() via the kernel virtual mapping */ - leaq xen_prepare_pvh(%rip), %rax - subq phys_base(%rip), %rax - addq $__START_KERNEL_map, %rax - ANNOTATE_RETPOLINE_SAFE - call *%rax - + call xen_prepare_pvh /* * Clear phys_base. __startup_64 will *add* to its value, * so reset to 0. Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-6.6/revert-x86-pvh-set-phys_base-when-calling-xen_prepare_pvh.patch queue-6.6/revert-x86-pvh-call-c-code-via-the-kernel-virtual-mapping.patch
