diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-11 15:24:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-11 16:13:43 +0100 |
| commit | 52ab77109035df34e41a28934b168575040c86b7 (patch) | |
| tree | 6cca6e1f8776ae1fdec1c13bc935620f05ea812e | |
| parent | dd47f7175940b2aa009e932693cdad54ca685496 (diff) | |
Revert "x86/pvh: Set phys_base when calling xen_prepare_pvh()"
This reverts commit f662b4a69e1d6c15db3354de6fc9f923417a5a10 which is
commit b464b461d27d564125db760938643374864c1b1f upstream.
It causes boot failures of domU guests, and should be reverted.
Cc: Jason Andryuk <jason.andryuk@amd.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Sasha Levin <sashal@kernel.org>
Cc: Ard Biesheuvel <ardb@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 | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S index c994ea58bdf7..c4365a05ab83 100644 --- a/arch/x86/platform/pvh/head.S +++ b/arch/x86/platform/pvh/head.S @@ -100,20 +100,7 @@ SYM_CODE_START_LOCAL(pvh_start_xen) xor %edx, %edx wrmsr - /* - * Calculate load offset and store in phys_base. __pa() needs - * phys_base set to calculate the hypercall page in xen_pvh_init(). - */ - movq %rbp, %rbx - subq $_pa(pvh_start_xen), %rbx - movq %rbx, phys_base(%rip) call xen_prepare_pvh - /* - * Clear phys_base. __startup_64 will *add* to its value, - * so reset to 0. - */ - xor %rbx, %rbx - movq %rbx, phys_base(%rip) /* startup_64 expects boot_params in %rsi. */ mov $_pa(pvh_bootparams), %rsi |