Commit b464b461 authored Aug 23, 2024 by Jason Andryuk Committed by Juergen Gross Sep 25, 2024

x86/pvh: Set phys_base when calling xen_prepare_pvh()



phys_base needs to be set for __pa() to work in xen_pvh_init() when
finding the hypercall page.  Set it before calling into
xen_prepare_pvh(), which calls xen_pvh_init().  Clear it afterward to
avoid __startup_64() adding to it and creating an incorrect value.

Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Message-ID: <20240823193630.2583107-4-jason.andryuk@amd.com>
Signed-off-by: Juergen Gross <jgross@suse.com>

parent 1db29f99

arch/x86/platform/pvh/head.S

+13 −0

Original line number	Diff line number	Diff line
		@@ -125,7 +125,20 @@ 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. */
		lea pvh_bootparams(%rip), %rsi