Revert "x86/pvh: Call C code via the kernel virtual mapping"

This reverts commit 83d123e27623713dd69eed2569eacf5f1b3c9033 which is commit e8fbc0d9cab6c1ee6403f42c0991b0c1d5dbc092 upstream. It causes boot failures of domU guests, and should be reverted. Cc: Jason Andryuk <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Juergen Gross <[email protected]> Cc: Sasha Levin <[email protected]> Reported-by: Marek Marczykowski-Górecki <[email protected]> Link: https://lore.kernel.org/r/Z1l6XbHP6BTTZSwr@mail-itl Signed-off-by: Greg Kroah-Hartman <[email protected]>
deepin-community · Dec 14, 2024 · fe102bd · fe102bd
1 parent e72884f
commit fe102bd
Showing 1 changed file with 1 addition and 8 deletions.
diff --git 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.