From c5ab9e18f8c14238ce5f207b174d5c73aa92ca46 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 11 Dec 2024 15:24:38 +0100 Subject: [PATCH] Revert "x86/pvh: Set phys_base when calling xen_prepare_pvh()" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f662b4a69e1d6c15db3354de6fc9f923417a5a10 which is commit b464b461d27d564125db760938643374864c1b1f upstream. It causes boot failures of domU guests, and should be reverted. Cc: Jason Andryuk Cc: Juergen Gross Cc: Sasha Levin Cc: Ard Biesheuvel Reported-by: Marek Marczykowski-Górecki Link: https://lore.kernel.org/r/Z1l6XbHP6BTTZSwr@mail-itl Signed-off-by: Greg Kroah-Hartman --- arch/x86/platform/pvh/head.S | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/arch/x86/platform/pvh/head.S b/arch/x86/platform/pvh/head.S index c994ea58bdf7a..c4365a05ab83b 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