Skip to content

Commit

Permalink
x86/pvh: Set phys_base when calling xen_prepare_pvh()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jason Andryuk authored and jgross1 committed Sep 25, 2024
1 parent 1db29f9 commit b464b46
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions arch/x86/platform/pvh/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b464b46

Please sign in to comment.