diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-11 15:22:28 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-11 16:13:42 +0100 |
| commit | dd47f7175940b2aa009e932693cdad54ca685496 (patch) | |
| tree | 45a2fed5fc2b84b274d2a4970354b1737d6382c3 | |
| parent | 22a054ea1f081d7837cc8e24ad4c7aa36e8bba04 (diff) | |
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 <jason.andryuk@amd.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: Sasha Levin <sashal@kernel.org>
Reported-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Link: https://lore.kernel.org/r/Z1l6XbHP6BTTZSwr@mail-itl
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/platform/pvh/head.S | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S index 008a80552224..c994ea58bdf7 100644 --- 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. |